From 5f5fd0bc48d9ca28cd7d55af1c9b57a940c6fd9c Mon Sep 17 00:00:00 2001 From: Lapshin Vitaliy Date: Mon, 20 Jun 2022 11:32:58 +0300 Subject: validate tags on copy object and add regex for validating tags --- weed/s3api/s3api_object_copy_handlers_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'weed/s3api/s3api_object_copy_handlers_test.go') diff --git a/weed/s3api/s3api_object_copy_handlers_test.go b/weed/s3api/s3api_object_copy_handlers_test.go index 610b29a6b..3cb2b0562 100644 --- a/weed/s3api/s3api_object_copy_handlers_test.go +++ b/weed/s3api/s3api_object_copy_handlers_test.go @@ -367,7 +367,7 @@ func TestProcessMetadataBytes(t *testing.T) { reqHeader := transferHToHeader(tc.request) existing := transferHToBytesArr(tc.existing) replaceMeta, replaceTagging := replaceDirective(reqHeader) - extends := processMetadataBytes(reqHeader, existing, replaceMeta, replaceTagging) + extends, _ := processMetadataBytes(reqHeader, existing, replaceMeta, replaceTagging) result := transferBytesArrToH(extends) fmtTagging(result, tc.want) -- cgit v1.2.3 From e96937091301bea5483a729fe5a7a376f2ac64a4 Mon Sep 17 00:00:00 2001 From: Lapshin Vitaliy Date: Tue, 28 Jun 2022 14:48:55 +0300 Subject: fix parseTagging function and add test for validate tags --- weed/s3api/s3api_object_copy_handlers_test.go | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'weed/s3api/s3api_object_copy_handlers_test.go') diff --git a/weed/s3api/s3api_object_copy_handlers_test.go b/weed/s3api/s3api_object_copy_handlers_test.go index 3cb2b0562..1740d426b 100644 --- a/weed/s3api/s3api_object_copy_handlers_test.go +++ b/weed/s3api/s3api_object_copy_handlers_test.go @@ -332,6 +332,19 @@ var processMetadataBytesTestCases = []struct { "X-Amz-Tagging-type": "request", }, }, + + { + 108, + H{ + "User-Agent": "firefox", + "X-Amz-Meta-My-Meta": "request", + "X-Amz-Tagging": "A=B&a=b&type=request*", + s3_constants.AmzUserMetaDirective: DirectiveReplace, + s3_constants.AmzObjectTaggingDirective: DirectiveReplace, + }, + H{}, + H{}, + }, } func TestProcessMetadata(t *testing.T) { @@ -339,7 +352,7 @@ func TestProcessMetadata(t *testing.T) { reqHeader := transferHToHeader(tc.request) existing := transferHToHeader(tc.existing) replaceMeta, replaceTagging := replaceDirective(reqHeader) - + fmt.Println("test") err := processMetadata(reqHeader, existing, replaceMeta, replaceTagging, func(_ string, _ string) (tags map[string]string, err error) { return tc.getTags, nil }, "", "") -- cgit v1.2.3 From 7c3d9d05353918e7a0d59c06e1a6aa1b688f8ecb Mon Sep 17 00:00:00 2001 From: Lapshin Vitaliy Date: Wed, 29 Jun 2022 10:43:02 +0300 Subject: remove println --- weed/s3api/s3api_object_copy_handlers_test.go | 1 - 1 file changed, 1 deletion(-) (limited to 'weed/s3api/s3api_object_copy_handlers_test.go') diff --git a/weed/s3api/s3api_object_copy_handlers_test.go b/weed/s3api/s3api_object_copy_handlers_test.go index 1740d426b..29d519c24 100644 --- a/weed/s3api/s3api_object_copy_handlers_test.go +++ b/weed/s3api/s3api_object_copy_handlers_test.go @@ -352,7 +352,6 @@ func TestProcessMetadata(t *testing.T) { reqHeader := transferHToHeader(tc.request) existing := transferHToHeader(tc.existing) replaceMeta, replaceTagging := replaceDirective(reqHeader) - fmt.Println("test") err := processMetadata(reqHeader, existing, replaceMeta, replaceTagging, func(_ string, _ string) (tags map[string]string, err error) { return tc.getTags, nil }, "", "") -- cgit v1.2.3