Add support for 32 char SHA-256 URL signatures.

Author: nitzanj

cloudinary-core/src/main/java/com/cloudinary/Configuration.java

@@ -19,6 +19,7 @@ public class Configuration {
     public final static String SHARED_CDN = AKAMAI_SHARED_CDN;
     public final static String VERSION = "1.0.2";
     public final static String USER_AGENT = "cld-android-" + VERSION;
+    public static final boolean DEFAULT_IS_LONG_SIGNATURE = false;
 
     public String cloudName;
     public String apiKey;
@@ -41,11 +42,12 @@ public class Configuration {
     public boolean clientHints = false;
     public AuthToken authToken;
     public boolean forceVersion = true;
+    public boolean longUrlSignature = DEFAULT_IS_LONG_SIGNATURE;
 
     public Configuration() {
     }
 
-    private Configuration(String cloudName, String apiKey, String apiSecret, String secureDistribution, String cname, String uploadPrefix, boolean secure, boolean privateCdn, boolean cdnSubdomain, boolean shorten, String callback, String proxyHost, int proxyPort, Boolean secureCdnSubdomain, boolean useRootPath, int timeout, boolean loadStrategies, boolean forceVersion) {
+    private Configuration(String cloudName, String apiKey, String apiSecret, String secureDistribution, String cname, String uploadPrefix, boolean secure, boolean privateCdn, boolean cdnSubdomain, boolean shorten, String callback, String proxyHost, int proxyPort, Boolean secureCdnSubdomain, boolean useRootPath, int timeout, boolean loadStrategies, boolean forceVersion, boolean longUrlSignature) {
         this.cloudName = cloudName;
         this.apiKey = apiKey;
         this.apiSecret = apiSecret;
@@ -64,6 +66,7 @@ private Configuration(String cloudName, String apiKey, String apiSecret, String
         this.timeout = 0;
         this.loadStrategies = loadStrategies;
         this.forceVersion = forceVersion;
+        this.longUrlSignature = longUrlSignature;
     }
 
     @SuppressWarnings("rawtypes")
@@ -100,6 +103,7 @@ public void update(Map config) {
         if (properties != null) {
             this.properties.putAll(properties);
         }
+        this.longUrlSignature = ObjectUtils.asBoolean(config.get("long_url_signature"), DEFAULT_IS_LONG_SIGNATURE);
     }
 
     @SuppressWarnings("rawtypes")
@@ -128,6 +132,7 @@ public Map<String, Object> asMap() {
         }
         map.put("force_version", forceVersion);
         map.put("properties", new HashMap<String,Object>(properties));
+        map.put("long_url_signature", longUrlSignature);
         return map;
     }
 
@@ -156,6 +161,7 @@ public Configuration(Configuration other) {
         this.forceVersion = other.forceVersion;
         this.loadStrategies = other.loadStrategies;
         this.properties.putAll(other.properties);
+        this.longUrlSignature = other.longUrlSignature;
     }
 
     /**
@@ -265,6 +271,7 @@ public static class Builder {
         private boolean clientHints = false;
         private AuthToken authToken;
         private boolean forceVersion = true;
+        private boolean longUrlSignature = DEFAULT_IS_LONG_SIGNATURE;
 
         /**
          * Set the HTTP connection timeout.
@@ -281,7 +288,7 @@ public Builder setTimeout(int timeout) {
          * Creates a {@link Configuration} with the arguments supplied to this builder
          */
         public Configuration build() {
-            final Configuration configuration = new Configuration(cloudName, apiKey, apiSecret, secureDistribution, cname, uploadPrefix, secure, privateCdn, cdnSubdomain, shorten, callback, proxyHost, proxyPort, secureCdnSubdomain, useRootPath, timeout, loadStrategies, forceVersion);
+            final Configuration configuration = new Configuration(cloudName, apiKey, apiSecret, secureDistribution, cname, uploadPrefix, secure, privateCdn, cdnSubdomain, shorten, callback, proxyHost, proxyPort, secureCdnSubdomain, useRootPath, timeout, loadStrategies, forceVersion, longUrlSignature);
             configuration.clientHints = clientHints;
             return configuration;
         }
@@ -400,6 +407,11 @@ public Builder setForceVersion(boolean forceVersion) {
             return this;
         }
 
+        public Builder setIsLongUrlSignature(boolean isLong) {
+            this.longUrlSignature = isLong;
+            return this;
+        }
+
         /**
          * Initialize builder from existing {@link Configuration}
          *
@@ -427,6 +439,7 @@ public Builder from(Configuration other) {
             this.clientHints = other.clientHints;
             this.authToken = other.authToken == null ? null : other.authToken.copy();
             this.forceVersion = other.forceVersion;
+            this.longUrlSignature = other.longUrlSignature;
             return this;
         }
     }

cloudinary-core/src/main/java/com/cloudinary/Url.java

@@ -22,6 +22,7 @@
 public class Url {
     private final Cloudinary cloudinary;
     private final Configuration config;
+    private boolean longUrlSignature;
     String publicId = null;
     String type = null;
     String resourceType = null;
@@ -47,6 +48,7 @@ public class Url {
     public Url(Cloudinary cloudinary) {
         this.cloudinary = cloudinary;
         this.config = new Configuration(cloudinary.config);
+        this.longUrlSignature = config.longUrlSignature;
         this.authToken = config.authToken;
     }
 
@@ -73,7 +75,7 @@ public Url clone() {
         cloned.sourceTypes = this.sourceTypes;
         cloned.urlSuffix = this.urlSuffix;
         cloned.useRootPath = this.useRootPath;
-
+        cloned.longUrlSignature = this.longUrlSignature;
         return cloned;
     }
 
@@ -240,6 +242,11 @@ public Url authToken(AuthToken authToken) {
         return this;
     }
 
+    public Url longUrlSignature(boolean isLong) {
+        this.longUrlSignature = isLong;
+        return this;
+    }
+
     public Url sourceTransformation(Map<String, Transformation> sourceTransformation) {
         this.sourceTransformation = sourceTransformation;
         return this;
@@ -384,7 +391,7 @@ public String generate(String source) {
         if (signUrl && (authToken == null || authToken.equals(AuthToken.NULL_AUTH_TOKEN))) {
             MessageDigest md = null;
             try {
-                md = MessageDigest.getInstance("SHA-1");
+                md = MessageDigest.getInstance(longUrlSignature ? "SHA-256" : "SHA-1");
             } catch (NoSuchAlgorithmException e) {
                 throw new RuntimeException("Unexpected exception", e);
             }
@@ -395,7 +402,7 @@ public String generate(String source) {
 
             byte[] digest = md.digest(Util.getUTF8Bytes(toSign + this.config.apiSecret));
             signature = Base64Coder.encodeURLSafeString(digest);
-            signature = "s--" + signature.substring(0, 8) + "--";
+            signature = "s--" + signature.substring(0, longUrlSignature ? 32 : 8) + "--";
         }
 
         String resourceType = this.resourceType;

cloudinary-core/src/test/java/com/cloudinary/test/CloudinaryTest.java

@@ -251,6 +251,15 @@ public void testNotSignTheUrlSuffix() {
         assertEquals("http://test123-res.cloudinary.com/images/" + expectedSignature + "/a_0/test/hello.jpg", actual);
     }
 
+    @Test
+    public void testSignatureLength(){
+        String url = cloudinary.url().signed(true).generate("sample.jpg");
+        assertEquals("http://res.cloudinary.com/test123/image/upload/s--v2fTPYTu--/sample.jpg", url);
+
+        url = cloudinary.url().signed(true).longUrlSignature(true).generate("sample.jpg");
+        assertEquals("http://res.cloudinary.com/test123/image/upload/s--2hbrSMPOjj5BJ4xV7SgFbRDevFaQNUFf--/sample.jpg", url);
+    }
+
     @Test
     public void testSupportUrlSuffixForRawUploads() {
         String actual = cloudinary.url().suffix("hello").privateCdn(true).resourceType("raw").generate("test");