Encode URLs in API calls

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

@@ -244,15 +244,15 @@ public ApiResponse updateUploadPreset(String name, Map options) throws Exception
         if (options == null) options = ObjectUtils.emptyMap();
         Map params = Util.buildUploadParams(options);
         Util.clearEmpty(params);
-        params.putAll(ObjectUtils.only(options, "unsigned", "disallow_public_id","live"));
+        params.putAll(ObjectUtils.only(options, "unsigned", "disallow_public_id", "live"));
         return callApi(HttpMethod.PUT, Arrays.asList("upload_presets", name), params, options);
     }
 
     public ApiResponse createUploadPreset(Map options) throws Exception {
         if (options == null) options = ObjectUtils.emptyMap();
         Map params = Util.buildUploadParams(options);
         Util.clearEmpty(params);
-        params.putAll(ObjectUtils.only(options, "name", "unsigned", "disallow_public_id","live"));
+        params.putAll(ObjectUtils.only(options, "name", "unsigned", "disallow_public_id", "live"));
         return callApi(HttpMethod.POST, Arrays.asList("upload_presets"), params, options);
     }
 
@@ -268,6 +268,13 @@ public ApiResponse subFolders(String ofFolderPath, Map options) throws Exception
         return callApi(HttpMethod.GET, Arrays.asList("folders", ofFolderPath), ObjectUtils.emptyMap(), options);
     }
 
+    //Creates an empty folder
+    public ApiResponse createFolder(String folderName, Map options) throws Exception {
+        if (options == null)
+            options = ObjectUtils.emptyMap();
+        return callApi(HttpMethod.POST, Arrays.asList("folders", folderName), ObjectUtils.emptyMap(), options);
+    }
+
     public ApiResponse restore(Iterable<String> publicIds, Map options) throws Exception {
         if (options == null)
             options = ObjectUtils.emptyMap();
@@ -583,7 +590,7 @@ private ApiResponse updateResourcesAccessMode(String accessMode, String byKey, O
      */
     public ApiResponse addMetadataField(MetadataField field) throws Exception {
         return callApi(HttpMethod.POST, Collections.singletonList("metadata_fields"),
-                ObjectUtils.toMap(field), ObjectUtils.asMap ("content_type", "json"));
+                ObjectUtils.toMap(field), ObjectUtils.asMap("content_type", "json"));
     }
 
     /**
@@ -639,7 +646,7 @@ public ApiResponse updateMetadataFieldDatasource(String fieldExternalId, List<Me
      */
     public ApiResponse deleteDatasourceEntries(String fieldExternalId, List<String> entriesExternalId) throws Exception {
         List<String> uri = Arrays.asList("metadata_fields", fieldExternalId, "datasource");
-        return callApi(HttpMethod.DELETE, uri,Collections.singletonMap("external_ids", entriesExternalId) , Collections.emptyMap());
+        return callApi(HttpMethod.DELETE, uri, Collections.singletonMap("external_ids", entriesExternalId), Collections.emptyMap());
     }
 
     /**

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

@@ -186,6 +186,9 @@ public static Configuration from(String cloudinaryUrl) {
     static protected Map parseConfigUrl(String cloudinaryUrl) {
         Map params = new HashMap();
         URI cloudinaryUri = URI.create(cloudinaryUrl);
+        if (cloudinaryUri.getScheme() == null || !cloudinaryUri.getScheme().equalsIgnoreCase("cloudinary")){
+            throw new IllegalArgumentException("Invalid CLOUDINARY_URL scheme. Expecting to start with 'cloudinary://'");
+        }
         params.put("cloud_name", cloudinaryUri.getHost());
         if (cloudinaryUri.getUserInfo() != null) {
             String[] creds = cloudinaryUri.getUserInfo().split(":");
@@ -427,4 +430,4 @@ public Builder from(Configuration other) {
             return this;
         }
     }
-}
+}

cloudinary-core/src/main/java/com/cloudinary/strategies/AbstractApiStrategy.java

@@ -2,17 +2,31 @@
 
 import com.cloudinary.Api;
 import com.cloudinary.Api.HttpMethod;
+import com.cloudinary.SmartUrlEncoder;
 import com.cloudinary.api.ApiResponse;
-
+import com.cloudinary.utils.StringUtils;
+import java.util.Arrays;
 import java.util.Map;
 
+
 public abstract class AbstractApiStrategy {
     protected Api api;
 
     public void init(Api api) {
         this.api = api;
     }
 
+    protected String createApiUrl (Iterable<String> uri, String prefix, String cloudName){
+
+        String apiUrl = StringUtils.join(Arrays.asList(prefix, "v1_1", cloudName), "/");
+        for (String component : uri) {
+            component = SmartUrlEncoder.encode(component);
+            apiUrl = apiUrl + "/" + component;
+
+        }
+            return apiUrl;
+    }
+
     @SuppressWarnings("rawtypes")
     public abstract ApiResponse callApi(HttpMethod method, Iterable<String> uri, Map<String, ? extends Object> params, Map options) throws Exception;
 

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

@@ -1230,6 +1230,24 @@ public void testConfiguration() throws IllegalAccessException {
         assertFieldsEqual(config, copy);
     }
 
+    @Test
+    public void testCloudinaryUrlValidScheme() {
+        String cloudinaryUrl = "cloudinary://123456789012345:ALKJdjklLJAjhkKJ45hBK92baj3@test";
+        Configuration.from(cloudinaryUrl);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testCloudinaryUrlInvalidScheme() {
+        String cloudinaryUrl = "https://123456789012345:ALKJdjklLJAjhkKJ45hBK92baj3@test";
+        Configuration.from(cloudinaryUrl);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testCloudinaryUrlEmptyScheme() {
+        String cloudinaryUrl = " ";
+        Configuration.from(cloudinaryUrl);
+    }
+
     private void assertFieldsEqual(Object a, Object b) throws IllegalAccessException {
         assertEquals("Two objects must be the same class", a.getClass(), b.getClass());
         Field[] fields = a.getClass().getFields();

cloudinary-http42/src/main/java/com/cloudinary/http42/ApiStrategy.java

@@ -43,11 +43,7 @@ public ApiResponse callApi(HttpMethod method, Iterable<String> uri, Map<String,
         if (apiSecret == null) throw new IllegalArgumentException("Must supply api_secret");
         String contentType = ObjectUtils.asString(options.get("content_type"), "urlencoded");
         int timeout = ObjectUtils.asInteger(options.get("timeout"), this.api.cloudinary.config.timeout);
-        String apiUrl = StringUtils.join(Arrays.asList(prefix, "v1_1", cloudName), "/");
-
-        for (String component : uri) {
-            apiUrl = apiUrl + "/" + component;
-        }
+        String apiUrl = createApiUrl(uri, prefix, cloudName);
 
         return getApiResponse(method, params, apiKey, apiSecret, contentType, timeout, apiUrl);
     }

cloudinary-http43/src/main/java/com/cloudinary/http43/ApiStrategy.java

@@ -84,10 +84,7 @@ public ApiResponse callApi(HttpMethod method, Iterable<String> uri, Map<String,
         if (apiSecret == null) throw new IllegalArgumentException("Must supply api_secret");
 
 
-        String apiUrl = StringUtils.join(Arrays.asList(prefix, "v1_1", cloudName), "/");
-        for (String component : uri) {
-            apiUrl = apiUrl + "/" + component;
-        }
+        String apiUrl = createApiUrl(uri, prefix, cloudName);
         HttpUriRequest request = prepareRequest(method, apiUrl, params, options);
 
         request.setHeader("Authorization", "Basic " + Base64Coder.encodeString(apiKey + ":" + apiSecret));

cloudinary-http44/src/main/java/com/cloudinary/http44/ApiStrategy.java

@@ -86,10 +86,7 @@ public ApiResponse callApi(HttpMethod method, Iterable<String> uri, Map<String,
         if (apiSecret == null) throw new IllegalArgumentException("Must supply api_secret");
 
 
-        String apiUrl = StringUtils.join(Arrays.asList(prefix, "v1_1", cloudName), "/");
-        for (String component : uri) {
-            apiUrl = apiUrl + "/" + component;
-        }
+        String apiUrl = createApiUrl(uri, prefix, cloudName);
         HttpUriRequest request = prepareRequest(method, apiUrl, params, options);
 
         request.setHeader("Authorization", "Basic " + Base64Coder.encodeString(apiKey + ":" + apiSecret));
@@ -204,4 +201,4 @@ private HttpUriRequest prepareRequest(HttpMethod method, String apiUrl, Map<Stri
         setTimeouts(request, options);
         return request;
     }
-}
+}

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

@@ -46,6 +46,7 @@ abstract public class AbstractApiTest extends MockableTest {
     public static final Transformation DELETE_TRANSFORMATION = new Transformation().width(100).crop("scale").overlay(new TextLayer().text(SUFFIX + "_delete").fontFamily("Arial").fontSize(60));
     public static final String TEST_KEY = "test-key" + SUFFIX;
     public static final String API_TEST_RESTORE = "api_test_restore" + SUFFIX;
+    public static final Set<String> createdFolders = new HashSet<String>();
 
     protected Api api;
 
@@ -119,6 +120,12 @@ public static void tearDownClass() {
             api.deleteUploadPreset(API_TEST_UPLOAD_PRESET_4, ObjectUtils.emptyMap());
         } catch (Exception ignored) {
         }
+        try {
+            for (String folder : createdFolders) {
+                api.deleteFolder(folder, ObjectUtils.emptyMap());
+            }
+        } catch (Exception ignored) {
+        }
 
     }
 
@@ -484,7 +491,8 @@ public void testListTransformationByNamed() throws Exception {
         } finally {
             try {
                 api.deleteTransformation(name, null);
-            } catch (Exception ignored){}
+            } catch (Exception ignored) {
+            }
         }
     }
 
@@ -653,7 +661,7 @@ public void testGetUploadPreset() throws Exception {
         String[] tags = {"a", "b", "c"};
         Map context = ObjectUtils.asMap("a", "b", "c", "d");
         Map result = api.createUploadPreset(ObjectUtils.asMap("unsigned", true, "folder", "folder", "transformation", EXPLICIT_TRANSFORMATION, "tags", tags, "context",
-                context,"live",true));
+                context, "live", true));
         String name = result.get("name").toString();
         Map preset = api.uploadPreset(name, ObjectUtils.emptyMap());
         assertEquals(preset.get("name"), name);
@@ -693,7 +701,7 @@ public void testUpdateUploadPreset() throws Exception {
         String name = api.createUploadPreset(ObjectUtils.asMap("folder", "folder")).get("name").toString();
         Map preset = api.uploadPreset(name, ObjectUtils.emptyMap());
         Map settings = (Map) preset.get("settings");
-        settings.putAll(ObjectUtils.asMap("colors", true, "unsigned", true, "disallow_public_id", true,"live",true));
+        settings.putAll(ObjectUtils.asMap("colors", true, "unsigned", true, "disallow_public_id", true, "live", true));
         api.updateUploadPreset(name, settings);
         settings.remove("unsigned");
         preset = api.uploadPreset(name, ObjectUtils.emptyMap());
@@ -758,6 +766,14 @@ public void testFolderApi() throws Exception {
         api.deleteResourcesByPrefix("test_folder", ObjectUtils.emptyMap());
     }
 
+    @Test
+    public void testCreateFolder() throws Exception {
+        String apTestCreateFolder = "api_test_create_folder" + "_" + SUFFIX;
+        createdFolders.add(apTestCreateFolder);
+        Map result = api.createFolder("apTestCreateFolder", null);
+        assertTrue((Boolean) result.get("success"));
+    }
+
     @Test
     public void testRestore() throws Exception {
         // should support restoring resources
@@ -777,6 +793,14 @@ public void testRestore() throws Exception {
         assertEquals(resource.get("bytes"), 3381);
     }
 
+    @Test
+    public void testEncodeUrlInApiCall() throws Exception {
+        String apiTestEncodeUrlInApiCall = "sub^folder test";
+        createdFolders.add(apiTestEncodeUrlInApiCall);
+        Map result = api.createFolder(apiTestEncodeUrlInApiCall, null);
+        assertEquals("sub^folder test", result.get("path"));
+    }
+
     @Test
     public void testUploadMapping() throws Exception {
         String aptTestUploadMapping = "api_test_upload_mapping" + SUFFIX;
@@ -946,7 +970,7 @@ public void testDeleteFolder() throws Exception {
         Thread.sleep(5000);
         api.deleteResources(Collections.singletonList(uploadResult.get("public_id").toString()), emptyMap());
         ApiResponse result = api.deleteFolder(toDelete, emptyMap());
-        assertTrue(((ArrayList)result.get("deleted")).contains(toDelete));
+        assertTrue(((ArrayList) result.get("deleted")).contains(toDelete));
 
         // should throw exception (folder not found):
         api.deleteFolder(cloudinary.randomPublicId(), emptyMap());
@@ -958,4 +982,4 @@ public void testCinemagraphAnalysisResource() throws Exception {
         ApiResponse res = api.resource(API_TEST, Collections.singletonMap("cinemagraph_analysis", true));
         assertNotNull(res.get("cinemagraph_analysis"));
     }
-}
+}