Skip to content

Encode URLs in API calls #186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jan 19, 2020
Merged

Encode URLs in API calls #186

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cb5b13d
"encode URL in API calls"
michalkcloudinay Nov 25, 2019
d36e306
"indentation in tests and remove try catch"
michalkcloudinay Nov 26, 2019
358bfbf
Add validation for `CLOUDINARY_URL` scheme (#185)
michalkcloudinay Nov 28, 2019
659249e
Support create folder API (#188)
michalkcloudinay Dec 2, 2019
f1cd08b
"encode URL in API calls"
michalkcloudinay Nov 25, 2019
40494a9
"indentation in tests and remove try catch"
michalkcloudinay Nov 26, 2019
b25e576
Test encode url in api calls
michalkcloudinay Dec 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion cloudinary-core/src/main/java/com/cloudinary/strategies/AbstractApiStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
6 changes: 1 addition & 5 deletions cloudinary-http42/src/main/java/com/cloudinary/http42/ApiStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
5 changes: 1 addition & 4 deletions cloudinary-http43/src/main/java/com/cloudinary/http43/ApiStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
7 changes: 2 additions & 5 deletions cloudinary-http44/src/main/java/com/cloudinary/http44/ApiStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down Expand Up @@ -204,4 +201,4 @@ private HttpUriRequest prepareRequest(HttpMethod method, String apiUrl, Map<Stri
setTimeouts(request, options);
return request;
}
}
}
11 changes: 10 additions & 1 deletion cloudinary-test-common/src/main/java/com/cloudinary/test/AbstractApiTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -778,6 +778,15 @@ public void testRestore() throws Exception {
}

@Test
public void testEncodeUrlInApiCall() throws Exception {
try {
Map result = api.subFolders("sub^folder test", null);
assertEquals("sub%5Efolder%20test", ((Map) ((org.cloudinary.json.JSONArray) result.get("folders")).get(0)).get("path"));
} catch (Exception ignored) {

}
}
@Test
public void testUploadMapping() throws Exception {
String aptTestUploadMapping = "api_test_upload_mapping" + SUFFIX;
try {
Expand Down Expand Up @@ -958,4 +967,4 @@ public void testCinemagraphAnalysisResource() throws Exception {
ApiResponse res = api.resource(API_TEST, Collections.singletonMap("cinemagraph_analysis", true));
assertNotNull(res.get("cinemagraph_analysis"));
}
}
}