Upstream versity/versitygw state of the touched files before aaf73219cd

s3api/utils/utils.go

@@ -472,6 +472,27 @@ func ParseCalculatedChecksumHeaders(ctx fiber.Ctx) (ChecksumValues, error) {
 	return checksums, nil
 }
 
+// HasPayloadIntegrityCheck reports whether an upload carries an integrity
+// check of its body: a Content-MD5 header, an x-amz-checksum-* header, or an
+// x-amz-checksum-* trailer. A payload hash, signed or not, and chunk
+// signatures don't count as one.
+func HasPayloadIntegrityCheck(ctx fiber.Ctx) bool {
+	if len(ctx.Request().Header.Peek("Content-Md5")) != 0 {
+		return true
+	}
+	if strings.HasPrefix(strings.ToLower(ctx.Get("X-Amz-Trailer")), "x-amz-checksum-") {
+		return true
+	}
+	for key := range ctx.Request().Header.All() {
+		switch k := string(key); {
+		case k == "X-Amz-Checksum-Type", k == "X-Amz-Checksum-Algorithm":
+		case strings.HasPrefix(k, "X-Amz-Checksum-"):
+			return true
+		}
+	}
+	return false
+}
+
 // ParseCalculatedChecksumFields parses and validates object POST checksum fields
 func ParseCalculatedChecksumFields(fields map[string]string) (ChecksumValues, error) {
 	checksums := ChecksumValues{}
@@ -1087,6 +1108,25 @@ func DetectResourceType(ctx fiber.Ctx) s3err.ResourceType {
 	return s3err.ResourceTypeObject
 }
 
+// SetRegionMismatchHeader reports the region the request should have been
+// signed for in the x-amz-bucket-region response header, when err is a signing
+// region mismatch. HEAD requests carry no response body, so the header is the
+// only channel through which a client can discover the gateway region and
+// retry against it, which is how the aws sdks recover from the mismatch.
+func SetRegionMismatchHeader(ctx fiber.Ctx, err error) {
+	rerr, ok := err.(s3err.RegionMismatchError)
+	if !ok {
+		return
+	}
+
+	region := rerr.ExpectedRegion()
+	if region == "" {
+		return
+	}
+
+	ctx.Response().Header.Set("x-amz-bucket-region", region)
+}
+
 // ValidateLocationConstraint checks a CreateBucket location constraint. The
 // global endpoint serves us-east-1 and takes no constraint; any other
 // region is a region specific endpoint and requires the constraint to name it.
@@ -1112,3 +1152,56 @@ func ValidateLocationConstraint(constraint *string, region string) error {
 
 	return nil
 }
+
+// AwsChunkedEncoding is the coding a client announces when it frames a body in
+// aws-chunked, as the SDKs do to carry a trailing checksum.
+const AwsChunkedEncoding = "aws-chunked"
+
+// HasAwsChunkedEncoding reports whether a Content-Encoding value carries the
+// aws-chunked token.
+func HasAwsChunkedEncoding(contentEncoding string) bool {
+	for _, coding := range strings.Split(contentEncoding, ",") {
+		if strings.EqualFold(strings.TrimSpace(coding), AwsChunkedEncoding) {
+			return true
+		}
+	}
+
+	return false
+}
+
+// ParseContentEncoding returns the Content-Encoding to store for a request,
+// dropping the aws-chunked token unless the request declares a non streaming
+// payload type in x-amz-content-sha256.
+//
+// S3 keys this on the declaration alone. A streaming payload type frames the
+// body in aws-chunked, and a request that declares no payload type - a
+// presigned URL, signed as UNSIGNED-PAYLOAD and carrying no header - may frame
+// it too, so both drop the token. A declared hex digest or UNSIGNED-PAYLOAD
+// says the body is sent as-is, so there the token is a coding the client chose
+// and is stored as sent.
+//
+// S3 applies this to the Content-Encoding header itself, before any API sees
+// it, so every controller that reads the header inherits it - including
+// CopyObject and CreateMultipartUpload, which carry no body to frame. POSTObject
+// takes its value from a form field and ignores the header, so it stores the
+// token as sent and must not call this.
+func ParseContentEncoding(ctx fiber.Ctx) string {
+	contentEncoding := ctx.Get("Content-Encoding")
+	payloadType := ctx.Get("X-Amz-Content-Sha256")
+	if payloadType != "" && !IsStreamingPayload(payloadType) {
+		return contentEncoding
+	}
+
+	codings := strings.Split(contentEncoding, ",")
+	kept := make([]string, 0, len(codings))
+	for _, coding := range codings {
+		trimmed := strings.TrimSpace(coding)
+		if trimmed == "" || strings.EqualFold(trimmed, AwsChunkedEncoding) {
+			continue
+		}
+
+		kept = append(kept, trimmed)
+	}
+
+	return strings.Join(kept, ",")
+}