[#369] Request reproducer

Signed-off-by: Nikita Zinkevich <n.zinkevich@yadro.com>

api/layer/detector.go

@@ -1,58 +0,0 @@
-package layer
-
-import (
-	"io"
-	"net/http"
-)
-
-type (
-	detector struct {
-		io.Reader
-		err  error
-		data []byte
-	}
-	errReader struct {
-		data   []byte
-		err    error
-		offset int
-	}
-)
-
-const contentTypeDetectSize = 512
-
-func newReader(data []byte, err error) *errReader {
-	return &errReader{data: data, err: err}
-}
-
-func (r *errReader) Read(b []byte) (int, error) {
-	if r.offset >= len(r.data) {
-		return 0, io.EOF
-	}
-	n := copy(b, r.data[r.offset:])
-	r.offset += n
-	if r.offset >= len(r.data) {
-		return n, r.err
-	}
-	return n, nil
-}
-
-func newDetector(reader io.Reader) *detector {
-	return &detector{
-		data:   make([]byte, contentTypeDetectSize),
-		Reader: reader,
-	}
-}
-
-func (d *detector) Detect() (string, error) {
-	n, err := d.Reader.Read(d.data)
-	if err != nil && err != io.EOF {
-		d.err = err
-		return "", err
-	}
-	d.data = d.data[:n]
-	return http.DetectContentType(d.data), nil
-}
-
-func (d *detector) MultiReader() io.Reader {
-	return io.MultiReader(newReader(d.data, d.err), d.Reader)
-}

api/layer/object.go

@@ -12,6 +12,7 @@ import (
 	"fmt"
 	"io"
 	"mime"
+	"net/http"
 	"path/filepath"
 	"strconv"
 	"strings"
@@ -21,6 +22,7 @@ import (
 	"git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/data"
 	apiErrors "git.frostfs.info/TrueCloudLab/frostfs-s3-gw/api/errors"
 	"git.frostfs.info/TrueCloudLab/frostfs-s3-gw/internal/logs"
+	"git.frostfs.info/TrueCloudLab/frostfs-s3-gw/pkg/detector"
 	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/client"
 	cid "git.frostfs.info/TrueCloudLab/frostfs-sdk-go/container/id"
 	"git.frostfs.info/TrueCloudLab/frostfs-sdk-go/object"
@@ -245,11 +247,11 @@ func (n *Layer) PutObject(ctx context.Context, p *PutObjectParams) (*data.Extend
 	if r != nil {
 		if len(p.Header[api.ContentType]) == 0 {
 			if contentType := MimeByFilePath(p.Object); len(contentType) == 0 {
-				d := newDetector(r)
+				d := detector.NewDetector(r, http.DetectContentType)
 				if contentType, err := d.Detect(); err == nil {
 					p.Header[api.ContentType] = contentType
 				}
-				r = d.MultiReader()
+				r = d.RestoredReader()
 			} else {
 				p.Header[api.ContentType] = contentType
 			}

api/middleware/log_http.go

@@ -32,10 +32,6 @@ type (
 		*zap.Logger
 		logRoller *lumberjack.Logger
 	}
-	// Implementation of zap.Sink for using lumberjack.
-	lumberjackSink struct {
-		*lumberjack.Logger
-	}
 	// responseReadWriter helps read http response body.
 	responseReadWriter struct {
 		http.ResponseWriter
@@ -49,10 +45,6 @@ const (
 	responseLabel = "response"
 )
 
-func (lumberjackSink) Sync() error {
-	return nil
-}
-
 func (lc *LogHTTPConfig) InitHTTPLogger(log *zap.Logger) {
 	if err := lc.initHTTPLogger(); err != nil {
 		log.Error(logs.FailedToInitializeHTTPLogger, zap.Error(err))