update region-checker, check encoded key and length

aws · Dec 13, 2018 · c5a4982 · c5a4982
1 parent ea264e5
commit c5a4982
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/lib/services/s3.js b/lib/services/s3.js
@@ -240,7 +240,9 @@ AWS.util.update(AWS.S3.prototype, {
     var bucket = httpRequest.virtualHostedBucket;
     if (bucket && httpRequest.path) {
       if (req.params && req.params.Key) {
-        if (httpRequest.path.indexOf('/' + AWS.util.uriEscapePath(req.params.Key)) === 0 && req.params.Key.indexOf(req.params.Bucket) >= 0) {
+        var encodedS3Key = '/' + AWS.util.uriEscapePath(req.params.Key);
+        if (httpRequest.path.indexOf(encodedS3Key) === 0 && (httpRequest.path.length === encodedS3Key.length || httpRequest.path[encodedS3Key.length] === '?')) {
+          //path only contains key for path contains only key and querystring
           return;
         }
       }

diff --git a/scripts/region-checker/whitelist.js b/scripts/region-checker/whitelist.js
@@ -27,17 +27,17 @@ var whitelist = {
     '/services/s3.js': [
         68,
         69,
-        510,
-        513,
         515,
-        634,
-        645,
-        646,
+        517,
+        516,
+        636,
         647,
-        652
+        648,
+        649,
+        654
     ]
 };
 
 module.exports = {
     whitelist: whitelist
-};
+};