totole/services
1
0
Fork 0
mirror of https://github.com/kevin-DL/services.git synced 2026-01-20 06:25:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix image extension detection from urls (#180)

Browse Source 
Co-authored-by: Janos Dobronszki <dobronszki@gmail.com>
This commit is contained in:
Asim Aslam
2021-08-04 11:25:27 +01:00
committed by GitHub
parent 47ef8c7ab5
commit be72d53604
1 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
image/handler/image.go
View File

@@ -10,6 +10,7 @@ import (
"image/jpeg" "image/jpeg"
"image/png" "image/png"
"net/http" "net/http"
"net/url"
"strings" "strings"
"github.com/disintegration/imaging" "github.com/disintegration/imaging"
@@ -48,26 +49,33 @@ func (e *Image) Upload(ctx context.Context, req *img.UploadRequest, rsp *img.Upl
var srcImage image.Image var srcImage image.Image
var err error var err error
var ext string var ext string
if len(req.Base64) > 0 { if len(req.Base64) > 0 {
srcImage, ext, err = base64ToImage(req.Base64) srcImage, ext, err = base64ToImage(req.Base64)
if err != nil { if err != nil {
return err return err
} }
} else { } else if len(req.Url) > 0 {
ur, err := url.Parse(req.Url)
if err != nil {
return err
}
response, err := http.Get(req.Url) response, err := http.Get(req.Url)
if err != nil { if err != nil {
return err return err
} }
switch { switch {
case strings.HasSuffix(req.Url, ".png"): case strings.HasSuffix(ur.Path, ".png"):
srcImage, err = png.Decode(response.Body) srcImage, err = png.Decode(response.Body)
case strings.HasSuffix(req.Url, ".jpg") || strings.HasSuffix(req.Url, ".jpeg"): case strings.HasSuffix(ur.Path, ".jpg") || strings.HasSuffix(ur.Path, ".jpeg"):
srcImage, err = jpeg.Decode(response.Body) srcImage, err = jpeg.Decode(response.Body)
} }
if err != nil { if err != nil {
return err return err
} }
defer response.Body.Close() defer response.Body.Close()
} else {
return errors.New("base64 or url param is required")
} }
buf := new(bytes.Buffer) buf := new(bytes.Buffer)
@@ -126,26 +134,33 @@ func (e *Image) Resize(ctx context.Context, req *img.ResizeRequest, rsp *img.Res
var srcImage image.Image var srcImage image.Image
var err error var err error
var ext string var ext string
if len(req.Base64) > 0 { if len(req.Base64) > 0 {
srcImage, ext, err = base64ToImage(req.Base64) srcImage, ext, err = base64ToImage(req.Base64)
if err != nil { if err != nil {
return err return err
} }
} else { } else if len(req.Url) > 0 {
ur, err := url.Parse(req.Url)
if err != nil {
return err
}
response, err := http.Get(req.Url) response, err := http.Get(req.Url)
if err != nil { if err != nil {
return err return err
} }
switch { switch {
case strings.HasSuffix(req.Url, ".png"): case strings.HasSuffix(ur.Path, ".png"):
srcImage, err = png.Decode(response.Body) srcImage, err = png.Decode(response.Body)
case strings.HasSuffix(req.Url, ".jpg") || strings.HasSuffix(req.Url, ".jpeg"): case strings.HasSuffix(ur.Path, ".jpg") || strings.HasSuffix(ur.Path, ".jpeg"):
srcImage, err = jpeg.Decode(response.Body) srcImage, err = jpeg.Decode(response.Body)
} }
if err != nil { if err != nil {
return err return err
} }
defer response.Body.Close() defer response.Body.Close()
} else {
return errors.New("base64 or url param is required")
} }
resultImage := imaging.Resize(srcImage, int(req.Width), int(req.Height), imaging.Lanczos) resultImage := imaging.Resize(srcImage, int(req.Width), int(req.Height), imaging.Lanczos)