totole/services
1
0
Fork 0
mirror of https://github.com/kevin-DL/services.git synced 2026-01-22 23:35:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

check for correct format. close body earlier (#193)

Browse Source
This commit is contained in:
Dominic Wong
2021-08-20 09:37:00 +01:00
committed by GitHub
parent ecd9df85d9
commit 3f2383c555
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
image/handler/image.go
View File

@@ -15,6 +15,7 @@ import (
"github.com/disintegration/imaging" "github.com/disintegration/imaging"
"github.com/micro/micro/v3/service/config" "github.com/micro/micro/v3/service/config"
merrors "github.com/micro/micro/v3/service/errors"
"github.com/micro/micro/v3/service/store" "github.com/micro/micro/v3/service/store"
img "github.com/micro/services/image/proto" img "github.com/micro/services/image/proto"
"github.com/micro/services/pkg/tenant" "github.com/micro/services/pkg/tenant"
@@ -64,6 +65,7 @@ func (e *Image) Upload(ctx context.Context, req *img.UploadRequest, rsp *img.Upl
if err != nil { if err != nil {
return err return err
} }
defer response.Body.Close()
switch { switch {
case strings.HasSuffix(ur.Path, ".png"): case strings.HasSuffix(ur.Path, ".png"):
srcImage, err = png.Decode(response.Body) srcImage, err = png.Decode(response.Body)
@@ -73,7 +75,7 @@ func (e *Image) Upload(ctx context.Context, req *img.UploadRequest, rsp *img.Upl
if err != nil { if err != nil {
return err return err
} }
defer response.Body.Close()
} else { } else {
return errors.New("base64 or url param is required") return errors.New("base64 or url param is required")
} }
@@ -106,6 +108,9 @@ func base64ToImage(b64 string) (image.Image, string, error) {
ext := "" ext := ""
parts := strings.Split(b64, ",") parts := strings.Split(b64, ",")
if len(parts) != 2 {
return srcImage, "", merrors.BadRequest("image", "Incorrect format for base64 image, expected <encoding prefix>,<image data>")
}
prefix := parts[0] prefix := parts[0]
b64 = strings.TrimSpace(parts[1]) b64 = strings.TrimSpace(parts[1])
res, err := base64.StdEncoding.DecodeString(b64) res, err := base64.StdEncoding.DecodeString(b64)
@@ -149,6 +154,7 @@ func (e *Image) Resize(ctx context.Context, req *img.ResizeRequest, rsp *img.Res
if err != nil { if err != nil {
return err return err
} }
defer response.Body.Close()
switch { switch {
case strings.HasSuffix(ur.Path, ".png"): case strings.HasSuffix(ur.Path, ".png"):
srcImage, err = png.Decode(response.Body) srcImage, err = png.Decode(response.Body)
@@ -158,7 +164,7 @@ func (e *Image) Resize(ctx context.Context, req *img.ResizeRequest, rsp *img.Res
if err != nil { if err != nil {
return err return err
} }
defer response.Body.Close()
} else { } else {
return errors.New("base64 or url param is required") return errors.New("base64 or url param is required")
} }
@@ -238,6 +244,7 @@ func (e *Image) Convert(ctx context.Context, req *img.ConvertRequest, rsp *img.C
if err != nil { if err != nil {
return err return err
} }
defer response.Body.Close()
switch { switch {
case strings.HasSuffix(ur.Path, ".png"): case strings.HasSuffix(ur.Path, ".png"):
srcImage, err = png.Decode(response.Body) srcImage, err = png.Decode(response.Body)
@@ -247,7 +254,7 @@ func (e *Image) Convert(ctx context.Context, req *img.ConvertRequest, rsp *img.C
if err != nil { if err != nil {
return err return err
} }
defer response.Body.Close()
} }
buf := new(bytes.Buffer) buf := new(bytes.Buffer)