From 43324f0ded533e7b5d376c7bb1e1718715adabf5 Mon Sep 17 00:00:00 2001
From: seibed <david.seibert@emc.com>
Date: Thu, 20 Dec 2018 17:22:34 -0500
Subject: [PATCH] Fix implemented for both folder browsing and folder download.

---
 Dockerfile                                                    | 4 ++--
 build.gradle                                                  | 4 ++--
 .../java/com/emc/ecs/browser/spring/ServiceController.java    | 4 ++--
 src/main/resources/static/javascript/S3Browser.js             | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ec81a75..0843d4e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,6 +18,6 @@ FROM openjdk:8
 EXPOSE 8080
 
 WORKDIR /usr/src/app
-COPY build/libs/ecs-browser-1.0.0.jar ./
+COPY build/libs/ecs-browser-1.0.1.jar ./
 
-CMD [ "java", "-jar", "ecs-browser-1.0.0.jar" ]
+CMD [ "java", "-jar", "ecs-browser-1.0.1.jar" ]
diff --git a/build.gradle b/build.gradle
index 286464a..388b586 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 description = "ECS browser website"
 group = 'com.emc.ecs'
-version = '1.0.0'
+version = '1.0.1'
 
 ext.licenseName = ''
 ext.licenseUrl = ''
@@ -30,7 +30,7 @@ defaultTasks 'build'
 
 jar {
     baseName = 'ecs-browser'
-    version =  '1.0.0'
+    version =  '1.0.1'
     into('META-INF/dependency-license') {
         from 'build/reports/dependency-license'
     }
diff --git a/src/main/java/com/emc/ecs/browser/spring/ServiceController.java b/src/main/java/com/emc/ecs/browser/spring/ServiceController.java
index 2395cb1..03e54b5 100644
--- a/src/main/java/com/emc/ecs/browser/spring/ServiceController.java
+++ b/src/main/java/com/emc/ecs/browser/spring/ServiceController.java
@@ -223,7 +223,7 @@ public ResponseEntity<?> postProxy(HttpServletRequest request) throws Exception
                             }
                             marker = ( lastPrefix.compareTo(lastKey) > 0 ) ? lastPrefix : lastKey;
                         }
-                        String newUrl = resource + separator + "marker=" + marker;
+                        String newUrl = resource + separator + "marker=" + RestUtil.urlEncode(marker);
                         System.out.println("Another page after " + marker + " using " + newUrl );
                         requestEntity = new RequestEntity<byte[]>(data, newHeaders, method, new URI(newUrl));
                         dataToReturn = new WrappedResponseEntity( client.exchange(requestEntity, ListObjectsResult.class) );
@@ -284,7 +284,7 @@ public ResponseEntity<?> postProxy(HttpServletRequest request) throws Exception
                             }
                             marker = ( lastPrefix.compareTo(lastKey) > 0 ) ? lastPrefix : lastKey;
                         }
-                        String newUrl = resource + separator + "marker=" + marker;
+                        String newUrl = resource + separator + "marker=" + RestUtil.urlEncode(marker);
                         System.out.println("Another page after " + marker + " using " + newUrl );
                         requestEntity = new RequestEntity<byte[]>(data, newHeaders, method, new URI(newUrl));
                         ResponseEntity<ListObjectsResult> newListResponse = new WrappedResponseEntity( client.exchange(requestEntity, ListObjectsResult.class) );
diff --git a/src/main/resources/static/javascript/S3Browser.js b/src/main/resources/static/javascript/S3Browser.js
index ec30495..9296405 100644
--- a/src/main/resources/static/javascript/S3Browser.js
+++ b/src/main/resources/static/javascript/S3Browser.js
@@ -61,7 +61,7 @@ S3Browser = function( options, $parent ) {
 
 // release version
 /** @define {string} */
-var S3_BROWSER_VERSION = '1.0.0';
+var S3_BROWSER_VERSION = '1.0.1';
 S3Browser.version = S3_BROWSER_VERSION;
 
 /** @define {boolean} */