feat: resizeCropAuto

Gopkg.toml

@@ -30,7 +30,7 @@
   name = "github.com/aldor007/go-aws-auth"
 
 [[constraint]]
-  branch = "develop"
+  branch = "master"
   name = "github.com/aldor007/stow"
 
 [[constraint]]
@@ -81,10 +81,6 @@
   name = "gopkg.in/h2non/gock.v1"
   version = "1.0.12"
 
-[[constraint]]
-  branch = "master"
-  name = "gopkg.in/kothar/brotli-go.v0"
-
 [[constraint]]
   name = "gopkg.in/yaml.v2"
   version = "2.2.2"

cmd/mort/mort.go

@@ -31,7 +31,7 @@ import (
 
 const (
 	// Version of mort
-	Version = "0.12.0"
+	Version = "0.13.0"
 	// BANNER just fancy command line banner
 	BANNER = `
   /\/\   ___  _ __| |_
@@ -92,7 +92,13 @@ func handleSignals(servers []*http.Server, socketPaths []string, wg *sync.WaitGr
 }
 
 func configureMonitoring(mortConfig *config.Config) {
-	logCfg := zap.NewProductionConfig()
+	var logCfg zap.Config
+	if mortConfig.Server.LogLevel == "debug" {
+		logCfg = zap.NewDevelopmentConfig()
+	} else {
+		logCfg = zap.NewProductionConfig()
+	}
+
 	logCfg.EncoderConfig.EncodeTime = zapcore.ISO8601TimeEncoder
 	logger, _ := logCfg.Build()
 
@@ -219,6 +225,7 @@ func main() {
 			res.Set("Access-Control-Allow-Headers", "Content-Type, X-Amz-Public-Width, X-Amz-Public-Height")
 			res.Set("Access-Control-Expose-Headers", "Content-Type, X-Amz-Public-Width, X-Amz-Public-Height")
 			res.Set("Access-Control-Allow-Methods", "POST, GET, OPTIONS, HEAD")
+			res.Set("Access-Control-Allow-Origin", "*")
 			defer monitoring.Log().Sync() // flushes buffer, if any
 			if res.HasError() {
 				monitoring.Log().Warn("Mort process error", zap.String("obj.Key", obj.Key), zap.Error(res.Error()))

configuration/config.yml

@@ -1,4 +1,5 @@
 server:
+  logLevel: "debug"
   listens:
     - ":8080"
     - "unix:/tmp/mort.sock"

pkg/config/config.go

@@ -212,6 +212,10 @@ func (c *Config) validateTransform(bucketName string, bucket Bucket) error {
 }
 
 func (c *Config) validateServer() error {
+	if c.Server.LogLevel == "" {
+		c.Server.LogLevel = "prod"
+	}
+
 	if c.Server.SingleListen == "" {
 		c.Server.SingleListen = ":8080"
 	}

pkg/config/types.go

@@ -106,6 +106,7 @@ type HeaderYaml struct {
 
 // Server configure HTTP server
 type Server struct {
+	LogLevel       string                 `yaml:"logLevel"`
 	InternalListen string                 `yaml:"internalListen"`
 	SingleListen   string                 `yaml:"listen"`
 	CacheSize      int64                  `yaml:"cacheSize"`

pkg/engine/image_engine.go

@@ -1,12 +1,10 @@
 package engine
 
 import (
-	"encoding/binary"
 	"net/http"
 	"strconv"
 	"time"
 
-	"github.com/spaolacci/murmur3"
 	"gopkg.in/h2non/bimg.v1"
 
 	"bytes"
@@ -16,6 +14,8 @@ import (
 	"github.com/aldor007/mort/pkg/transforms"
 	"go.uber.org/zap"
 	"sync"
+	"crypto/md5"
+	"encoding/hex"
 )
 
 // bufPool for string concatenations
@@ -45,7 +45,6 @@ func (c *ImageEngine) Process(obj *object.FileObject, trans []transforms.Transfo
 		return response.NewError(500, err), err
 	}
 
-	var transHash uint64
 	for _, tran := range trans {
 		image := bimg.NewImage(buf)
 		meta, err := image.Metadata()
@@ -62,21 +61,17 @@ func (c *ImageEngine) Process(obj *object.FileObject, trans []transforms.Transfo
 		if err != nil {
 			return response.NewError(500, err), err
 		}
-		transHash = transHash + tran.Hash().Sum64()
 	}
 
-	transHashB := make([]byte, 8)
-	binary.LittleEndian.PutUint64(transHashB, transHash)
 
-	hash := murmur3.New64()
-	hash.Write([]byte(obj.Key))
-	hash.Write(transHashB)
+	bodyHash := md5.New()
+	bodyHash.Write(buf)
 
 	res := response.NewBuf(200, buf)
 	res.SetContentType("image/" + bimg.DetermineImageTypeName(buf))
 	//res.Set("cache-control", "max-age=6000, public")
 	res.Set("Last-Modified", time.Now().UTC().Format(http.TimeFormat))
-	res.Set("ETag", createWeakEtag(strconv.FormatUint(hash.Sum64(), 16)))
+	res.Set("ETag", hex.EncodeToString(bodyHash.Sum(nil)))
 	meta, err := bimg.Metadata(buf)
 	if err == nil {
 		res.Set("x-amz-meta-public-width", strconv.Itoa(meta.Size.Width))
@@ -89,14 +84,3 @@ func (c *ImageEngine) Process(obj *object.FileObject, trans []transforms.Transfo
 	return res, nil
 }
 
-func createWeakEtag(transHash string) string {
-	buf := bufPool.Get().(*bytes.Buffer)
-	buf.Reset()
-	buf.WriteByte('W')
-	buf.WriteByte('/')
-	buf.WriteByte('"')
-	buf.WriteString(transHash)
-	buf.WriteByte('"')
-	defer bufPool.Put(buf)
-	return buf.String()
-}