fix: return InvalidURI for a malformed escape in the request path

A request path with an invalid percent escape, such as "/bucket/%zz",
failed url.PathUnescape in the DecodeURL middleware and the raw error
was answered with 500 InternalError. S3 rejects such a request with
400 InvalidURI.

Return InvalidURI from DecodeURL, so the s3 and admin routers answer
with it as well, and let the website handler pass the error through
instead of mapping it on its own.

Fixes #2070
This commit is contained in:
dualfroz committed 2026-10-03 15:13:16 +02:00
1 parent 59493b527e
commit e0fef79b7b
5 files changed
+105 -4

No files matched your search

+21
View File
@@ -342,6 +342,27 @@ func RouterObjectTorrentMethodNotAllowed(s *S3Conf) error {
})
}
func RouterInvalidURLEscape(s *S3Conf) error {
testName := "RouterInvalidURLEscape"
return actionHandlerNoSetup(s, testName, func(s3client *s3.Client, bucket string) error {
req, err := http.NewRequest(http.MethodGet, s.endpoint+"/bucket/object", nil)
if err != nil {
return err
}
// http.NewRequest refuses a malformed escape, so the raw path
// is set on the url directly
req.URL.Opaque = "/bucket/(*&^%&())"
resp, err := s.httpClient.Do(req)
if err != nil {
return err
}
return checkHTTPResponseApiErr(resp, s3err.GetAPIError(s3err.ErrInvalidURI))
})
}
// CORS middleware tests
func CORSMiddleware_invalid_method(s *S3Conf) error {
testName := "CORSMiddleware_invalid_method"
+2
View File
@@ -2162,6 +2162,7 @@ func TestRouter(ts *TestState) {
ts.Run(RouterObjectAnnotationNotImplemented)
ts.Run(RouterRenameObjectNotImplemented)
ts.Run(RouterObjectTorrentMethodNotAllowed)
ts.Run(RouterInvalidURLEscape)
}
func TestPostObject(ts *TestState) {
@@ -3749,6 +3750,7 @@ func GetIntTests() IntTests {
"RouterObjectAnnotationNotImplemented": RouterObjectAnnotationNotImplemented,
"RouterRenameObjectNotImplemented": RouterRenameObjectNotImplemented,
"RouterObjectTorrentMethodNotAllowed": RouterObjectTorrentMethodNotAllowed,
"RouterInvalidURLEscape": RouterInvalidURLEscape,
"UnsignedStreaminPayloadTrailer_malformed_trailer": UnsignedStreaminPayloadTrailer_malformed_trailer,
"UnsignedStreamingPayloadTrailer_aborted_connection": UnsignedStreamingPayloadTrailer_aborted_connection,
"UnsignedStreamingPayloadTrailer_missing_invalid_dec_content_length": UnsignedStreamingPayloadTrailer_missing_invalid_dec_content_length,