diff --git a/test/s3/tigris_compat/Makefile b/test/s3/tigris_compat/Makefile
index 3254e9d591..f598178634 100644
--- a/test/s3/tigris_compat/Makefile
+++ b/test/s3/tigris_compat/Makefile
@@ -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"
diff --git a/weed/s3api/s3api_bucket_handlers_misc.go b/weed/s3api/s3api_bucket_handlers_misc.go
index d51bb6792b..0c6f8230a6 100644
--- a/weed/s3api/s3api_bucket_handlers_misc.go
+++ b/weed/s3api/s3api_bucket_handlers_misc.go
@@ -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
}
diff --git a/weed/s3api/s3api_bucket_handlers_misc_test.go b/weed/s3api/s3api_bucket_handlers_misc_test.go
index 1a0fdb47b6..9934622b20 100644
--- a/weed/s3api/s3api_bucket_handlers_misc_test.go
+++ b/weed/s3api/s3api_bucket_handlers_misc_test.go
@@ -746,6 +746,7 @@ func TestPutBucketNotificationConfiguration(t *testing.T) {
{"queue", `arn:aws:sqs:us-east-1:1:qs3:ObjectCreated:*`, http.StatusNotImplemented},
{"eventbridge", ``, http.StatusNotImplemented},
{"malformed", ``, http.StatusBadRequest},
+ {"unknown child", ``, http.StatusBadRequest},
{"wrong root", ``, http.StatusBadRequest},
}
for _, tc := range cases {