localstack-core 4.13.2.dev60__py3-none-any.whl → 4.13.2.dev61__py3-none-any.whl

localstack/services/s3/provider.py

@@ -276,7 +276,9 @@ from localstack.services.s3.utils import (
     base_64_content_md5_to_etag,
     create_redirect_for_post_request,
     create_s3_kms_managed_key_for_region,
+    decode_continuation_token,
     decode_user_metadata,
+    encode_continuation_token,
     encode_user_metadata,
     etag_to_base_64_content_md5,
     extract_bucket_key_version_id_from_copy_source,
@@ -321,6 +323,7 @@ from localstack.services.s3.validation import (
     validate_canned_acl,
     validate_checksum_value,
     validate_cors_configuration,
+    validate_encoding_type,
     validate_inventory_configuration,
     validate_lifecycle_configuration,
     validate_object_key,
@@ -1722,6 +1725,7 @@ class S3Provider(S3Api, ServiceLifecycleHook):
         **kwargs,
     ) -> ListObjectsOutput:
         store, s3_bucket = self._get_cross_account_bucket(context, bucket)
+        validate_encoding_type(encoding_type)
 
         common_prefixes = set()
         count = 0
@@ -1730,7 +1734,7 @@ class S3Provider(S3Api, ServiceLifecycleHook):
         max_keys = max_keys or 1000
         prefix = prefix or ""
         delimiter = delimiter or ""
-        if encoding_type:
+        if encoding_type == EncodingType.url:
             prefix = urlparse.quote(prefix)
             delimiter = urlparse.quote(delimiter)
 
@@ -1839,6 +1843,7 @@ class S3Provider(S3Api, ServiceLifecycleHook):
                 "The continuation token provided is incorrect",
                 ArgumentName="continuation-token",
             )
+        validate_encoding_type(encoding_type)
 
         common_prefixes = set()
         count = 0
@@ -1847,14 +1852,14 @@ class S3Provider(S3Api, ServiceLifecycleHook):
         max_keys = max_keys or 1000
         prefix = prefix or ""
         delimiter = delimiter or ""
-        if encoding_type:
+        start_after = start_after or ""
+        decoded_continuation_token = decode_continuation_token(continuation_token)
+
+        if encoding_type == EncodingType.url:
             prefix = urlparse.quote(prefix)
             delimiter = urlparse.quote(delimiter)
-        decoded_continuation_token = (
-            to_str(base64.urlsafe_b64decode(continuation_token.encode()))
-            if continuation_token
-            else None
-        )
+            start_after = urlparse.quote(start_after)
+            decoded_continuation_token = urlparse.quote(decoded_continuation_token)
 
         s3_objects: list[Object] = []
 
@@ -1890,7 +1895,7 @@ class S3Provider(S3Api, ServiceLifecycleHook):
             # After skipping all entries, verify we're not over the MaxKeys before adding a new entry
             if count >= max_keys:
                 is_truncated = True
-                next_continuation_token = to_str(base64.urlsafe_b64encode(s3_object.key.encode()))
+                next_continuation_token = encode_continuation_token(s3_object.key)
                 break
 
             # if we found a new CommonPrefix, add it to the CommonPrefixes
@@ -1971,6 +1976,7 @@ class S3Provider(S3Api, ServiceLifecycleHook):
                 ArgumentName="version-id-marker",
                 ArgumentValue=version_id_marker,
             )
+        validate_encoding_type(encoding_type)
 
         store, s3_bucket = self._get_cross_account_bucket(context, bucket)
         common_prefixes = set()
@@ -1981,7 +1987,7 @@ class S3Provider(S3Api, ServiceLifecycleHook):
         max_keys = max_keys or 1000
         prefix = prefix or ""
         delimiter = delimiter or ""
-        if encoding_type:
+        if encoding_type == EncodingType.url:
             prefix = urlparse.quote(prefix)
             delimiter = urlparse.quote(delimiter)
         version_key_marker_found = False
@@ -2968,6 +2974,7 @@ class S3Provider(S3Api, ServiceLifecycleHook):
         **kwargs,
     ) -> ListMultipartUploadsOutput:
         store, s3_bucket = self._get_cross_account_bucket(context, bucket)
+        validate_encoding_type(encoding_type)
 
         common_prefixes = set()
         count = 0
@@ -2975,7 +2982,7 @@ class S3Provider(S3Api, ServiceLifecycleHook):
         max_uploads = max_uploads or 1000
         prefix = prefix or ""
         delimiter = delimiter or ""
-        if encoding_type:
+        if encoding_type == EncodingType.url:
             prefix = urlparse.quote(prefix)
             delimiter = urlparse.quote(delimiter)
         upload_id_marker_found = False

localstack/services/s3/utils.py

@@ -1173,3 +1173,23 @@ def get_bucket_location_xml(location_constraint: str) -> str:
         '<LocationConstraint xmlns="http://s3.amazonaws.com/doc/2006-03-01/"'
         + ("/>" if not location_constraint else f">{location_constraint}</LocationConstraint>")
     )
+
+
+def encode_continuation_token(value: str) -> str:
+    """
+    :param value: a string value to be encoded
+    :return: a base64 encoded S3 ContinuationMarker
+    """
+    return base64.b64encode(value.encode(), altchars=b"._").decode("ascii")
+
+
+def decode_continuation_token(value: str | None) -> str:
+    """
+    Pendant to ``encode_continuation_token``, will decode the value back to its original form
+    :param value: a ContinuationMarker value
+    :return: a string from the base64 decoded value
+    """
+    if value is None:
+        return ""
+
+    return base64.b64decode(value, altchars=b"._").decode("ascii")

localstack/services/s3/validation.py

@@ -15,6 +15,7 @@ from localstack.aws.api.s3 import (
     BucketName,
     ChecksumAlgorithm,
     CORSConfiguration,
+    EncodingType,
     Grant,
     Grantee,
     Grants,
@@ -520,3 +521,12 @@ def validate_checksum_value(checksum_value: str, checksum_algorithm: ChecksumAlg
             valid_length = 0
 
     return len(checksum) == valid_length
+
+
+def validate_encoding_type(encoding_type: EncodingType):
+    if encoding_type is not None and not encoding_type == EncodingType.url:
+        raise InvalidArgument(
+            "Invalid Encoding Method specified in Request",
+            ArgumentName="encoding-type",
+            ArgumentValue=encoding_type,
+        )

localstack/version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '4.13.2.dev60'
-__version_tuple__ = version_tuple = (4, 13, 2, 'dev60')
+__version__ = version = '4.13.2.dev61'
+__version_tuple__ = version_tuple = (4, 13, 2, 'dev61')
 
 __commit_id__ = commit_id = None

{localstack_core-4.13.2.dev60.dist-info → localstack_core-4.13.2.dev61.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: localstack-core
-Version: 4.13.2.dev60
+Version: 4.13.2.dev61
 Summary: The core library and runtime of LocalStack
 Author-email: LocalStack Contributors <info@localstack.cloud>
 License-Expression: Apache-2.0

{localstack_core-4.13.2.dev60.dist-info → localstack_core-4.13.2.dev61.dist-info}/RECORD

@@ -4,7 +4,7 @@ localstack/deprecations.py,sha256=-3IYgCd6LEC3PjO7hbr3Dg-p0PIS6phjmv1qZnj1uo0,15
 localstack/openapi.yaml,sha256=jFUzv-NKkJttxb8HRrmKiNYOmJD-zVfPxG3DDMrRwfg,30865
 localstack/plugins.py,sha256=BIJC9dlo0WbP7lLKkCiGtd_2q5oeqiHZohvoRTcejXM,2457
 localstack/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-localstack/version.py,sha256=wPsud1xN5dWONJepYvYR0NX9k7WPVTiCI8OXGm7i9P4,721
+localstack/version.py,sha256=zJLAnFG15jxKHdc81amA43C3SU17fo3IFV2ITv3vdvM,721
 localstack/aws/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 localstack/aws/accounts.py,sha256=102zpGowOxo0S6UGMpfjw14QW7WCLVAGsnFK5xFMLoo,3043
 localstack/aws/app.py,sha256=n9bJCfJRuMz_gLGAH430c3bIQXgUXeWO5NPfcdL2MV8,5145
@@ -690,9 +690,9 @@ localstack/services/s3/headers.py,sha256=jh0R2vhdnB5pWiVCoV26kqup53dBWz3iQIE3mhP
 localstack/services/s3/models.py,sha256=EwywhCScxHnbbbwM_Zp5x5rJMsy4Uf7CpvO1LaDj18k,31315
 localstack/services/s3/notifications.py,sha256=JRvZTs3YpEXX-tPdliarVKjKsp42fdzrTNOC51y2-8I,32568
 localstack/services/s3/presigned_url.py,sha256=2rbkrEYMimmanUW6RQdYGSb9PGFDZa6MmLru8ZkBri8,38438
-localstack/services/s3/provider.py,sha256=ShFkGoSw_E5BcM1gtzmvc4p38bs9nKf1CEpBaG5xtxM,201373
-localstack/services/s3/utils.py,sha256=mBubuZVrdTBhMxCsTw6I1mmCxI8O_fiZVd9rRAgrGLs,43815
-localstack/services/s3/validation.py,sha256=n4XdJLJdGddKd9JFBjtbRHaPzzTW8H1I_1uQS4N_w1s,20202
+localstack/services/s3/provider.py,sha256=O_Z7SNJ4XV7J45ofMg8QNNqhzlTNhSPE-dPaadkQMYA,201794
+localstack/services/s3/utils.py,sha256=yRE4P_ULUIt4WxU55WtIkxj584lObisjolzPKtlIYnM,44432
+localstack/services/s3/validation.py,sha256=KPs960rBpUOK9Ui3TqPubqT7t2PNox8l5vRP9U-o9CE,20539
 localstack/services/s3/website_hosting.py,sha256=I4cE7omiN7EBQjdlvueSb_DaD8cwEZxeh7K-H_We30k,16672
 localstack/services/s3/resource_providers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 localstack/services/s3/resource_providers/aws_s3_bucket.py,sha256=usTd16U_pw5MG3DBCLNNFQfwWiW5iAPvsT-OGQRjm9k,22770
@@ -1311,10 +1311,10 @@ localstack/utils/server/tcp_proxy.py,sha256=y2NJAmvftTiAYsLU_8qe4W5LGqwUw21i90Pu
 localstack/utils/xray/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 localstack/utils/xray/trace_header.py,sha256=ahXk9eonq7LpeENwlqUEPj3jDOCiVRixhntQuxNor-Q,6209
 localstack/utils/xray/traceid.py,sha256=GKO-R2sMMjlrH2UaLPXlQlZ6flbE7ZKb6IZMtMu_M5U,1110
-localstack_core-4.13.2.dev60.data/scripts/localstack-supervisor,sha256=nm1Il2d6ASyOB6Vo4CRHd90w7TK9FdRl9VPp0NN6hUk,6378
-localstack_core-4.13.2.dev60.dist-info/licenses/LICENSE.txt,sha256=3PC-9Z69UsNARuQ980gNR_JsLx8uvMjdG6C7cc4LBYs,606
-localstack_core-4.13.2.dev60.dist-info/METADATA,sha256=OrG9fXCJwjNQ7cmcHB9D4xUx0VrQoV8kQE3Zf9bxsoE,5867
-localstack_core-4.13.2.dev60.dist-info/WHEEL,sha256=YCfwYGOYMi5Jhw2fU4yNgwErybb2IX5PEwBKV4ZbdBo,91
-localstack_core-4.13.2.dev60.dist-info/entry_points.txt,sha256=59aAnn8KVHWAHkMg2dOgmgYtRZ-xTX9T4UiIchWgK6k,20975
-localstack_core-4.13.2.dev60.dist-info/top_level.txt,sha256=3sqmK2lGac8nCy8nwsbS5SpIY_izmtWtgaTFKHYVHbI,11
-localstack_core-4.13.2.dev60.dist-info/RECORD,,
+localstack_core-4.13.2.dev61.data/scripts/localstack-supervisor,sha256=nm1Il2d6ASyOB6Vo4CRHd90w7TK9FdRl9VPp0NN6hUk,6378
+localstack_core-4.13.2.dev61.dist-info/licenses/LICENSE.txt,sha256=3PC-9Z69UsNARuQ980gNR_JsLx8uvMjdG6C7cc4LBYs,606
+localstack_core-4.13.2.dev61.dist-info/METADATA,sha256=NAnOOm-Rad-8_6mcSlokP3M3_wNfzLMITQHm88gGhjI,5867
+localstack_core-4.13.2.dev61.dist-info/WHEEL,sha256=YCfwYGOYMi5Jhw2fU4yNgwErybb2IX5PEwBKV4ZbdBo,91
+localstack_core-4.13.2.dev61.dist-info/entry_points.txt,sha256=59aAnn8KVHWAHkMg2dOgmgYtRZ-xTX9T4UiIchWgK6k,20975
+localstack_core-4.13.2.dev61.dist-info/top_level.txt,sha256=3sqmK2lGac8nCy8nwsbS5SpIY_izmtWtgaTFKHYVHbI,11
+localstack_core-4.13.2.dev61.dist-info/RECORD,,