Skip to content

Commit

Permalink
fix: fix base64 image parse error (songquanpeng#858)
Browse files Browse the repository at this point in the history
  • Loading branch information
MartialBE authored Dec 24, 2023
1 parent b7fcb31 commit a763681
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 4 deletions.
25 changes: 21 additions & 4 deletions common/image/image.go
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
package image

import (
"bytes"
"encoding/base64"
"image"
_ "image/gif"
_ "image/jpeg"
_ "image/png"
"net/http"
"regexp"
"strings"
"sync"

_ "golang.org/x/image/webp"
)
Expand All @@ -29,13 +32,27 @@ var (
reg = regexp.MustCompile(`data:image/([^;]+);base64,`)
)

var readerPool = sync.Pool{
New: func() interface{} {
return &bytes.Reader{}
},
}

func GetImageSizeFromBase64(encoded string) (width int, height int, err error) {
encoded = strings.TrimPrefix(encoded, "data:image/png;base64,")
base64 := strings.NewReader(reg.ReplaceAllString(encoded, ""))
img, _, err := image.DecodeConfig(base64)
decoded, err := base64.StdEncoding.DecodeString(reg.ReplaceAllString(encoded, ""))
if err != nil {
return
return 0, 0, err
}

reader := readerPool.Get().(*bytes.Reader)
defer readerPool.Put(reader)
reader.Reset(decoded)

img, _, err := image.DecodeConfig(reader)
if err != nil {
return 0, 0, err
}

return img.Width, img.Height, nil
}

Expand Down
17 changes: 17 additions & 0 deletions common/image/image_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -152,3 +152,20 @@ func TestGetImageSize(t *testing.T) {
})
}
}

func TestGetImageSizeFromBase64(t *testing.T) {
for i, c := range cases {
t.Run("Decode:"+strconv.Itoa(i), func(t *testing.T) {
resp, err := http.Get(c.url)
assert.NoError(t, err)
defer resp.Body.Close()
data, err := io.ReadAll(resp.Body)
assert.NoError(t, err)
encoded := base64.StdEncoding.EncodeToString(data)
width, height, err := img.GetImageSizeFromBase64(encoded)
assert.NoError(t, err)
assert.Equal(t, c.width, width)
assert.Equal(t, c.height, height)
})
}
}

0 comments on commit a763681

Please sign in to comment.