s3api: reject unknown notification elements; fail test-with-server on a stuck shutdown (#12752)

* s3api: reject unknown elements in PutBucketNotificationConfiguration

xml.Unmarshal skips children that match no field, so a configuration
whose only child was an unmapped element parsed as empty and returned
success while nothing was stored.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

* test/s3/tigris_compat: fail test-with-server when the server does not stop

A passing suite returned success even when stop-server gave up with the
server still running.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Chris LuandClaude Opus 5.5 authored and GitHub committed 2026-11-18 15:15:38 -08:00
1 parent f5418845ce
commit 04c7b12238
3 files changed
+5 -2

No files matched your search

+2 -1
View File
@@ -122,7 +122,8 @@ run-suite: build-suite
test-with-server:
@$(MAKE) start-server || exit $$?; \
$(MAKE) run-suite; TEST_RESULT=$$?; \
$(MAKE) stop-server; exit $$TEST_RESULT
$(MAKE) stop-server; STOP_RESULT=$$?; \
if [ $$TEST_RESULT -ne 0 ]; then exit $$TEST_RESULT; fi; exit $$STOP_RESULT
logs:
@test -f weed-test.log && tail -100 weed-test.log || echo "No log file found"
+2 -1
View File
@@ -45,6 +45,7 @@ type notificationConfigurationRequest struct {
Queues []struct{} `xml:"QueueConfiguration"`
Functions []struct{} `xml:"CloudFunctionConfiguration"`
EventBridge []struct{} `xml:"EventBridgeConfiguration"`
Unknown []struct{} `xml:",any"`
}
// GetBucketPolicyStatusHandler reports whether the bucket policy grants public access.
@@ -186,7 +187,7 @@ func (s3a *S3ApiServer) PutBucketNotificationConfigurationHandler(w http.Respons
return
}
var cfg notificationConfigurationRequest
if err := xml.Unmarshal(body, &cfg); err != nil {
if err := xml.Unmarshal(body, &cfg); err != nil || len(cfg.Unknown) > 0 {
s3err.WriteErrorResponse(w, r, s3err.ErrMalformedXML)
return
}
@@ -746,6 +746,7 @@ func TestPutBucketNotificationConfiguration(t *testing.T) {
{"queue", `<NotificationConfiguration><QueueConfiguration><Queue>arn:aws:sqs:us-east-1:1:q</Queue><Event>s3:ObjectCreated:*</Event></QueueConfiguration></NotificationConfiguration>`, http.StatusNotImplemented},
{"eventbridge", `<NotificationConfiguration><EventBridgeConfiguration/></NotificationConfiguration>`, http.StatusNotImplemented},
{"malformed", `<NotificationConfiguration>`, http.StatusBadRequest},
{"unknown child", `<NotificationConfiguration><LambdaFunctionConfiguration/></NotificationConfiguration>`, http.StatusBadRequest},
{"wrong root", `<NotAConfiguration/>`, http.StatusBadRequest},
}
for _, tc := range cases {