mirrors/versitygw
1
0
Fork 0
mirror of https://github.com/versity/versitygw.git synced 2026-04-27 07:55:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: Server side region added to AdminConfig, v4 signature calculation implemented with server side region

Browse Source
This commit is contained in:
jonaustin09
2023-06-01 00:23:50 +04:00
parent 04bbe61826
commit 489bb3e899
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/versitygw/main.go
View File

@@ -144,7 +144,7 @@ func runGateway(be backend.Backend) error {
opts = append(opts, s3api.WithTLS(cert))
}
srv, err := s3api.New(app, be, port, middlewares.AdminUser{AdminAccess: adminAccess, AdminSecret: adminSecret}, opts...)
srv, err := s3api.New(app, be, port, middlewares.AdminConfig{AdminAccess: adminAccess, AdminSecret: adminSecret, Region: region}, opts...)
if err != nil {
return fmt.Errorf("init gateway: %v", err)
}

11
s3api/middlewares/authentication.go
View File

@@ -32,12 +32,13 @@ const (
iso8601Format = "20060102T150405Z"
)
type AdminUser struct {
type AdminConfig struct {
AdminAccess string
AdminSecret string
Region string
}
func VerifyV4Signature(user AdminUser) fiber.Handler {
func VerifyV4Signature(config AdminConfig) fiber.Handler {
return func(ctx *fiber.Ctx) error {
authorization := ctx.Get("Authorization")
if authorization == "" {
@@ -84,9 +85,9 @@ func VerifyV4Signature(user AdminUser) fiber.Handler {
signer := v4.NewSigner()
signErr := signer.SignHTTP(req.Context(), aws.Credentials{
AccessKeyID: user.AdminAccess,
SecretAccessKey: user.AdminSecret,
}, req, hexPayload, creds[3], creds[2], tdate)
AccessKeyID: config.AdminAccess,
SecretAccessKey: config.AdminSecret,
}, req, hexPayload, creds[3], config.Region, tdate)
if signErr != nil {
return controllers.Responce[any](ctx, nil, s3err.GetAPIError(s3err.ErrAccessDenied))
}

2
s3api/server.go
View File

@@ -31,7 +31,7 @@ type S3ApiServer struct {
cert *tls.Certificate
}
func New(app *fiber.App, be backend.Backend, port string, adminUser middlewares.AdminUser, opts ...Option) (*S3ApiServer, error) {
func New(app *fiber.App, be backend.Backend, port string, adminUser middlewares.AdminConfig, opts ...Option) (*S3ApiServer, error) {
server := &S3ApiServer{
app: app,
backend: be,

4
s3api/server_test.go
View File

@@ -28,7 +28,7 @@ func TestNew(t *testing.T) {
app *fiber.App
be backend.Backend
port string
adminUser middlewares.AdminUser
adminUser middlewares.AdminConfig
}
app := fiber.New()
@@ -48,7 +48,7 @@ func TestNew(t *testing.T) {
app: app,
be: be,
port: port,
adminUser: middlewares.AdminUser{},
adminUser: middlewares.AdminConfig{},
},
wantS3ApiServer: &S3ApiServer{
app: app,