Fix nginx#23

When running in S3, inconsistency in encoding unicode
characters let to certain resources being unavailable.
This change fixes the issue.

Author: dekobon

common/etc/nginx/include/s3gateway.js

@@ -265,11 +265,12 @@ function _s3DirQueryParams(uriPath, method) {
         return '';
     }
 
-    var path = 'delimiter=%2F'
+    let path = 'delimiter=%2F'
 
     if (uriPath !== '/') {
-        var without_leading_slash = uriPath.charAt(0) === '/' ?
-            uriPath.substring(1, uriPath.length) : uriPath;
+        let decodedUriPath = decodeURIComponent(uriPath);
+        let without_leading_slash = decodedUriPath.charAt(0) === '/' ?
+            decodedUriPath.substring(1, decodedUriPath.length) : decodedUriPath;
         path += '&prefix=' + encodeURIComponent(without_leading_slash);
     }
 
@@ -329,7 +330,7 @@ function signatureV2(r, bucket, credentials) {
 
     var s3signature = hmac.update(stringToSign).digest('base64');
 
-    return 'AWS ' + credentials.accessKeyId + ':' + s3signature;
+    return `AWS ${credentials.accessKeyId}:${s3signature}`;
 }
 
 /**
@@ -595,7 +596,9 @@ function _eightDigitDate(timestamp) {
     var month = timestamp.getUTCMonth() + 1;
     var day = timestamp.getUTCDate();
 
-    return ''.concat(_padWithLeadingZeros(year, 4), _padWithLeadingZeros(month, 2), _padWithLeadingZeros(day, 2));
+    return ''.concat(_padWithLeadingZeros(year, 4),
+        _padWithLeadingZeros(month,2),
+        _padWithLeadingZeros(day,2));
 }
 
 /**
@@ -643,9 +646,11 @@ function _padWithLeadingZeros(num, size) {
  * @private
  */
 function _escapeURIPath(uri) {
-    var components = [];
+    // Check to see if the URI path was already encoded. If so, we decode it.
+    let decodedUri = (uri.indexOf('%') >= 0) ? decodeURIComponent(uri) : uri;
+    let components = [];
 
-    uri.split('/').forEach(function (item, i) {
+    decodedUri.split('/').forEach(function (item, i) {
         components[i] = encodeURIComponent(item);
     });
 

test/data/bucket-1/системы/%bad%file%name%

@@ -0,0 +1 @@
+Filename encoding issues are hard.

test/integration/test_api.sh

@@ -135,6 +135,7 @@ assertHttpRequestEquals "HEAD" "b/c/@" "200"
 assertHttpRequestEquals "HEAD" "a/c/あ" "200"
 assertHttpRequestEquals "HEAD" "b/クズ箱/ゴミ.txt" "200"
 assertHttpRequestEquals "HEAD" "системы/system.txt" "200"
+assertHttpRequestEquals "HEAD" "%D1%81%D0%B8%D1%81%D1%82%D0%B5%D0%BC%D1%8B/%25bad%25file%25name%25" "200"
 
 # Expected 400s
 assertHttpRequestEquals "HEAD" "request with unencoded spaces" "400"
@@ -170,6 +171,7 @@ assertHttpRequestEquals "GET" "a/c/あ" "data/bucket-1/a/c/あ"
 assertHttpRequestEquals "GET" "b/ブツブツ.txt" "data/bucket-1/b/ブツブツ.txt"
 assertHttpRequestEquals "GET" "b/クズ箱/ゴミ.txt" "data/bucket-1/b/クズ箱/ゴミ.txt"
 assertHttpRequestEquals "GET" "системы/system.txt" "data/bucket-1/системы/system.txt"
+assertHttpRequestEquals "GET" "%D1%81%D0%B8%D1%81%D1%82%D0%B5%D0%BC%D1%8B/%25bad%25file%25name%25" "data/bucket-1/системы/%bad%file%name%"
 
 if [ "${allow_directory_list}" == "1" ]; then
   assertHttpRequestEquals "GET" "/" "200"