Changes to support encoded resource path coming in request. (#2546)

* Changes to support encoded resource path coming in request.

* Making get and set encoded uri methods on request public.

Author: poojamat

aws-android-sdk-core/src/main/java/com/amazonaws/DefaultRequest.java

@@ -76,6 +76,9 @@ public class DefaultRequest<T> implements Request<T> {
     /** An optional prefix to prepend to the request endpoint host */
     private String hostPrefix;
 
+    /** encoded uri resource path */
+    private String encodedUriResourcePath;
+
     /**
      * Constructs a new DefaultRequest with the specified service name and the
      * original, user facing request object.
@@ -371,4 +374,14 @@ public boolean isStreaming() {
     public void setStreaming(boolean streaming) {
         this.streaming = streaming;
     }
+
+    @Override
+    public String getEncodedUriResourcePath() {
+        return encodedUriResourcePath;
+    }
+
+    @Override
+    public void setEncodedResourcePath(String encodedUriResourcePath) {
+        this.encodedUriResourcePath = encodedUriResourcePath;
+    }
 }

aws-android-sdk-core/src/main/java/com/amazonaws/Request.java

@@ -61,13 +61,15 @@ public interface Request<T> {
      *
      * @param path The path to the resource being requested.
      */
+    @Deprecated
     public void setResourcePath(String path);
 
     /**
      * Returns the path to the resource being requested.
      *
      * @return The path to the resource being requested.
      */
+    @Deprecated
     public String getResourcePath();
 
     /**
@@ -262,4 +264,16 @@ public interface Request<T> {
      * @param streaming the streaming flag.
      */
     public void setStreaming(boolean streaming);
+
+    /**
+     * Get Encoded Uri Resource Path
+     */
+    public String getEncodedUriResourcePath();
+
+    /**
+     *
+     * Set Encoded Uri Resource Path
+     * @param encodedUriResourcePath encoded uri resource path
+     */
+    public void setEncodedResourcePath(String encodedUriResourcePath);
 }

aws-android-sdk-core/src/main/java/com/amazonaws/auth/AWS4Signer.java

@@ -250,8 +250,14 @@ protected String getSignedHeadersString(Request<?> request) {
 
     protected String getCanonicalRequest(Request<?> request, String contentSha256) {
         /* This would url-encode the resource path for the first time */
-        final String path = HttpUtils.appendUri(request.getEndpoint().getPath(),
-                request.getResourcePath());
+        String path;
+        if(request.getEncodedUriResourcePath()!= null){
+            path = HttpUtils.appendUriEncoded(request.getEndpoint().getPath(),
+                    request.getEncodedUriResourcePath());
+        }else{
+            path = HttpUtils.appendUri(request.getEndpoint().getPath(),
+                    request.getResourcePath());
+        };
 
         final String canonicalRequest =
                 request.getHttpMethod().toString() + "\n" +

aws-android-sdk-core/src/main/java/com/amazonaws/http/HttpRequestFactory.java

@@ -54,7 +54,13 @@ public HttpRequest createHttpRequest(Request<?> request,
          * have to escape the double-slash between endpoint and resource-path
          * into "/%2F"
          */
-        String uri = HttpUtils.appendUri(endpoint.toString(), request.getResourcePath(), true);
+        String uri;
+        //The if here is for backward compatibility
+        if(request.getEncodedUriResourcePath()!= null){
+            uri = HttpUtils.appendUriEncoded(endpoint.toString(), request.getEncodedUriResourcePath());
+        }else{
+            uri = HttpUtils.appendUri(endpoint.toString(), request.getResourcePath(), true);
+        }
         final String encodedParams = HttpUtils.encodeParameters(request);
         HttpMethodName method = request.getHttpMethod();
 

aws-android-sdk-core/src/main/java/com/amazonaws/util/HttpUtils.java

@@ -257,6 +257,24 @@ public static String appendUri(final String baseUri, String path,
         return resultUri;
     }
 
+    /**
+     * Append the given path to the given baseUri.
+     * <p>
+     * This method will encode the given path but not the given baseUri.
+     * </p>
+     *
+     * @param baseUri The URI to append to (required, may be relative)
+     * @param paths The path array to append (may be null or empty)
+     * @return The baseUri with the (encoded) path appended
+     */
+    public static String appendUriEncoded(final String baseUri, String paths) {
+        String resultUri = baseUri;
+        if (paths != null) {
+            resultUri += paths;
+        }
+        return resultUri;
+    }
+
     /**
      * Fetches a file from the URI given and returns an input stream to it.
      *

aws-android-sdk-core/src/test/java/com/amazonaws/http/HttpRequestFactoryTest.java

@@ -35,12 +35,12 @@ public class HttpRequestFactoryTest {
     private Request<?> request;
     private ClientConfiguration clientConfiguration;
     private ExecutionContext context;
-
+    private final String endpoint = "https://s3.amazonaws.com";
     @Before
     public void setup() {
         factory = new HttpRequestFactory();
         request = new DefaultRequest<Object>("dummy");
-        request.setEndpoint(URI.create("https://s3.amazonaws.com"));
+        request.setEndpoint(URI.create(endpoint));
         clientConfiguration = new ClientConfiguration();
         context = new ExecutionContext();
     }
@@ -70,4 +70,15 @@ public void testEnableCompression() {
         final Map<String, String> headers = httpRequest.getHeaders();
         assertEquals("accept encoding is gzip", "gzip", headers.get("Accept-Encoding"));
     }
+
+    @Test
+    public void testHttpRequestCreatedWithEncodedResourcePath() {
+        String expectedResourcePath = "/android%2F/sdk";
+        String expectedUri = endpoint+expectedResourcePath;
+        clientConfiguration.withEnableGzip(true);
+        request.setEncodedResourcePath(expectedResourcePath);
+        final HttpRequest httpRequest = factory.createHttpRequest(request, clientConfiguration, context);
+        assertEquals(URI.create(expectedUri), httpRequest.getUri());
+    }
+
 }

aws-android-sdk-core/src/test/java/com/amazonaws/util/HttpUtilsTest.java

@@ -224,4 +224,13 @@ public void testAppendUriNoEscapeDoubleSlash() {
         Assert.assertEquals(HttpUtils.appendUri(host, resourcePath, false),
                 "foo.com/aws//android/sdk");
     }
+
+    @Test
+    public void testAppendEncodedUri() {
+        final String host = "foo.com";
+        final String resourcePath = "/android%2F/sdk";
+        Assert.assertEquals(HttpUtils.appendUriEncoded(host, resourcePath),
+                "foo.com/android%2F/sdk");
+    }
+
 }