Fix encoding issues when JVM default encoding is not UTF-8

Author: tallevami-home

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

@@ -148,7 +148,7 @@ public String apiSignRequest(Map<String, Object> paramsToSign, String apiSecret)
 		} catch (NoSuchAlgorithmException e) {
 			throw new RuntimeException("Unexpected exception", e);
 		}
-		byte[] digest = md.digest((to_sign + apiSecret).getBytes());
+		byte[] digest = md.digest(getUTF8Bytes(to_sign + apiSecret));
 		return StringUtils.encodeHexString(digest);
 	}
 
@@ -231,6 +231,14 @@ protected Map parseConfigUrl(String cloudinaryUrl) {
 		return params;
 	}
 
+	byte[] getUTF8Bytes(String string) {
+		try {
+			return string.getBytes("UTF-8");
+		} catch (java.io.UnsupportedEncodingException e) {
+			throw new RuntimeException("Unexpected exception", e);
+		}		
+	}
+
 	@Deprecated
 	public static Map asMap(Object... values) {
 		return ObjectUtils.asMap(values);

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

@@ -360,7 +360,7 @@ public String generate(String source) {
 
 
 
-			byte[] digest = md.digest((toSign + this.config.apiSecret).getBytes());
+			byte[] digest = md.digest(cloudinary.getUTF8Bytes(toSign + this.config.apiSecret));
 			signature = Base64Coder.encodeURLSafeString(digest);
 			signature = "s--" + signature.substring(0, 8) + "--" ;
 		}
@@ -484,7 +484,7 @@ public String unsignedDownloadUrlPrefix(String source, String cloudName, boolean
 
 	private String shard(String input) {
 		CRC32 crc32 = new CRC32();
-		crc32.update(input.getBytes());
+		crc32.update(cloudinary.getUTF8Bytes(input));
 		return String.valueOf((crc32.getValue() % 5 + 5) % 5 + 1);
 	}
 

cloudinary-test-common/src/main/java/com/cloudinary/test/AbstractUploaderTest.java

@@ -303,7 +303,7 @@ public void testCustomCoordinates() throws Exception {
     @Test
     public void testContext() throws Exception {
     	//should allow sending context
-    	Map context = ObjectUtils.asMap("caption", "some caption", "alt", "alternative");
+    	Map context = ObjectUtils.asMap("caption", "some cäption", "alt", "alternativè");
     	Map result = cloudinary.uploader().upload(SRC_TEST_IMAGE, ObjectUtils.asMap("context", context));
     	Map info = cloudinary.api().resource((String) result.get("public_id"), ObjectUtils.asMap("context", true));
     	assertEquals(ObjectUtils.asMap("custom", context), info.get("context"));