Skip to content

SeaweedFS is a distributed storage system for object storage (S3), file systems, Iceberg table buckets, and Lance vector buckets, designed to handle billions of files with O(1) disk access and effortless horizontal scaling.

s3api: preserve equals signs in tag values (#10058)

patrick4bcd27fb6f69
diff --git a/weed/s3api/tags.go b/weed/s3api/tags.go
index 119bd488c6..7b1654529d 100644
--- a/weed/s3api/tags.go
+++ b/weed/s3api/tags.go
@@ -53,26 +53,20 @@ func FromTags(tags map[string]string) (t *Tagging) {
func parseTagsHeader(tags string) (map[string]string, error) {
parsedTags := make(map[string]string)
for _, v := range util.StringSplit(tags, "&") {
- tag := strings.Split(v, "=")
- if len(tag) == 2 {
- // URL decode both key and value
- decodedKey, err := url.QueryUnescape(tag[0])
- if err != nil {
- return nil, fmt.Errorf("failed to decode tag key '%s': %w", tag[0], err)
- }
- decodedValue, err := url.QueryUnescape(tag[1])
- if err != nil {
- return nil, fmt.Errorf("failed to decode tag value '%s': %w", tag[1], err)
- }
- parsedTags[decodedKey] = decodedValue
- } else if len(tag) == 1 {
- // URL decode key for empty value tags
- decodedKey, err := url.QueryUnescape(tag[0])
- if err != nil {
- return nil, fmt.Errorf("failed to decode tag key '%s': %w", tag[0], err)
- }
+ key, value, hasValue := strings.Cut(v, "=")
+ decodedKey, err := url.QueryUnescape(key)
+ if err != nil {
+ return nil, fmt.Errorf("failed to decode tag key '%s': %w", key, err)
+ }
+ if !hasValue {
parsedTags[decodedKey] = ""
+ continue
+ }
+ decodedValue, err := url.QueryUnescape(value)
+ if err != nil {
+ return nil, fmt.Errorf("failed to decode tag value '%s': %w", value, err)
}
+ parsedTags[decodedKey] = decodedValue
}
return parsedTags, nil
}
diff --git a/weed/s3api/tags_test.go b/weed/s3api/tags_test.go
index d914997833..2002d65f28 100644
--- a/weed/s3api/tags_test.go
+++ b/weed/s3api/tags_test.go
@@ -71,6 +71,15 @@ func TestParseTagsHeader(t *testing.T) {
},
expectError: false,
},
+ {
+ name: "unescaped equals in value",
+ input: "token=part1=part2&normal=test",
+ expected: map[string]string{
+ "token": "part1=part2",
+ "normal": "test",
+ },
+ expectError: false,
+ },
}
for _, tt := range tests {