s3 key_name encoding should be variable (#5184)

getmoto · Jun 1, 2022 · b96eafb · b96eafb
1 parent 34a98d2
commit b96eafb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/moto/s3/models.py b/moto/s3/models.py
@@ -154,9 +154,10 @@ def __init__(
 
         self.s3_backend = s3_backend
 
-    @property
-    def safe_name(self):
-        return urllib.parse.quote(self.name, safe="")
+    def safe_name(self, encoding_type=None):
+        if encoding_type == "url":
+            return urllib.parse.quote(self.name, safe="")
+        return self.name
 
     @property
     def version_id(self):

diff --git a/moto/s3/responses.py b/moto/s3/responses.py
@@ -2064,7 +2064,7 @@ def _invalid_headers(self, url, headers):
   {% endif %}
   {% for key in result_keys %}
     <Contents>
-      <Key>{{ key.safe_name }}</Key>
+      <Key>{{ key.safe_name(encoding_type) }}</Key>
       <LastModified>{{ key.last_modified_ISO8601 }}</LastModified>
       <ETag>{{ key.etag }}</ETag>
       <Size>{{ key.size }}</Size>
@@ -2107,7 +2107,7 @@ def _invalid_headers(self, url, headers):
 {% endif %}
   {% for key in result_keys %}
     <Contents>
-      <Key>{{ key.safe_name }}</Key>
+      <Key>{{ key.safe_name(encoding_type) }}</Key>
       <LastModified>{{ key.last_modified_ISO8601 }}</LastModified>
       <ETag>{{ key.etag }}</ETag>
       <Size>{{ key.size }}</Size>