set SSE headers in put-part response (#12008 )

This commit fixes a bug in the put-part implementation. The SSE headers should be set as specified by AWS - See: https://docs.aws.amazon.com/AmazonS3/latest/API/API_UploadPart.html Now, the MinIO server should set SSE-C headers, like `x-amz-server-side-encryption-customer-algorithm`. Fixes #11991
Update yaml files to latest version RELEASE.2021-04-06T23-11-00Z
2021-04-07 14:50:28 -07:00 · 2021-04-06 23:35:33 +00:00
6 changed files with 29 additions and 14 deletions
--- a/cmd/object-handlers.go
+++ b/cmd/object-handlers.go
@@ -2371,8 +2371,20 @@ func (api objectAPIHandlers) PutObjectPartHandler(w http.ResponseWriter, r *http
 	}

 	etag := partInfo.ETag
-	if isEncrypted {
-		etag = tryDecryptETag(objectEncryptionKey[:], partInfo.ETag, crypto.SSEC.IsRequested(r.Header))
+	switch kind, encrypted := crypto.IsEncrypted(mi.UserDefined); {
+	case encrypted:
+		switch kind {
+		case crypto.S3:
+			w.Header().Set(xhttp.AmzServerSideEncryption, xhttp.AmzEncryptionAES)
+			etag = tryDecryptETag(objectEncryptionKey[:], etag, false)
+		case crypto.SSEC:
+			w.Header().Set(xhttp.AmzServerSideEncryptionCustomerAlgorithm, r.Header.Get(xhttp.AmzServerSideEncryptionCustomerAlgorithm))
+			w.Header().Set(xhttp.AmzServerSideEncryptionCustomerKeyMD5, r.Header.Get(xhttp.AmzServerSideEncryptionCustomerKeyMD5))
+
+			if len(etag) >= 32 && strings.Count(etag, "-") != 1 {
+				etag = etag[len(etag)-32:]
+			}
+		}
 	}

 	// We must not use the http.Header().Set method here because some (broken)
--- a/docs/orchestration/docker-compose/docker-compose.yaml
+++ b/docs/orchestration/docker-compose/docker-compose.yaml
@@ -5,7 +5,7 @@ version: '3.7'
 # it through port 9000.
 services:
  minio1:
-    image: minio/minio:RELEASE.2021-03-17T02-33-02Z
+    image: minio/minio:RELEASE.2021-04-06T23-11-00Z
    volumes:
      - data1-1:/data1
      - data1-2:/data2
@@ -22,7 +22,7 @@ services:
      retries: 3

  minio2:
-    image: minio/minio:RELEASE.2021-03-17T02-33-02Z
+    image: minio/minio:RELEASE.2021-04-06T23-11-00Z
    volumes:
      - data2-1:/data1
      - data2-2:/data2
@@ -39,7 +39,7 @@ services:
      retries: 3

  minio3:
-    image: minio/minio:RELEASE.2021-03-17T02-33-02Z
+    image: minio/minio:RELEASE.2021-04-06T23-11-00Z
    volumes:
      - data3-1:/data1
      - data3-2:/data2
@@ -56,7 +56,7 @@ services:
      retries: 3

  minio4:
-    image: minio/minio:RELEASE.2021-03-17T02-33-02Z
+    image: minio/minio:RELEASE.2021-04-06T23-11-00Z
    volumes:
      - data4-1:/data1
      - data4-2:/data2
--- a/docs/orchestration/docker-swarm/docker-compose-secrets.yaml
+++ b/docs/orchestration/docker-swarm/docker-compose-secrets.yaml
@@ -2,7 +2,7 @@ version: '3.7'

 services:
  minio1:
-    image: minio/minio:RELEASE.2021-03-17T02-33-02Z
+    image: minio/minio:RELEASE.2021-04-06T23-11-00Z
    hostname: minio1
    volumes:
      - minio1-data:/export
@@ -29,7 +29,7 @@ services:
      retries: 3

  minio2:
-    image: minio/minio:RELEASE.2021-03-17T02-33-02Z
+    image: minio/minio:RELEASE.2021-04-06T23-11-00Z
    hostname: minio2
    volumes:
      - minio2-data:/export
@@ -56,7 +56,7 @@ services:
      retries: 3

  minio3:
-    image: minio/minio:RELEASE.2021-03-17T02-33-02Z
+    image: minio/minio:RELEASE.2021-04-06T23-11-00Z
    hostname: minio3
    volumes:
      - minio3-data:/export
@@ -83,7 +83,7 @@ services:
      retries: 3

  minio4:
-    image: minio/minio:RELEASE.2021-03-17T02-33-02Z
+    image: minio/minio:RELEASE.2021-04-06T23-11-00Z
    hostname: minio4
    volumes:
      - minio4-data:/export
--- a/docs/orchestration/docker-swarm/docker-compose.yaml
+++ b/docs/orchestration/docker-swarm/docker-compose.yaml
@@ -2,7 +2,7 @@ version: '3.7'

 services:
  minio1:
-    image: minio/minio:RELEASE.2021-03-17T02-33-02Z
+    image: minio/minio:RELEASE.2021-04-06T23-11-00Z
    hostname: minio1
    volumes:
      - minio1-data:/export
@@ -33,7 +33,7 @@ services:
      retries: 3

  minio2:
-    image: minio/minio:RELEASE.2021-03-17T02-33-02Z
+    image: minio/minio:RELEASE.2021-04-06T23-11-00Z
    hostname: minio2
    volumes:
      - minio2-data:/export
@@ -64,7 +64,7 @@ services:
      retries: 3

  minio3:
-    image: minio/minio:RELEASE.2021-03-17T02-33-02Z
+    image: minio/minio:RELEASE.2021-04-06T23-11-00Z
    hostname: minio3
    volumes:
      - minio3-data:/export
@@ -95,7 +95,7 @@ services:
      retries: 3

  minio4:
-    image: minio/minio:RELEASE.2021-03-17T02-33-02Z
+    image: minio/minio:RELEASE.2021-04-06T23-11-00Z
    hostname: minio4
    volumes:
      - minio4-data:/export
--- a/go.mod
+++ b/go.mod
@@ -77,6 +77,7 @@ require (
 	github.com/tidwall/gjson v1.6.8
 	github.com/tidwall/sjson v1.0.4
 	github.com/tinylib/msgp v1.1.3
+	github.com/ttacon/chalk v0.0.0-20160626202418-22c06c80ed31 // indirect
 	github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a
 	github.com/willf/bitset v1.1.11 // indirect
 	github.com/willf/bloom v2.0.3+incompatible
--- a/go.sum
+++ b/go.sum
@@ -596,6 +596,8 @@ github.com/tinylib/msgp v1.1.3 h1:3giwAkmtaEDLSV0MdO1lDLuPgklgPzmk8H9+So2BVfA=
 github.com/tinylib/msgp v1.1.3/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8 h1:ndzgwNDnKIqyCvHTXaCqh9KlOWKvBry6nuXMJmonVsE=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
+github.com/ttacon/chalk v0.0.0-20160626202418-22c06c80ed31 h1:OXcKh35JaYsGMRzpvFkLv/MEyPuL49CThT1pZ8aSml4=
+github.com/ttacon/chalk v0.0.0-20160626202418-22c06c80ed31/go.mod h1:onvgF043R+lC5RZ8IT9rBXDaEDnpnw/Cl+HFiw+v/7Q=
 github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
 github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
 github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=