Merge pull request #64 from SpectraLogic/authorization_digest

Authorization digest

Author: RachelTucker

ds3/networking/httpRequestBuilder.go

@@ -6,8 +6,11 @@ import (
     "net/url"
     "strings"
     "spectra/ds3_go_sdk/ds3/models"
+    "sort"
 )
 
+const AmazonMetadataPrefix = "x-amz-meta-"
+
 type HttpRequestBuilder struct {
     reader io.Reader
     contentLength *int64
@@ -116,19 +119,60 @@ func (builder *HttpRequestBuilder) Build(conn *ConnectionInfo) (*http.Request, e
 
     builder.signatureFields.Date = getCurrentTime()
 
+    builder.maybeAddAmazonCanonicalHeaders()
+
     authHeaderVal := builder.signatureFields.BuildAuthHeaderValue(conn.Credentials)
 
     // Set the http request headers such as authorization and date.
     return builder.addHttpRequestHeaders(httpRequest, authHeaderVal)
 }
 
 func (builder *HttpRequestBuilder) buildUrl(conn *ConnectionInfo) string {
-    var httpUrl url.URL = *conn.Endpoint
+    var httpUrl = *conn.Endpoint
     httpUrl.Path = builder.signatureFields.Path
     httpUrl.RawQuery = encodeQueryParams(builder.queryParams)
     return httpUrl.String()
 }
 
+func (builder *HttpRequestBuilder) maybeAddAmazonCanonicalHeaders() {
+	headerKeys := make([]string, 0)
+
+	for key, value := range *builder.headers {
+		lowerCaseKey := strings.ToLower(key)
+		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(headerValue, ","))
+			stringBuilder.WriteString("\n")
+		}
+	}
+
+	canonicalAmazonHeaders := stringBuilder.String()
+
+	if len(canonicalAmazonHeaders) > 0 {
+		builder.signatureFields.CanonicalizedAmzHeaders = stringBuilder.String()
+	}
+}
+
 func (builder *HttpRequestBuilder) addHttpRequestHeaders(httpRequest *http.Request, authHeader string) (*http.Request, error) {
     httpRequest.Header.Add("Date", builder.signatureFields.Date)
     httpRequest.Header.Add("Authorization", authHeader)
@@ -155,3 +199,4 @@ func encodeQueryParams(queryParams *url.Values) string {
     // with percent encoding for spaces (%20)
     return strings.Replace(queryParams.Encode(), "+", "%20", -1)
 }
+

ds3/networking/networking_test.go

@@ -15,6 +15,7 @@ import (
     "testing"
     "net/url"
     "spectra/ds3_go_sdk/ds3_utils/ds3Testing"
+    "strings"
 )
 
 func TestEncodeQueryParams(t *testing.T) {
@@ -28,4 +29,34 @@ func TestEncodeQueryParams(t *testing.T) {
     result := encodeQueryParams(queryParams)
 
     ds3Testing.AssertString(t, "Encoded Query Params", expected, result)
-}
+}
+
+func TestBuildingAuthorizationDigestWithMetadata(t *testing.T) {
+	httpRequestBuilder := NewHttpRequestBuilder()
+
+	endpointUrl, err := url.Parse("https://google.com")
+	ds3Testing.AssertNilError(t, err)
+
+	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 + 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" + AmazonMetadataPrefix + strings.ToLower(shasta) + ":" + samoyed + "\n"
+	ds3Testing.AssertBool(t, "amazonHeader string isn't what we expected", true, strings.Compare(amazonHeaders, expected) == 0)
+}
+