Merge pull request #44 from hansdude/master

Fixed international signature string creation.

Author: rpmoore

sdk/src/main/java/com/spectralogic/ds3client/NetworkClientImpl.java

@@ -15,11 +15,13 @@
 
 package com.spectralogic.ds3client;
 
+import com.google.common.net.UrlEscapers;
 import com.spectralogic.ds3client.commands.Ds3Request;
 import com.spectralogic.ds3client.models.SignatureDetails;
 import com.spectralogic.ds3client.networking.*;
 import com.spectralogic.ds3client.utils.DateFormatter;
 import com.spectralogic.ds3client.utils.Signature;
+
 import org.apache.http.HttpHost;
 import org.apache.http.HttpRequest;
 import org.apache.http.HttpStatus;
@@ -167,7 +169,7 @@ private void addHeaders(final HttpRequest httpRequest) throws IOException, Signa
                 this.ds3Request.getContentType().toString(),
                 date,
                 "",
-                this.ds3Request.getPath(),
+                UrlEscapers.urlFragmentEscaper().escape(this.ds3Request.getPath()),
                 NetworkClientImpl.this.connectionDetails.getCredentials()
             )));
         }

sdk/src/main/java/com/spectralogic/ds3client/utils/Signature.java

@@ -16,11 +16,13 @@
 package com.spectralogic.ds3client.utils;
 
 import com.spectralogic.ds3client.models.SignatureDetails;
+
 import org.apache.commons.codec.binary.Base64;
 
+import java.security.SignatureException;
+
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
-import java.security.SignatureException;
 
 public class Signature {
 
@@ -52,7 +54,7 @@ public static String calculateRFC2104HMAC(final String data, final String key)
             // compute the hmac on input data bytes
             final byte[] rawHmac = mac.doFinal(data.getBytes());
             result = Base64.encodeBase64String(rawHmac);
-        } catch (Exception e) {
+        } catch (final Exception e) {
             throw new SignatureException("Failed to generate HMAC : " + e.getMessage());
         }
         return result.trim();
@@ -64,7 +66,14 @@ public static String calculateRFC2104HMAC(final String data, final String key)
      */
     public static String signature(final SignatureDetails signatureDetails)
             throws SignatureException {
-
-        return calculateRFC2104HMAC(String.valueOf(signatureDetails.getVerb()) + '\n' + signatureDetails.getContentMd5() + '\n' + signatureDetails.getContentType() + '\n' + signatureDetails.getDate() + '\n' + signatureDetails.getCanonicalizedAmzHeaders() + signatureDetails.getCanonicalizedResource(), signatureDetails.getCredentials().getKey());
+        return calculateRFC2104HMAC(
+                String.valueOf(signatureDetails.getVerb()) + '\n'
+                    + signatureDetails.getContentMd5() + '\n'
+                    + signatureDetails.getContentType() + '\n'
+                    + signatureDetails.getDate() + '\n'
+                    + signatureDetails.getCanonicalizedAmzHeaders()
+                    + signatureDetails.getCanonicalizedResource(),
+                signatureDetails.getCredentials().getKey()
+        );
     }
 }