mirror of
https://github.com/versity/versitygw.git
synced 2026-07-02 16:54:25 +00:00
4d391cabc8
Fixes #2180 Fixes #2181 Migrate the gateway from Fiber v2 to Fiber v3.3.0 and update the affected server, middleware, handler, controller, and test code for the new APIs. Replace the deprecated Fiber filesystem middleware used by the WebUI with the Fiber v3 static middleware, serving the embedded WebUI assets from an fs.Sub filesystem. Fix the request header limit handling regression by adding a temporary handler for Fiber v3/fasthttp small-buffer errors so oversized request headers return the expected regulated S3 error response. Fix the debuglogger panic by reworking the boxed key/value formatter used for debug request and response dumps. The formatter now handles long header keys and values without producing invalid wrap widths, negative padding, or out-of-range string slices.
244 lines
6.1 KiB
Go
244 lines
6.1 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 s3api
|
|
|
|
import (
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"strings"
|
|
"sync"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/gofiber/fiber/v3"
|
|
"github.com/versity/versitygw/auth"
|
|
"github.com/versity/versitygw/backend"
|
|
"github.com/versity/versitygw/s3api/middlewares"
|
|
"github.com/versity/versitygw/s3api/utils"
|
|
)
|
|
|
|
func newTestS3ApiServer(opts ...Option) (*S3ApiServer, error) {
|
|
allOpts := append([]Option{WithConcurrencyLimiter(10, 10)}, opts...)
|
|
|
|
return New(
|
|
backend.BackendUnsupported{},
|
|
middlewares.RootUserConfig{Access: "access", Secret: "secret"},
|
|
"us-east-1",
|
|
auth.NewIAMServiceSingle(auth.Account{Access: "access", Secret: "secret"}),
|
|
nil,
|
|
nil,
|
|
nil,
|
|
nil,
|
|
allOpts...,
|
|
)
|
|
}
|
|
|
|
func TestS3ApiServer_Serve(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
sa *S3ApiServer
|
|
wantErr bool
|
|
port string
|
|
}{
|
|
{
|
|
name: "Serve-invalid-tcp-address",
|
|
wantErr: true,
|
|
sa: &S3ApiServer{
|
|
app: fiber.New(),
|
|
backend: backend.BackendUnsupported{},
|
|
Router: &S3ApiRouter{},
|
|
},
|
|
port: "localhost:notaport",
|
|
},
|
|
{
|
|
name: "Serve-invalid-tcp-address-with-certificate",
|
|
wantErr: true,
|
|
sa: &S3ApiServer{
|
|
app: fiber.New(),
|
|
backend: backend.BackendUnsupported{},
|
|
Router: &S3ApiRouter{},
|
|
CertStorage: &utils.CertStorage{},
|
|
},
|
|
port: "localhost:notaport",
|
|
},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
if err := tt.sa.ServeMultiPort([]string{tt.port}); (err != nil) != tt.wantErr {
|
|
t.Errorf("S3ApiServer.Serve() error = %v, wantErr %v", err, tt.wantErr)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestWithRouteRegistersBeforeMiddleware(t *testing.T) {
|
|
const routePath = "/custom/route"
|
|
|
|
middlewareCalled := false
|
|
server, err := newTestS3ApiServer(
|
|
WithRoute(http.MethodGet, routePath, func(ctx fiber.Ctx) error {
|
|
return ctx.SendStatus(http.StatusNoContent)
|
|
}),
|
|
WithMiddleware("/", func(ctx fiber.Ctx) error {
|
|
middlewareCalled = true
|
|
return ctx.SendStatus(http.StatusMisdirectedRequest)
|
|
}),
|
|
)
|
|
if err != nil {
|
|
t.Fatalf("New() error = %v", err)
|
|
}
|
|
|
|
resp, err := server.app.Test(httptest.NewRequest(http.MethodGet, routePath, nil))
|
|
if err != nil {
|
|
t.Fatalf("app.Test() error = %v", err)
|
|
}
|
|
defer func() {
|
|
if err := resp.Body.Close(); err != nil {
|
|
t.Fatalf("response close error = %v", err)
|
|
}
|
|
}()
|
|
if resp.StatusCode != http.StatusNoContent {
|
|
t.Fatalf("status = %d, want %d", resp.StatusCode, http.StatusNoContent)
|
|
}
|
|
if middlewareCalled {
|
|
t.Fatal("middleware was called for top-level route")
|
|
}
|
|
}
|
|
|
|
func TestWithRouteRegistersAfterRateLimiter(t *testing.T) {
|
|
const routePath = "/custom/limited"
|
|
|
|
started := make(chan struct{})
|
|
release := make(chan struct{})
|
|
firstDone := make(chan error, 1)
|
|
var once sync.Once
|
|
|
|
server, err := newTestS3ApiServer(
|
|
WithConcurrencyLimiter(10, 1),
|
|
WithRoute(http.MethodGet, routePath, func(ctx fiber.Ctx) error {
|
|
once.Do(func() {
|
|
close(started)
|
|
})
|
|
<-release
|
|
return ctx.SendStatus(http.StatusNoContent)
|
|
}),
|
|
)
|
|
if err != nil {
|
|
t.Fatalf("New() error = %v", err)
|
|
}
|
|
|
|
go func() {
|
|
resp, err := server.app.Test(httptest.NewRequest(http.MethodGet, routePath, nil), fiber.TestConfig{Timeout: 0, FailOnTimeout: false})
|
|
if err != nil {
|
|
firstDone <- err
|
|
return
|
|
}
|
|
defer resp.Body.Close()
|
|
if resp.StatusCode != http.StatusNoContent {
|
|
firstDone <- fiber.NewError(resp.StatusCode)
|
|
return
|
|
}
|
|
firstDone <- nil
|
|
}()
|
|
|
|
<-started
|
|
|
|
resp, err := server.app.Test(httptest.NewRequest(http.MethodGet, routePath, nil), fiber.TestConfig{Timeout: time.Duration(100) * time.Millisecond})
|
|
if err != nil {
|
|
close(release)
|
|
t.Fatalf("second app.Test() error = %v", err)
|
|
}
|
|
defer resp.Body.Close()
|
|
if resp.StatusCode != http.StatusServiceUnavailable {
|
|
close(release)
|
|
t.Fatalf("second status = %d, want %d", resp.StatusCode, http.StatusServiceUnavailable)
|
|
}
|
|
|
|
close(release)
|
|
if err := <-firstDone; err != nil {
|
|
t.Fatalf("first request error = %v", err)
|
|
}
|
|
}
|
|
|
|
func TestCustomMountValidation(t *testing.T) {
|
|
validHandler := func(ctx fiber.Ctx) error {
|
|
return ctx.SendStatus(http.StatusNoContent)
|
|
}
|
|
|
|
tests := []struct {
|
|
name string
|
|
opt Option
|
|
wantErr string
|
|
}{
|
|
{
|
|
name: "route empty method",
|
|
opt: WithRoute("", "/custom", validHandler),
|
|
wantErr: "empty method",
|
|
},
|
|
{
|
|
name: "route unsupported HTTP method",
|
|
opt: WithRoute("BREW", "/custom", validHandler),
|
|
wantErr: "invalid HTTP method",
|
|
},
|
|
{
|
|
name: "route empty path",
|
|
opt: WithRoute(http.MethodGet, "", validHandler),
|
|
wantErr: "must start with /",
|
|
},
|
|
{
|
|
name: "route relative path",
|
|
opt: WithRoute(http.MethodGet, "custom", validHandler),
|
|
wantErr: "must start with /",
|
|
},
|
|
{
|
|
name: "route no handlers",
|
|
opt: WithRoute(http.MethodGet, "/custom"),
|
|
wantErr: "no handlers",
|
|
},
|
|
{
|
|
name: "route nil handler",
|
|
opt: WithRoute(http.MethodGet, "/custom", fiber.Handler(nil)),
|
|
wantErr: "nil handler",
|
|
},
|
|
{
|
|
name: "middleware empty prefix",
|
|
opt: WithMiddleware("", validHandler),
|
|
wantErr: "must start with /",
|
|
},
|
|
{
|
|
name: "middleware relative prefix",
|
|
opt: WithMiddleware("custom", validHandler),
|
|
wantErr: "must start with /",
|
|
},
|
|
{
|
|
name: "middleware nil handler",
|
|
opt: WithMiddleware("/custom", nil),
|
|
wantErr: "nil handler",
|
|
},
|
|
}
|
|
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
_, err := newTestS3ApiServer(tt.opt)
|
|
if err == nil {
|
|
t.Fatal("New() error = nil, want error")
|
|
}
|
|
if !strings.Contains(err.Error(), tt.wantErr) {
|
|
t.Fatalf("New() error = %v, want substring %q", err, tt.wantErr)
|
|
}
|
|
})
|
|
}
|
|
}
|