fix S3 copy-source format validation (#10338)

bentsku · web-flow · commit 307cbe952b35 · 2024-02-29T12:54:10.000+01:00
diff --git a/localstack/services/s3/utils.py b/localstack/services/s3/utils.py
@@ -119,9 +119,15 @@ def extract_bucket_key_version_id_from_copy_source(
     copy_source_parsed = urlparser.urlparse(copy_source)
     # we need to manually replace `+` character with a space character before URL decoding, because different languages
     # don't encode their URL the same way (%20 vs +), and Python doesn't unquote + into a space char
-    src_bucket, src_key = (
-        urlparser.unquote(copy_source_parsed.path.replace("+", " ")).lstrip("/").split("/", 1)
-    )
+    parsed_path = urlparser.unquote(copy_source_parsed.path.replace("+", " ")).lstrip("/")
+
+    if "/" not in parsed_path:
+        raise InvalidArgument(
+            "Invalid copy source object key",
+            ArgumentName="x-amz-copy-source",
+            ArgumentValue="x-amz-copy-source",
+        )
+    src_bucket, src_key = parsed_path.split("/", 1)
     src_version_id = urlparser.parse_qs(copy_source_parsed.query).get("versionId", [None])[0]
 
     return src_bucket, src_key, src_version_id
diff --git a/tests/aws/services/s3/test_s3.py b/tests/aws/services/s3/test_s3.py
@@ -1870,6 +1870,17 @@ def test_s3_copy_object_preconditions(self, s3_bucket, snapshot, aws_client):
         )
         snapshot.match("copy-success", copy_obj_all_positive)
 
+    @markers.aws.validated
+    def test_s3_copy_object_wrong_format(self, s3_bucket, snapshot, aws_client):
+        snapshot.add_transformer(snapshot.transform.s3_api())
+        with pytest.raises(ClientError) as e:
+            aws_client.s3.copy_object(
+                Bucket=s3_bucket,
+                CopySource="wrongformat",
+                Key="destination-key",
+            )
+        snapshot.match("copy-object-wrong-copy-source", e.value.response)
+
     @markers.aws.validated
     @pytest.mark.skipif(
         condition=LEGACY_V2_S3_PROVIDER,
diff --git a/tests/aws/services/s3/test_s3.snapshot.json b/tests/aws/services/s3/test_s3.snapshot.json
@@ -11210,5 +11210,22 @@
         }
       }
     }
+  },
+  "tests/aws/services/s3/test_s3.py::TestS3::test_s3_copy_object_wrong_format": {
+    "recorded-date": "27-02-2024, 11:11:22",
+    "recorded-content": {
+      "copy-object-wrong-copy-source": {
+        "Error": {
+          "ArgumentName": "x-amz-copy-source",
+          "ArgumentValue": "x-amz-copy-source",
+          "Code": "InvalidArgument",
+          "Message": "Invalid copy source object key"
+        },
+        "ResponseMetadata": {
+          "HTTPHeaders": {},
+          "HTTPStatusCode": 400
+        }
+      }
+    }
   }
 }
diff --git a/tests/aws/services/s3/test_s3.validation.json b/tests/aws/services/s3/test_s3.validation.json
@@ -302,6 +302,9 @@
   "tests/aws/services/s3/test_s3.py::TestS3::test_s3_copy_object_with_checksum[SHA256]": {
     "last_validated_date": "2023-08-03T02:15:56+00:00"
   },
+  "tests/aws/services/s3/test_s3.py::TestS3::test_s3_copy_object_wrong_format": {
+    "last_validated_date": "2024-02-27T11:11:22+00:00"
+  },
   "tests/aws/services/s3/test_s3.py::TestS3::test_s3_copy_tagging_directive[COPY]": {
     "last_validated_date": "2023-08-03T02:15:09+00:00"
   },

Original file line number	Diff line number	Diff line change
`@@ -11210,5 +11210,22 @@`
`11210`	`11210`	`}`
`11211`	`11211`	`}`
`11212`	`11212`	`}`
	`11213`	`+ },`
	`11214`	`+ "tests/aws/services/s3/test_s3.py::TestS3::test_s3_copy_object_wrong_format": {`
	`11215`	`+ "recorded-date": "27-02-2024, 11:11:22",`
	`11216`	`+ "recorded-content": {`
	`11217`	`+ "copy-object-wrong-copy-source": {`
	`11218`	`+ "Error": {`
	`11219`	`+ "ArgumentName": "x-amz-copy-source",`
	`11220`	`+ "ArgumentValue": "x-amz-copy-source",`
	`11221`	`+ "Code": "InvalidArgument",`
	`11222`	`+ "Message": "Invalid copy source object key"`
	`11223`	`+ },`
	`11224`	`+ "ResponseMetadata": {`
	`11225`	`+ "HTTPHeaders": {},`
	`11226`	`+ "HTTPStatusCode": 400`
	`11227`	`+ }`
	`11228`	`+ }`
	`11229`	`+ }`
`11213`	`11230`	`}`
`11214`	`11231`	`}`