dualfroz
e0fef79b7b
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
37 lines
1.2 KiB
Go
37 lines
1.2 KiB
Go
// Copyright 2023 Versity Software
|
|
// This file is licensed under the Apache License, Version 2.0
|
|
// (the "License"); you may not use this file except in compliance
|
|
// with the License. You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing,
|
|
// software distributed under the License is distributed on an
|
|
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
|
// KIND, either express or implied. See the License for the
|
|
// specific language governing permissions and limitations
|
|
// under the License.
|
|
|
|
package middlewares
|
|
|
|
import (
|
|
"net/url"
|
|
|
|
"github.com/gofiber/fiber/v3"
|
|
"github.com/versity/versitygw/debuglogger"
|
|
"github.com/versity/versitygw/s3err"
|
|
)
|
|
|
|
// DecodeURL url path unescapes the request url for the gateway
|
|
// to handle some special characters. A malformed escape sequence
|
|
// is rejected with InvalidURI.
|
|
func DecodeURL(ctx fiber.Ctx) error {
|
|
unescp, err := url.PathUnescape(string(ctx.Request().URI().PathOriginal()))
|
|
if err != nil {
|
|
debuglogger.Logf("failed to unescape the request path: %v", err)
|
|
return s3err.GetAPIError(s3err.ErrInvalidURI)
|
|
}
|
|
ctx.Path(unescp)
|
|
return nil
|
|
}
|