web/notify.moe
Code Issues Pull Requests Activity

Use standard image decoder

Browse Source
This commit is contained in:
Eduard Urbach 2018-03-02 22:30:39 +01:00
parent b83b1b94a5
commit 10335c9111
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pages/upload/upload.go
View File

@ -4,7 +4,6 @@ import (
"bytes" "bytes"
"fmt" "fmt"
"image" "image"
"io"
"net/http" "net/http"
"github.com/aerogo/aero" "github.com/aerogo/aero"
@ -25,19 +24,14 @@ func Avatar(ctx *aero.Context) string {
return ctx.Error(http.StatusInternalServerError, "Reading request body failed", err) return ctx.Error(http.StatusInternalServerError, "Reading request body failed", err)
} }
format, err := guessImageFormat(bytes.NewReader(data)) // Decode
img, format, err := image.Decode(bytes.NewReader(data))
if err != nil { if err != nil {
return ctx.Error(http.StatusBadRequest, "Could not determine image file type", err) return ctx.Error(http.StatusBadRequest, "Invalid image format", err)
} }
fmt.Println("Avatar received!", len(data), format, user.Nick) fmt.Println("Avatar received!", len(data), format, img.Bounds().Dx(), img.Bounds().Dy(), user.Nick)
// ioutil.WriteFile("avatar") // ioutil.WriteFile("avatar")
return "ok" return "ok"
} }
// Guess image format from gif/jpeg/png/webp
func guessImageFormat(r io.Reader) (format string, err error) {
_, format, err = image.DecodeConfig(r)
return format, err
}