go/imgproxy
1
0
Fork 0
mirror of https://github.com/imgproxy/imgproxy.git synced 2024-11-24 08:12:38 +02:00
Code Releases Activity

Use imagetype and config in imagemeta

Browse Source
This commit is contained in:
DarthSim 2021-05-13 19:58:44 +06:00
parent 2ea1466d96
commit 0af4720cfa
13 changed files with 43 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
imagedata/read.go
View File

@ -8,7 +8,6 @@ import (
"github.com/imgproxy/imgproxy/v2/config"
"github.com/imgproxy/imgproxy/v2/ierrors"
"github.com/imgproxy/imgproxy/v2/imagemeta"
"github.com/imgproxy/imgproxy/v2/imagetype"
"github.com/imgproxy/imgproxy/v2/security"
)
@ -21,8 +20,6 @@ var downloadBufPool *bufpool.Pool
func initRead() {
downloadBufPool = bufpool.New("download", config.Concurrency, config.DownloadBufferSize)
imagemeta.SetMaxSvgCheckRead(config.MaxSvgCheckBytes)
}
type hardLimitReader struct {
@ -64,11 +61,6 @@ func readAndCheckImage(r io.Reader, contentLength int) (*ImageData, error) {
return nil, ierrors.Wrap(err, 0)
}
imgtype, imgtypeOk := imagetype.Types[meta.Format()]
if !imgtypeOk {
return nil, ErrSourceImageTypeNotSupported
}
if err = security.CheckDimensions(meta.Width(), meta.Height()); err != nil {
return nil, err
}
@ -80,7 +72,7 @@ func readAndCheckImage(r io.Reader, contentLength int) (*ImageData, error) {
return &ImageData{
Data: buf.Bytes(),
Type: imgtype,
Type: meta.Format(),
cancel: cancel,
}, nil
}

4
imagemeta/bmp.go
View File

@ -4,6 +4,8 @@ import (
"bytes"
"encoding/binary"
"io"
"github.com/imgproxy/imgproxy/v2/imagetype"
)
var bmpMagick = []byte("BM")
@ -37,7 +39,7 @@ func DecodeBmpMeta(r io.Reader) (Meta, error) {
}
return &meta{
format: "bmp",
format: imagetype.BMP,
width: width,
height: height,
}, nil

4
imagemeta/gif.go
View File

@ -2,6 +2,8 @@ package imagemeta
import (
"io"
"github.com/imgproxy/imgproxy/v2/imagetype"
)
func DecodeGifMeta(r io.Reader) (Meta, error) {
@ -13,7 +15,7 @@ func DecodeGifMeta(r io.Reader) (Meta, error) {
}
return &meta{
format: "gif",
format: imagetype.GIF,
width: int(tmp[6]) + int(tmp[7])<<8,
height: int(tmp[8]) + int(tmp[9])<<8,
}, nil

10
imagemeta/heif.go
View File

@ -7,6 +7,8 @@ import (
"fmt"
"io"
"io/ioutil"
"github.com/imgproxy/imgproxy/v2/imagetype"
)
const heifBoxHeaderSize = int64(8)
@ -20,12 +22,12 @@ type heifDiscarder interface {
}
type heifData struct {
Format string
Format imagetype.Type
Width, Height int64
}
func (d *heifData) IsFilled() bool {
return len(d.Format) > 0 && d.Width > 0 && d.Height > 0
return d.Format != imagetype.Unknown && d.Width > 0 && d.Height > 0
}
func heifReadN(r io.Reader, n int64) (b []byte, err error) {
@ -73,12 +75,12 @@ func heifReadBoxHeader(r io.Reader) (boxType string, boxDataSize int64, err erro
func heifAssignFormat(d *heifData, brand []byte) bool {
if bytes.Equal(brand, heicBrand) {
d.Format = "heic"
d.Format = imagetype.HEIC
return true
}
if bytes.Equal(brand, avifBrand) {
d.Format = "avif"
d.Format = imagetype.AVIF
return true
}

4
imagemeta/ico.go
View File

@ -4,6 +4,8 @@ import (
"bytes"
"encoding/binary"
"io"
"github.com/imgproxy/imgproxy/v2/imagetype"
)
type IcoMeta struct {
@ -69,7 +71,7 @@ func DecodeIcoMeta(r io.Reader) (*IcoMeta, error) {
return &IcoMeta{
Meta: &meta{
format: "ico",
format: imagetype.ICO,
width: width,
height: height,
},

10
imagemeta/image_meta.go
View File

@ -6,10 +6,12 @@ import (
"io"
"sync"
"sync/atomic"
"github.com/imgproxy/imgproxy/v2/imagetype"
)
type Meta interface {
Format() string
Format() imagetype.Type
Width() int
Height() int
}
@ -17,11 +19,11 @@ type Meta interface {
type DecodeMetaFunc func(io.Reader) (Meta, error)
type meta struct {
format string
format imagetype.Type
width, height int
}
func (m *meta) Format() string {
func (m *meta) Format() imagetype.Type {
return m.format
}
@ -91,7 +93,7 @@ func DecodeMeta(r io.Reader) (Meta, error) {
if ok, err := IsSVG(rr); err != nil {
return nil, err
} else if ok {
return &meta{format: "svg", width: 1, height: 1}, nil
return &meta{format: imagetype.SVG, width: 1, height: 1}, nil
}
return nil, ErrFormat

4
imagemeta/jpeg.go
View File

@ -3,6 +3,8 @@ package imagemeta
import (
"bufio"
"io"
"github.com/imgproxy/imgproxy/v2/imagetype"
)
const (
@ -101,7 +103,7 @@ func DecodeJpegMeta(rr io.Reader) (Meta, error) {
}
return &meta{
format: "jpeg",
format: imagetype.JPEG,
width: int(tmp[3])<<8 + int(tmp[4]),
height: int(tmp[1])<<8 + int(tmp[2]),
}, nil

4
imagemeta/png.go
View File

@ -4,6 +4,8 @@ import (
"bytes"
"encoding/binary"
"io"
"github.com/imgproxy/imgproxy/v2/imagetype"
)
var pngMagick = []byte("\x89PNG\r\n\x1a\n")
@ -28,7 +30,7 @@ func DecodePngMeta(r io.Reader) (Meta, error) {
}
return &meta{
format: "png",
format: imagetype.PNG,
width: int(binary.BigEndian.Uint32(tmp[8:12])),
height: int(binary.BigEndian.Uint32(tmp[12:16])),
}, nil

10
imagemeta/svg.go
View File

@ -6,13 +6,11 @@ import (
"fmt"
"io"
"strings"
"sync/atomic"
"github.com/imgproxy/imgproxy/v2/config"
"golang.org/x/text/encoding/charmap"
)
var maxSvgBytes int64 = 32 * 1024
type svgHeader struct {
XMLName xml.Name
}
@ -24,12 +22,8 @@ func xmlCharsetReader(charset string, input io.Reader) (io.Reader, error) {
return nil, fmt.Errorf("Unknown SVG charset: %s", charset)
}
func SetMaxSvgCheckRead(n int) {
atomic.StoreInt64(&maxSvgBytes, int64(n))
}
func IsSVG(r io.Reader) (bool, error) {
maxBytes := int(atomic.LoadInt64(&maxSvgBytes))
maxBytes := config.MaxSvgCheckBytes
var h svgHeader

4
imagemeta/tiff.go
View File

@ -5,6 +5,8 @@ import (
"bytes"
"encoding/binary"
"io"
"github.com/imgproxy/imgproxy/v2/imagetype"
)
var (
@ -105,7 +107,7 @@ func DecodeTiffMeta(rr io.Reader) (Meta, error) {
if width > 0 && height > 0 {
return &meta{
format: "tiff",
format: imagetype.TIFF,
width: width,
height: height,
}, nil

7
imagemeta/webp.go
View File

@ -10,6 +10,7 @@ import (
"errors"
"io"
"github.com/imgproxy/imgproxy/v2/imagetype"
"golang.org/x/image/riff"
"golang.org/x/image/vp8"
"golang.org/x/image/vp8l"
@ -59,7 +60,7 @@ func DecodeWebpMeta(r io.Reader) (Meta, error) {
fh, err := d.DecodeFrameHeader()
return &meta{
format: "webp",
format: imagetype.WEBP,
width: fh.Width,
height: fh.Height,
}, err
@ -71,7 +72,7 @@ func DecodeWebpMeta(r io.Reader) (Meta, error) {
}
return &meta{
format: "webp",
format: imagetype.WEBP,
width: conf.Width,
height: conf.Height,
}, nil
@ -89,7 +90,7 @@ func DecodeWebpMeta(r io.Reader) (Meta, error) {
heightMinusOne := uint32(buf[7]) | uint32(buf[8])<<8 | uint32(buf[9])<<16
return &meta{
format: "webp",
format: imagetype.WEBP,
width: int(widthMinusOne) + 1,
height: int(heightMinusOne) + 1,
}, nil

2
processing_handler_test.go
View File

@ -90,7 +90,7 @@ func (s *ProcessingHandlerTestSuite) TestRequest() {
meta, err := imagemeta.DecodeMeta(res.Body)
assert.Nil(s.T(), err)
assert.Equal(s.T(), "png", meta.Format())
assert.Equal(s.T(), imagetype.PNG, meta.Format())
assert.Equal(s.T(), 4, meta.Width())
assert.Equal(s.T(), 4, meta.Height())
}

11
vips/ico.go
View File

@ -27,24 +27,23 @@ func (img *Image) loadIco(data []byte, shrink int, scale float64, pages int) err
internalData := data[offset : offset+size]
var format string
var internalType imagetype.Type
meta, err := imagemeta.DecodeMeta(bytes.NewReader(internalData))
if err != nil {
// Looks like it's BMP with an incomplete header
if d, err := imagemeta.FixBmpHeader(internalData); err == nil {
format = "bmp"
internalType = imagetype.BMP
internalData = d
} else {
return err
}
} else {
format = meta.Format()
internalType = meta.Format()
}
internalType, ok := imagetype.Types[format]
if !ok || internalType == imagetype.ICO || !SupportsLoad(internalType) {
return fmt.Errorf("Can't load %s from ICO", meta.Format())
if internalType == imagetype.ICO || !SupportsLoad(internalType) {
return fmt.Errorf("Can't load %s from ICO", internalType)
}
imgdata := imagedata.ImageData{