Adding http headers that start with x-amz-meta- to authorization digest.

Author: GraciesPadre

ds3/networking/httpRequestBuilder.go

@@ -6,6 +6,7 @@ import (
     "net/url"
     "strings"
     "spectra/ds3_go_sdk/ds3/models"
+    "sort"
 )
 
 const AmazonMetadataPrefix = "x-amz-meta-"
@@ -134,14 +135,33 @@ func (builder *HttpRequestBuilder) buildUrl(conn *ConnectionInfo) string {
 }
 
 func (builder *HttpRequestBuilder) maybeAddAmazonCanonicalHeaders() {
-	var stringBuilder strings.Builder
+	headerKeys := make([]string, 0)
 
 	for key, value := range *builder.headers {
 		lowerCaseKey := strings.ToLower(key)
-		if strings.HasPrefix(lowerCaseKey, AmazonMetadataPrefix) && len(value) > 0 {
+		if strings.HasPrefix(lowerCaseKey, models.AMZ_META_HEADER) && len(value) > 0 {
+			headerKeys = append(headerKeys, key)
+		}
+	}
+
+	if len(headerKeys) == 0 {
+		return
+	}
+
+	sort.Strings(headerKeys)
+
+	var stringBuilder strings.Builder
+
+	var httpHeaders map[string][]string = *builder.headers
+
+	for _, headerKey := range headerKeys {
+		lowerCaseKey := strings.ToLower(headerKey)
+		headerValue := httpHeaders[headerKey]
+
+		if len(headerValue) > 0 {
 			stringBuilder.WriteString(lowerCaseKey)
 			stringBuilder.WriteString(":")
-			stringBuilder.WriteString(strings.Join(value, ","))
+			stringBuilder.WriteString(strings.Join(headerValue, ","))
 			stringBuilder.WriteString("\n")
 		}
 	}

ds3/networking/networking_test.go

@@ -39,19 +39,23 @@ func TestBuildingAuthorizationDigestWithMetadata(t *testing.T) {
 
 	const gracie = "Gracie"
 	const eskimo = "Eskimo"
+	const shasta = "Shasta"
+	const samoyed = "Samoyed"
 
 	connectionInfo := ConnectionInfo{
 		Endpoint:    endpointUrl,
 		Credentials: &Credentials{AccessId: gracie, Key: eskimo},
 		Proxy:       nil}
 
-	httpRequestBuilder.WithHeader(AmazonMetadataPrefix + gracie, eskimo).
+	httpRequestBuilder.
+		WithHeader(AmazonMetadataPrefix + shasta, samoyed).
+		WithHeader(AmazonMetadataPrefix + gracie, eskimo).
 		Build(&connectionInfo)
 
 	amazonHeaders := httpRequestBuilder.signatureFields.CanonicalizedAmzHeaders
 
 	ds3Testing.AssertBool(t, "expected amazonHeader to have something in it", true, len(amazonHeaders) > 0)
 
-	expected := AmazonMetadataPrefix + strings.ToLower(gracie) + ":" + eskimo + "\n"
+	expected := AmazonMetadataPrefix + strings.ToLower(gracie) + ":" + eskimo + "\n" + AmazonMetadataPrefix + strings.ToLower(shasta) + ":" + samoyed + "\n"
 	ds3Testing.AssertBool(t, "amazonHeader string isn't what we expected", true, strings.Compare(amazonHeaders, expected) == 0)
 }