From ccbd31969fd2af0d1b3f997d3eeb19cfaea3be08 Mon Sep 17 00:00:00 2001 From: jonaustin09 Date: Tue, 16 May 2023 21:46:07 +0400 Subject: [PATCH 1/4] feat: Created 5 actions: PutBucketAcl, PutObjectAcl, RestoreObject, UploadPart, PutObject --- backend/backend.go | 16 ++++++++ s3api/router.go | 91 ++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 99 insertions(+), 8 deletions(-) diff --git a/backend/backend.go b/backend/backend.go index ff27d976..f2aebe91 100644 --- a/backend/backend.go +++ b/backend/backend.go @@ -38,6 +38,10 @@ type Backend interface { ListObjectsV2(bucket, prefix, marker, delim string, maxkeys int) (*s3response.ListBucketResultV2, s3err.ErrorCode) DeleteObject(bucket, object string) s3err.ErrorCode DeleteObjects(bucket string, objects *s3response.DeleteObjectsInput) s3err.ErrorCode + PutBucketAcl(*s3.PutBucketAclInput) s3err.ErrorCode + PutObjectAcl(*s3.PutObjectAclInput) s3err.ErrorCode + RestoreObject(bucket, object string, restoreRequest *s3.RestoreRequest) s3err.ErrorCode + UploadPart(bucket, object, uploadId string, Body io.ReadSeeker) (*s3.UploadPartOutput, s3err.ErrorCode) IsTaggingSupported() bool GetTags(bucket, object string) (map[string]string, error) @@ -63,6 +67,18 @@ func (BackendUnsupported) String() string { func (BackendUnsupported) ListBuckets() (*s3response.ListAllMyBucketsList, s3err.ErrorCode) { return nil, s3err.ErrNotImplemented } +func (BackendUnsupported) PutBucketAcl(*s3.PutBucketAclInput) s3err.ErrorCode { + return s3err.ErrNotImplemented +} +func (BackendUnsupported) PutObjectAcl(*s3.PutObjectAclInput) s3err.ErrorCode { + return s3err.ErrNotImplemented +} +func (BackendUnsupported) RestoreObject(bucket, object string, restoreRequest *s3.RestoreRequest) s3err.ErrorCode { + return s3err.ErrNotImplemented +} +func (BackendUnsupported) UploadPart(bucket, object, uploadId string, Body io.ReadSeeker) (*s3.UploadPartOutput, s3err.ErrorCode) { + return nil, s3err.ErrNotImplemented +} func (BackendUnsupported) GetBucketAcl(bucket string) (*s3response.GetBucketAclResponse, s3err.ErrorCode) { return nil, s3err.ErrNotImplemented } diff --git a/s3api/router.go b/s3api/router.go index 730879e2..980ea41c 100644 --- a/s3api/router.go +++ b/s3api/router.go @@ -1,8 +1,10 @@ package s3api import ( + "bytes" "encoding/xml" "errors" + "io" "strconv" "strings" @@ -27,8 +29,37 @@ func (sa *S3ApiRouter) Init(app *fiber.App, be backend.Backend) { }) // PutBucket action + // PutBucketAcl action app.Put("/:bucket", func(ctx *fiber.Ctx) error { - code := be.PutBucket(ctx.Params("bucket")) + bucket, acl, grantFullControl, grantRead, grantReadACP, granWrite, grantWriteACP := + ctx.Params("bucket"), + ctx.Get("x-amz-acl"), + ctx.Get("x-amz-grant-full-control"), + ctx.Get("x-amz-grant-read"), + ctx.Get("x-amz-grant-read-acp"), + ctx.Get("x-amz-grant-write"), + ctx.Get("x-amz-grant-write-acp") + + grants := grantFullControl + grantRead + grantReadACP + granWrite + grantWriteACP + + if grants != "" || acl != "" { + if grants != "" && acl != "" { + return errors.New("Wrong api call") + } + code := be.PutBucketAcl(&s3.PutBucketAclInput{ + Bucket: &bucket, + ACL: &acl, + GrantFullControl: &grantFullControl, + GrantRead: &grantRead, + GrantReadACP: &grantReadACP, + GrantWrite: &granWrite, + GrantWriteACP: &grantWriteACP, + }) + + return responce[internal.Any](ctx, nil, code) + } + + code := be.PutBucket(bucket) return responce[internal.Any](ctx, nil, code) }) // DeleteBucket action @@ -170,13 +201,20 @@ func (sa *S3ApiRouter) Init(app *fiber.App, be backend.Backend) { }) // CompleteMultipartUpload action // CreateMultipartUpload + // RestoreObject action app.Post("/:bucket/:key/*", func(ctx *fiber.Ctx) error { bucket, key, keyEnd, uploadId := ctx.Params("bucket"), ctx.Params("key"), ctx.Params("*1"), ctx.Query("uploadId") + var restoreRequest s3.RestoreRequest if keyEnd != "" { key = strings.Join([]string{key, keyEnd}, "/") } + if err := xml.Unmarshal(ctx.Body(), &restoreRequest); err == nil { + code := be.RestoreObject(bucket, key, &restoreRequest) + return responce[internal.Any](ctx, nil, code) + } + if uploadId != "" { var parts []s3response.Part @@ -191,20 +229,57 @@ func (sa *S3ApiRouter) Init(app *fiber.App, be backend.Backend) { return responce[*s3response.InitiateMultipartUploadResponse](ctx, res, code) }) // CopyObject action + // PutObject action + // UploadPart action app.Put("/:bucket/:key/*", func(ctx *fiber.Ctx) error { copySource := strings.Split(ctx.Get("X-Amz-Copy-Source"), "/") - if len(copySource) < 2 { - return errors.New("wrong api call") - } + dstBucket, dstKeyStart, dstKeyEnd, uploadId := ctx.Params("bucket"), ctx.Params("key"), ctx.Params("*1"), ctx.Query("uploadId") + acl, grantFullControl, grantRead, grantReadACP, granWrite, grantWriteACP := + ctx.Get("x-amz-acl"), + ctx.Get("x-amz-grant-full-control"), + ctx.Get("x-amz-grant-read"), + ctx.Get("x-amz-grant-read-acp"), + ctx.Get("x-amz-grant-write"), + ctx.Get("x-amz-grant-write-acp") + grants := grantFullControl + grantRead + grantReadACP + granWrite + grantWriteACP - srcBucket, srcObject := copySource[0], copySource[1:] - dstBucket, dstKeyStart, dstKeyEnd := ctx.Params("bucket"), ctx.Params("key"), ctx.Params("*1") if dstKeyEnd != "" { dstKeyStart = strings.Join([]string{dstKeyStart, dstKeyEnd}, "/") } - res, code := be.CopyObject(srcBucket, strings.Join(srcObject, "/"), dstBucket, dstKeyStart) - return responce[*s3response.CopyObjectResponse](ctx, res, code) + if uploadId != "" { + body := io.ReadSeeker( bytes.NewReader([]byte(ctx.Body()))) + res, code := be.UploadPart(dstBucket, dstKeyStart, uploadId, body) + return responce[*s3.UploadPartOutput](ctx, res, code) + } + + if grants != "" || acl != "" { + if grants != "" && acl != "" { + return errors.New("Wrong api call") + } + + code := be.PutObjectAcl(&s3.PutObjectAclInput{ + Bucket: &dstBucket, + Key: &dstKeyStart, + ACL: &acl, + GrantFullControl: &grantFullControl, + GrantRead: &grantRead, + GrantReadACP: &grantReadACP, + GrantWrite: &granWrite, + GrantWriteACP: &grantWriteACP, + }) + return responce[internal.Any](ctx, nil, code) + } + + if len(copySource) > 1 { + srcBucket, srcObject := copySource[0], copySource[1:] + + res, code := be.CopyObject(srcBucket, strings.Join(srcObject, "/"), dstBucket, dstKeyStart) + return responce[*s3response.CopyObjectResponse](ctx, res, code) + } + + res, code := be.PutObject(dstBucket, dstKeyStart, bytes.NewReader(ctx.Request().Body())) + return responce[string](ctx, res, code) }) } From e18078b084b3ef617e4c96dad31824643a7f5204 Mon Sep 17 00:00:00 2001 From: jonaustin09 Date: Wed, 17 May 2023 16:01:36 +0400 Subject: [PATCH 2/4] fix: gofmt issues --- go.mod | 6 ++-- s3api/router.go | 87 ++++++++++++++++++++++++------------------------- 2 files changed, 46 insertions(+), 47 deletions(-) diff --git a/go.mod b/go.mod index f21e7fcd..ebd7ec7d 100644 --- a/go.mod +++ b/go.mod @@ -2,11 +2,13 @@ module github.com/versity/scoutgw go 1.20 -require github.com/aws/aws-sdk-go v1.44.258 +require ( + github.com/aws/aws-sdk-go v1.44.258 + github.com/gofiber/fiber/v2 v2.45.0 +) require ( github.com/andybalholm/brotli v1.0.5 // indirect - github.com/gofiber/fiber/v2 v2.45.0 // indirect github.com/google/uuid v1.3.0 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/klauspost/compress v1.16.3 // indirect diff --git a/s3api/router.go b/s3api/router.go index 980ea41c..312c39b4 100644 --- a/s3api/router.go +++ b/s3api/router.go @@ -16,10 +16,7 @@ import ( "github.com/versity/scoutgw/s3response" ) -type S3ApiRouter struct { - app *fiber.App - api fiber.Router -} +type S3ApiRouter struct{} func (sa *S3ApiRouter) Init(app *fiber.App, be backend.Backend) { // ListBuckets action @@ -31,31 +28,31 @@ func (sa *S3ApiRouter) Init(app *fiber.App, be backend.Backend) { // PutBucket action // PutBucketAcl action app.Put("/:bucket", func(ctx *fiber.Ctx) error { - bucket, acl, grantFullControl, grantRead, grantReadACP, granWrite, grantWriteACP := - ctx.Params("bucket"), - ctx.Get("x-amz-acl"), - ctx.Get("x-amz-grant-full-control"), - ctx.Get("x-amz-grant-read"), - ctx.Get("x-amz-grant-read-acp"), - ctx.Get("x-amz-grant-write"), + bucket, acl, grantFullControl, grantRead, grantReadACP, granWrite, grantWriteACP := + ctx.Params("bucket"), + ctx.Get("x-amz-acl"), + ctx.Get("x-amz-grant-full-control"), + ctx.Get("x-amz-grant-read"), + ctx.Get("x-amz-grant-read-acp"), + ctx.Get("x-amz-grant-write"), ctx.Get("x-amz-grant-write-acp") grants := grantFullControl + grantRead + grantReadACP + granWrite + grantWriteACP if grants != "" || acl != "" { if grants != "" && acl != "" { - return errors.New("Wrong api call") + return errors.New("wrong api call") } code := be.PutBucketAcl(&s3.PutBucketAclInput{ - Bucket: &bucket, - ACL: &acl, - GrantFullControl: &grantFullControl, - GrantRead: &grantRead, - GrantReadACP: &grantReadACP, - GrantWrite: &granWrite, - GrantWriteACP: &grantWriteACP, + Bucket: &bucket, + ACL: &acl, + GrantFullControl: &grantFullControl, + GrantRead: &grantRead, + GrantReadACP: &grantReadACP, + GrantWrite: &granWrite, + GrantWriteACP: &grantWriteACP, }) - + return responce[internal.Any](ctx, nil, code) } @@ -177,11 +174,11 @@ func (sa *S3ApiRouter) Init(app *fiber.App, be backend.Backend) { expectedBucketOwner, requestPayer := ctx.Get("X-Amz-Expected-Bucket-Owner"), ctx.Get("X-Amz-Request-Payer") code := be.AbortMultipartUpload(&s3.AbortMultipartUploadInput{ - UploadId: &uploadId, - Bucket: &bucket, - Key: &key, - ExpectedBucketOwner: &expectedBucketOwner, - RequestPayer: &requestPayer, + UploadId: &uploadId, + Bucket: &bucket, + Key: &key, + ExpectedBucketOwner: &expectedBucketOwner, + RequestPayer: &requestPayer, }) return responce[internal.Any](ctx, nil, code) } @@ -205,7 +202,7 @@ func (sa *S3ApiRouter) Init(app *fiber.App, be backend.Backend) { app.Post("/:bucket/:key/*", func(ctx *fiber.Ctx) error { bucket, key, keyEnd, uploadId := ctx.Params("bucket"), ctx.Params("key"), ctx.Params("*1"), ctx.Query("uploadId") var restoreRequest s3.RestoreRequest - + if keyEnd != "" { key = strings.Join([]string{key, keyEnd}, "/") } @@ -221,8 +218,8 @@ func (sa *S3ApiRouter) Init(app *fiber.App, be backend.Backend) { if err := xml.Unmarshal(ctx.Body(), &parts); err != nil { return errors.New("wrong api call") } - - res, code := be.CompleteMultipartUpload(bucket, "", uploadId, parts) + + res, code := be.CompleteMultipartUpload(bucket, "", uploadId, parts) return responce[*s3response.CompleteMultipartUploadResponse](ctx, res, code) } res, code := be.CreateMultipartUpload(&s3.CreateMultipartUploadInput{Bucket: &bucket, Key: &key}) @@ -234,12 +231,12 @@ func (sa *S3ApiRouter) Init(app *fiber.App, be backend.Backend) { app.Put("/:bucket/:key/*", func(ctx *fiber.Ctx) error { copySource := strings.Split(ctx.Get("X-Amz-Copy-Source"), "/") dstBucket, dstKeyStart, dstKeyEnd, uploadId := ctx.Params("bucket"), ctx.Params("key"), ctx.Params("*1"), ctx.Query("uploadId") - acl, grantFullControl, grantRead, grantReadACP, granWrite, grantWriteACP := - ctx.Get("x-amz-acl"), - ctx.Get("x-amz-grant-full-control"), - ctx.Get("x-amz-grant-read"), - ctx.Get("x-amz-grant-read-acp"), - ctx.Get("x-amz-grant-write"), + acl, grantFullControl, grantRead, grantReadACP, granWrite, grantWriteACP := + ctx.Get("x-amz-acl"), + ctx.Get("x-amz-grant-full-control"), + ctx.Get("x-amz-grant-read"), + ctx.Get("x-amz-grant-read-acp"), + ctx.Get("x-amz-grant-write"), ctx.Get("x-amz-grant-write-acp") grants := grantFullControl + grantRead + grantReadACP + granWrite + grantWriteACP @@ -248,32 +245,32 @@ func (sa *S3ApiRouter) Init(app *fiber.App, be backend.Backend) { } if uploadId != "" { - body := io.ReadSeeker( bytes.NewReader([]byte(ctx.Body()))) + body := io.ReadSeeker(bytes.NewReader([]byte(ctx.Body()))) res, code := be.UploadPart(dstBucket, dstKeyStart, uploadId, body) return responce[*s3.UploadPartOutput](ctx, res, code) } if grants != "" || acl != "" { if grants != "" && acl != "" { - return errors.New("Wrong api call") + return errors.New("wrong api call") } code := be.PutObjectAcl(&s3.PutObjectAclInput{ - Bucket: &dstBucket, - Key: &dstKeyStart, - ACL: &acl, - GrantFullControl: &grantFullControl, - GrantRead: &grantRead, - GrantReadACP: &grantReadACP, - GrantWrite: &granWrite, - GrantWriteACP: &grantWriteACP, + Bucket: &dstBucket, + Key: &dstKeyStart, + ACL: &acl, + GrantFullControl: &grantFullControl, + GrantRead: &grantRead, + GrantReadACP: &grantReadACP, + GrantWrite: &granWrite, + GrantWriteACP: &grantWriteACP, }) return responce[internal.Any](ctx, nil, code) } if len(copySource) > 1 { srcBucket, srcObject := copySource[0], copySource[1:] - + res, code := be.CopyObject(srcBucket, strings.Join(srcObject, "/"), dstBucket, dstKeyStart) return responce[*s3response.CopyObjectResponse](ctx, res, code) } From 69cd0f9eb1f663126fc1d3df16ca7b05ddd04219 Mon Sep 17 00:00:00 2001 From: jonaustin09 Date: Wed, 17 May 2023 16:42:15 +0400 Subject: [PATCH 3/4] feat: Created UploadPartCopy action --- .idea/.gitignore | 3 ++ .idea/misc.xml | 6 ++++ .idea/modules.xml | 8 +++++ .idea/scoutgw.iml | 9 ++++++ .idea/vcs.xml | 6 ++++ backend/backend.go | 4 +++ s3api/router.go | 78 ++++++++++++++++++++++++++++++++++++---------- 7 files changed, 97 insertions(+), 17 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/scoutgw.iml create mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 00000000..26d33521 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 00000000..639900d1 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 00000000..c82fd70f --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/scoutgw.iml b/.idea/scoutgw.iml new file mode 100644 index 00000000..d6ebd480 --- /dev/null +++ b/.idea/scoutgw.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..35eb1ddf --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/backend/backend.go b/backend/backend.go index f2aebe91..6f53667d 100644 --- a/backend/backend.go +++ b/backend/backend.go @@ -42,6 +42,7 @@ type Backend interface { PutObjectAcl(*s3.PutObjectAclInput) s3err.ErrorCode RestoreObject(bucket, object string, restoreRequest *s3.RestoreRequest) s3err.ErrorCode UploadPart(bucket, object, uploadId string, Body io.ReadSeeker) (*s3.UploadPartOutput, s3err.ErrorCode) + UploadPartCopy(*s3.UploadPartCopyInput) (*s3.UploadPartCopyOutput, s3err.ErrorCode) IsTaggingSupported() bool GetTags(bucket, object string) (map[string]string, error) @@ -76,6 +77,9 @@ func (BackendUnsupported) PutObjectAcl(*s3.PutObjectAclInput) s3err.ErrorCode { func (BackendUnsupported) RestoreObject(bucket, object string, restoreRequest *s3.RestoreRequest) s3err.ErrorCode { return s3err.ErrNotImplemented } +func (BackendUnsupported) UploadPartCopy(*s3.UploadPartCopyInput) (*s3.UploadPartCopyOutput, s3err.ErrorCode) { + return nil, s3err.ErrNotImplemented +} func (BackendUnsupported) UploadPart(bucket, object, uploadId string, Body io.ReadSeeker) (*s3.UploadPartOutput, s3err.ErrorCode) { return nil, s3err.ErrNotImplemented } diff --git a/s3api/router.go b/s3api/router.go index 312c39b4..c97c1a17 100644 --- a/s3api/router.go +++ b/s3api/router.go @@ -7,6 +7,7 @@ import ( "io" "strconv" "strings" + "time" "github.com/aws/aws-sdk-go/service/s3" "github.com/gofiber/fiber/v2" @@ -30,12 +31,12 @@ func (sa *S3ApiRouter) Init(app *fiber.App, be backend.Backend) { app.Put("/:bucket", func(ctx *fiber.Ctx) error { bucket, acl, grantFullControl, grantRead, grantReadACP, granWrite, grantWriteACP := ctx.Params("bucket"), - ctx.Get("x-amz-acl"), - ctx.Get("x-amz-grant-full-control"), - ctx.Get("x-amz-grant-read"), - ctx.Get("x-amz-grant-read-acp"), - ctx.Get("x-amz-grant-write"), - ctx.Get("x-amz-grant-write-acp") + ctx.Get("X-Amz-Acl"), + ctx.Get("X-Amz-Grant-Full-Control"), + ctx.Get("X-Amz-Grant-Read"), + ctx.Get("X-Amz-Grant-Read-Acp"), + ctx.Get("X-Amz-Grant-Write"), + ctx.Get("X-Amz-Grant-Write-Acp") grants := grantFullControl + grantRead + grantReadACP + granWrite + grantWriteACP @@ -228,22 +229,64 @@ func (sa *S3ApiRouter) Init(app *fiber.App, be backend.Backend) { // CopyObject action // PutObject action // UploadPart action + // UploadPartCopy action app.Put("/:bucket/:key/*", func(ctx *fiber.Ctx) error { - copySource := strings.Split(ctx.Get("X-Amz-Copy-Source"), "/") - dstBucket, dstKeyStart, dstKeyEnd, uploadId := ctx.Params("bucket"), ctx.Params("key"), ctx.Params("*1"), ctx.Query("uploadId") - acl, grantFullControl, grantRead, grantReadACP, granWrite, grantWriteACP := - ctx.Get("x-amz-acl"), - ctx.Get("x-amz-grant-full-control"), - ctx.Get("x-amz-grant-read"), - ctx.Get("x-amz-grant-read-acp"), - ctx.Get("x-amz-grant-write"), - ctx.Get("x-amz-grant-write-acp") + dstBucket, dstKeyStart, dstKeyEnd, uploadId, partNumberStr := ctx.Params("bucket"), ctx.Params("key"), ctx.Params("*1"), ctx.Query("uploadId"), ctx.Query("partNumber") + copySource, copySrcIfMatch, copySrcIfNoneMatch, + copySrcModifSince, copySrcUnmodifSince, acl, + grantFullControl, grantRead, grantReadACP, + granWrite, grantWriteACP := + // Copy source headers + ctx.Get("X-Amz-Copy-Source"), + ctx.Get("X-Amz-Copy-Source-If-Match"), + ctx.Get("X-Amz-Copy-Source-If-None-Match"), + ctx.Get("X-Amz-Copy-Source-If-Modified-Since"), + ctx.Get("X-Amz-Copy-Source-If-Unmodified-Since"), + // Permission headers + ctx.Get("X-Amz-Acl"), + ctx.Get("X-Amz-Grant-Full-Control"), + ctx.Get("X-Amz-Grant-Read"), + ctx.Get("X-Amz-Grant-Read-Acp"), + ctx.Get("X-Amz-Grant-Write"), + ctx.Get("X-Amz-Grant-Write-Acp") + grants := grantFullControl + grantRead + grantReadACP + granWrite + grantWriteACP if dstKeyEnd != "" { dstKeyStart = strings.Join([]string{dstKeyStart, dstKeyEnd}, "/") } + if partNumberStr != "" { + copySrcModifSinceDate, err := time.Parse(time.RFC3339, copySrcModifSince) + if err != nil && copySrcModifSince != "" { + return errors.New("wrong api call") + } + + copySrcUnmodifSinceDate, err := time.Parse(time.RFC3339, copySrcUnmodifSince) + if err != nil && copySrcUnmodifSince != "" { + return errors.New("wrong api call") + } + + partNumber, err := strconv.ParseInt(partNumberStr, 10, 64) + if err != nil { + return errors.New("wrong api call") + } + + res, code := be.UploadPartCopy(&s3.UploadPartCopyInput{ + Bucket: &dstBucket, + Key: &dstKeyStart, + PartNumber: &partNumber, + UploadId: &uploadId, + CopySource: ©Source, + CopySourceIfMatch: ©SrcIfMatch, + CopySourceIfNoneMatch: ©SrcIfNoneMatch, + CopySourceIfModifiedSince: ©SrcModifSinceDate, + CopySourceIfUnmodifiedSince: ©SrcUnmodifSinceDate, + }) + + return responce[*s3.UploadPartCopyOutput](ctx, res, code) + } + if uploadId != "" { body := io.ReadSeeker(bytes.NewReader([]byte(ctx.Body()))) res, code := be.UploadPart(dstBucket, dstKeyStart, uploadId, body) @@ -268,8 +311,9 @@ func (sa *S3ApiRouter) Init(app *fiber.App, be backend.Backend) { return responce[internal.Any](ctx, nil, code) } - if len(copySource) > 1 { - srcBucket, srcObject := copySource[0], copySource[1:] + if copySource != "" { + copySourceSplit := strings.Split(copySource, "/") + srcBucket, srcObject := copySourceSplit[0], copySourceSplit[1:] res, code := be.CopyObject(srcBucket, strings.Join(srcObject, "/"), dstBucket, dstKeyStart) return responce[*s3response.CopyObjectResponse](ctx, res, code) From f676b9eb570b5513b12e53a1fcb9920d4bfbe781 Mon Sep 17 00:00:00 2001 From: jonaustin09 Date: Wed, 17 May 2023 19:27:39 +0400 Subject: [PATCH 4/4] feat: Separated controllers from the router --- s3api/controllers/base.go | 325 ++++++++++++++++++++++++++++++++++++++ s3api/router.go | 312 ++---------------------------------- 2 files changed, 338 insertions(+), 299 deletions(-) create mode 100644 s3api/controllers/base.go diff --git a/s3api/controllers/base.go b/s3api/controllers/base.go new file mode 100644 index 00000000..db9f8a82 --- /dev/null +++ b/s3api/controllers/base.go @@ -0,0 +1,325 @@ +package controllers + +import ( + "bytes" + "encoding/xml" + "errors" + "io" + "strconv" + "strings" + "time" + + "github.com/aws/aws-sdk-go/service/s3" + "github.com/gofiber/fiber/v2" + "github.com/versity/scoutgw/backend" + "github.com/versity/scoutgw/internal" + "github.com/versity/scoutgw/s3err" + "github.com/versity/scoutgw/s3response" +) + +type S3ApiController struct { + be backend.Backend +} + +func New(be backend.Backend) S3ApiController { + return S3ApiController{be: be} +} + +func (c S3ApiController) ListBuckets(ctx *fiber.Ctx) error { + res, code := c.be.ListBuckets() + return responce[*s3response.ListAllMyBucketsList](ctx, res, code) +} + +func (c S3ApiController) GetActions(ctx *fiber.Ctx) error { + bucket, key, keyEnd, uploadId, maxPartsStr, partNumberMarkerStr := ctx.Params("bucket"), ctx.Params("key"), ctx.Params("*1"), ctx.Query("uploadId"), ctx.Query("max-parts"), ctx.Query("part-number-marker") + if keyEnd != "" { + key = strings.Join([]string{key, keyEnd}, "/") + } + + if uploadId != "" { + maxParts, err := strconv.Atoi(maxPartsStr) + if err != nil && maxPartsStr != "" { + return errors.New("wrong api call") + } + + partNumberMarker, err := strconv.Atoi(partNumberMarkerStr) + if err != nil && partNumberMarkerStr != "" { + return errors.New("wrong api call") + } + + res, code := c.be.ListObjectParts(bucket, "", uploadId, partNumberMarker, maxParts) + return responce[*s3response.ListPartsResponse](ctx, res, code) + } + + if ctx.Request().URI().QueryArgs().Has("acl") { + res, code := c.be.GetObjectAcl(bucket, key) + return responce[*s3response.GetObjectAccessControlPolicyResponse](ctx, res, code) + } + + if attrs := ctx.Get("X-Amz-Object-Attributes"); attrs != "" { + res, code := c.be.GetObjectAttributes(bucket, key, strings.Split(attrs, ",")) + return responce[*s3response.GetObjectAttributesResponse](ctx, res, code) + } + + bRangeSl := strings.Split(ctx.Get("Range"), "=") + if len(bRangeSl) < 2 { + return errors.New("wrong api call") + } + + bRange := strings.Split(bRangeSl[1], "-") + if len(bRange) < 2 { + return errors.New("wrong api call") + } + + startOffset, err := strconv.Atoi(bRange[0]) + if err != nil { + return errors.New("wrong api call") + } + + length, err := strconv.Atoi(bRange[1]) + if err != nil { + return errors.New("wrong api call") + } + + res, code := c.be.GetObject(bucket, key, int64(startOffset), int64(length), ctx.Response().BodyWriter(), "") + return responce[*s3response.GetObjectResponse](ctx, res, code) +} + +func (c S3ApiController) ListActions(ctx *fiber.Ctx) error { + if ctx.Request().URI().QueryArgs().Has("acl") { + res, code := c.be.GetBucketAcl(ctx.Params("bucket")) + return responce[*s3response.GetBucketAclResponse](ctx, res, code) + } + + if ctx.Request().URI().QueryArgs().Has("uploads") { + res, code := c.be.ListMultipartUploads(&s3response.ListMultipartUploads{Bucket: ctx.Params("bucket")}) + return responce[*s3response.ListMultipartUploadsResponse](ctx, res, code) + } + + if ctx.QueryInt("list-type") == 2 { + res, code := c.be.ListObjectsV2(ctx.Params("bucket"), "", "", "", 1) + return responce[*s3response.ListBucketResultV2](ctx, res, code) + } + + res, code := c.be.ListObjects(ctx.Params("bucket"), "", "", "", 1) + return responce[*s3response.ListBucketResult](ctx, res, code) +} + +func (c S3ApiController) PutBucketActions(ctx *fiber.Ctx) error { + bucket, acl, grantFullControl, grantRead, grantReadACP, granWrite, grantWriteACP := + ctx.Params("bucket"), + ctx.Get("X-Amz-Acl"), + ctx.Get("X-Amz-Grant-Full-Control"), + ctx.Get("X-Amz-Grant-Read"), + ctx.Get("X-Amz-Grant-Read-Acp"), + ctx.Get("X-Amz-Grant-Write"), + ctx.Get("X-Amz-Grant-Write-Acp") + + grants := grantFullControl + grantRead + grantReadACP + granWrite + grantWriteACP + + if grants != "" || acl != "" { + if grants != "" && acl != "" { + return errors.New("wrong api call") + } + code := c.be.PutBucketAcl(&s3.PutBucketAclInput{ + Bucket: &bucket, + ACL: &acl, + GrantFullControl: &grantFullControl, + GrantRead: &grantRead, + GrantReadACP: &grantReadACP, + GrantWrite: &granWrite, + GrantWriteACP: &grantWriteACP, + }) + + return responce[internal.Any](ctx, nil, code) + } + + code := c.be.PutBucket(bucket) + return responce[internal.Any](ctx, nil, code) +} + +func (c S3ApiController) PutActions(ctx *fiber.Ctx) error { + dstBucket, dstKeyStart, dstKeyEnd, uploadId, partNumberStr := ctx.Params("bucket"), ctx.Params("key"), ctx.Params("*1"), ctx.Query("uploadId"), ctx.Query("partNumber") + copySource, copySrcIfMatch, copySrcIfNoneMatch, + copySrcModifSince, copySrcUnmodifSince, acl, + grantFullControl, grantRead, grantReadACP, + granWrite, grantWriteACP := + // Copy source headers + ctx.Get("X-Amz-Copy-Source"), + ctx.Get("X-Amz-Copy-Source-If-Match"), + ctx.Get("X-Amz-Copy-Source-If-None-Match"), + ctx.Get("X-Amz-Copy-Source-If-Modified-Since"), + ctx.Get("X-Amz-Copy-Source-If-Unmodified-Since"), + // Permission headers + ctx.Get("X-Amz-Acl"), + ctx.Get("X-Amz-Grant-Full-Control"), + ctx.Get("X-Amz-Grant-Read"), + ctx.Get("X-Amz-Grant-Read-Acp"), + ctx.Get("X-Amz-Grant-Write"), + ctx.Get("X-Amz-Grant-Write-Acp") + + grants := grantFullControl + grantRead + grantReadACP + granWrite + grantWriteACP + + if dstKeyEnd != "" { + dstKeyStart = strings.Join([]string{dstKeyStart, dstKeyEnd}, "/") + } + + if partNumberStr != "" { + copySrcModifSinceDate, err := time.Parse(time.RFC3339, copySrcModifSince) + if err != nil && copySrcModifSince != "" { + return errors.New("wrong api call") + } + + copySrcUnmodifSinceDate, err := time.Parse(time.RFC3339, copySrcUnmodifSince) + if err != nil && copySrcUnmodifSince != "" { + return errors.New("wrong api call") + } + + partNumber, err := strconv.ParseInt(partNumberStr, 10, 64) + if err != nil { + return errors.New("wrong api call") + } + + res, code := c.be.UploadPartCopy(&s3.UploadPartCopyInput{ + Bucket: &dstBucket, + Key: &dstKeyStart, + PartNumber: &partNumber, + UploadId: &uploadId, + CopySource: ©Source, + CopySourceIfMatch: ©SrcIfMatch, + CopySourceIfNoneMatch: ©SrcIfNoneMatch, + CopySourceIfModifiedSince: ©SrcModifSinceDate, + CopySourceIfUnmodifiedSince: ©SrcUnmodifSinceDate, + }) + + return responce[*s3.UploadPartCopyOutput](ctx, res, code) + } + + if uploadId != "" { + body := io.ReadSeeker(bytes.NewReader([]byte(ctx.Body()))) + res, code := c.be.UploadPart(dstBucket, dstKeyStart, uploadId, body) + return responce[*s3.UploadPartOutput](ctx, res, code) + } + + if grants != "" || acl != "" { + if grants != "" && acl != "" { + return errors.New("wrong api call") + } + + code := c.be.PutObjectAcl(&s3.PutObjectAclInput{ + Bucket: &dstBucket, + Key: &dstKeyStart, + ACL: &acl, + GrantFullControl: &grantFullControl, + GrantRead: &grantRead, + GrantReadACP: &grantReadACP, + GrantWrite: &granWrite, + GrantWriteACP: &grantWriteACP, + }) + return responce[internal.Any](ctx, nil, code) + } + + if copySource != "" { + copySourceSplit := strings.Split(copySource, "/") + srcBucket, srcObject := copySourceSplit[0], copySourceSplit[1:] + + res, code := c.be.CopyObject(srcBucket, strings.Join(srcObject, "/"), dstBucket, dstKeyStart) + return responce[*s3response.CopyObjectResponse](ctx, res, code) + } + + res, code := c.be.PutObject(dstBucket, dstKeyStart, bytes.NewReader(ctx.Request().Body())) + return responce[string](ctx, res, code) +} + +func (c S3ApiController) DeleteBucket(ctx *fiber.Ctx) error { + code := c.be.DeleteBucket(ctx.Params("bucket")) + return responce[internal.Any](ctx, nil, code) +} + +func (c S3ApiController) DeleteObjects(ctx *fiber.Ctx) error { + var dObj s3response.DeleteObjectEntry + if err := xml.Unmarshal(ctx.Body(), &dObj); err != nil { + return errors.New("wrong api call") + } + + code := c.be.DeleteObjects(ctx.Params("bucket"), &s3response.DeleteObjectsInput{Delete: dObj}) + return responce[internal.Any](ctx, nil, code) +} + +func (c S3ApiController) DeleteActions(ctx *fiber.Ctx) error { + bucket, key, keyEnd, uploadId := ctx.Params("bucket"), ctx.Params("key"), ctx.Params("*1"), ctx.Query("uploadId") + + if keyEnd != "" { + key = strings.Join([]string{key, keyEnd}, "/") + } + + if uploadId != "" { + expectedBucketOwner, requestPayer := ctx.Get("X-Amz-Expected-Bucket-Owner"), ctx.Get("X-Amz-Request-Payer") + + code := c.be.AbortMultipartUpload(&s3.AbortMultipartUploadInput{ + UploadId: &uploadId, + Bucket: &bucket, + Key: &key, + ExpectedBucketOwner: &expectedBucketOwner, + RequestPayer: &requestPayer, + }) + return responce[internal.Any](ctx, nil, code) + } + + code := c.be.DeleteObject(bucket, key) + return responce[internal.Any](ctx, nil, code) +} + +func (c S3ApiController) HeadBucket(ctx *fiber.Ctx) error { + res, code := c.be.HeadBucket(ctx.Params("bucket")) + return responce[*s3response.HeadBucketResponse](ctx, res, code) +} + +func (c S3ApiController) HeadObject(ctx *fiber.Ctx) error { + bucket, key, keyEnd := ctx.Params("bucket"), ctx.Params("key"), ctx.Params("*1") + if keyEnd != "" { + key = strings.Join([]string{key, keyEnd}, "/") + } + + res, code := c.be.HeadObject(bucket, key, "") + return responce[*s3response.HeadObjectResponse](ctx, res, code) +} + +func (c S3ApiController) CreateActions(ctx *fiber.Ctx) error { + bucket, key, keyEnd, uploadId := ctx.Params("bucket"), ctx.Params("key"), ctx.Params("*1"), ctx.Query("uploadId") + var restoreRequest s3.RestoreRequest + + if keyEnd != "" { + key = strings.Join([]string{key, keyEnd}, "/") + } + + if err := xml.Unmarshal(ctx.Body(), &restoreRequest); err == nil { + code := c.be.RestoreObject(bucket, key, &restoreRequest) + return responce[internal.Any](ctx, nil, code) + } + + if uploadId != "" { + var parts []s3response.Part + + if err := xml.Unmarshal(ctx.Body(), &parts); err != nil { + return errors.New("wrong api call") + } + + res, code := c.be.CompleteMultipartUpload(bucket, "", uploadId, parts) + return responce[*s3response.CompleteMultipartUploadResponse](ctx, res, code) + } + res, code := c.be.CreateMultipartUpload(&s3.CreateMultipartUploadInput{Bucket: &bucket, Key: &key}) + return responce[*s3response.InitiateMultipartUploadResponse](ctx, res, code) +} + +func responce[R comparable](ctx *fiber.Ctx, resp R, code s3err.ErrorCode) error { + if code != 0 { + err := s3err.GetAPIError(code) + ctx.Status(err.HTTPStatusCode) + return ctx.Send(s3err.GetAPIErrorResponse(err, "", "", "")) + } else if b, err := xml.Marshal(resp); err != nil { + return err + } else { + return ctx.Send(b) + } +} diff --git a/s3api/router.go b/s3api/router.go index c97c1a17..a9ac81a0 100644 --- a/s3api/router.go +++ b/s3api/router.go @@ -1,337 +1,51 @@ package s3api import ( - "bytes" - "encoding/xml" - "errors" - "io" - "strconv" - "strings" - "time" - - "github.com/aws/aws-sdk-go/service/s3" "github.com/gofiber/fiber/v2" "github.com/versity/scoutgw/backend" - "github.com/versity/scoutgw/internal" - "github.com/versity/scoutgw/s3err" - "github.com/versity/scoutgw/s3response" + "github.com/versity/scoutgw/s3api/controllers" ) type S3ApiRouter struct{} func (sa *S3ApiRouter) Init(app *fiber.App, be backend.Backend) { + s3ApiController := controllers.New(be) // ListBuckets action - app.Get("/", func(ctx *fiber.Ctx) error { - res, code := be.ListBuckets() - return responce[*s3response.ListAllMyBucketsList](ctx, res, code) - }) + app.Get("/", s3ApiController.ListBuckets) // PutBucket action // PutBucketAcl action - app.Put("/:bucket", func(ctx *fiber.Ctx) error { - bucket, acl, grantFullControl, grantRead, grantReadACP, granWrite, grantWriteACP := - ctx.Params("bucket"), - ctx.Get("X-Amz-Acl"), - ctx.Get("X-Amz-Grant-Full-Control"), - ctx.Get("X-Amz-Grant-Read"), - ctx.Get("X-Amz-Grant-Read-Acp"), - ctx.Get("X-Amz-Grant-Write"), - ctx.Get("X-Amz-Grant-Write-Acp") + app.Put("/:bucket", s3ApiController.PutBucketActions) - grants := grantFullControl + grantRead + grantReadACP + granWrite + grantWriteACP - - if grants != "" || acl != "" { - if grants != "" && acl != "" { - return errors.New("wrong api call") - } - code := be.PutBucketAcl(&s3.PutBucketAclInput{ - Bucket: &bucket, - ACL: &acl, - GrantFullControl: &grantFullControl, - GrantRead: &grantRead, - GrantReadACP: &grantReadACP, - GrantWrite: &granWrite, - GrantWriteACP: &grantWriteACP, - }) - - return responce[internal.Any](ctx, nil, code) - } - - code := be.PutBucket(bucket) - return responce[internal.Any](ctx, nil, code) - }) // DeleteBucket action - app.Delete("/:bucket", func(ctx *fiber.Ctx) error { - code := be.DeleteBucket(ctx.Params("bucket")) - return responce[internal.Any](ctx, nil, code) - }) + app.Delete("/:bucket", s3ApiController.DeleteBucket) // HeadBucket - app.Head("/:bucket", func(ctx *fiber.Ctx) error { - res, code := be.HeadBucket(ctx.Params("bucket")) - return responce[*s3response.HeadBucketResponse](ctx, res, code) - }) + app.Head("/:bucket", s3ApiController.HeadBucket) // GetBucketAcl action // ListMultipartUploads action // ListObjects action // ListObjectsV2 action - app.Get("/:bucket", func(ctx *fiber.Ctx) error { - if ctx.Request().URI().QueryArgs().Has("acl") { - res, code := be.GetBucketAcl(ctx.Params("bucket")) - return responce[*s3response.GetBucketAclResponse](ctx, res, code) - } - - if ctx.Request().URI().QueryArgs().Has("uploads") { - res, code := be.ListMultipartUploads(&s3response.ListMultipartUploads{Bucket: ctx.Params("bucket")}) - return responce[*s3response.ListMultipartUploadsResponse](ctx, res, code) - } - - if ctx.QueryInt("list-type") == 2 { - res, code := be.ListObjectsV2(ctx.Params("bucket"), "", "", "", 1) - return responce[*s3response.ListBucketResultV2](ctx, res, code) - } - - res, code := be.ListObjects(ctx.Params("bucket"), "", "", "", 1) - return responce[*s3response.ListBucketResult](ctx, res, code) - }) + app.Get("/:bucket", s3ApiController.ListActions) // HeadObject action - app.Head("/:bucket/:key/*", func(ctx *fiber.Ctx) error { - bucket, key, keyEnd := ctx.Params("bucket"), ctx.Params("key"), ctx.Params("*1") - if keyEnd != "" { - key = strings.Join([]string{key, keyEnd}, "/") - } - - res, code := be.HeadObject(bucket, key, "") - return responce[*s3response.HeadObjectResponse](ctx, res, code) - }) + app.Head("/:bucket/:key/*", s3ApiController.HeadObject) // GetObjectAcl action // GetObject action // ListObjectParts action - app.Get("/:bucket/:key/*", func(ctx *fiber.Ctx) error { - bucket, key, keyEnd, uploadId, maxPartsStr, partNumberMarkerStr := ctx.Params("bucket"), ctx.Params("key"), ctx.Params("*1"), ctx.Query("uploadId"), ctx.Query("max-parts"), ctx.Query("part-number-marker") - if keyEnd != "" { - key = strings.Join([]string{key, keyEnd}, "/") - } - - if uploadId != "" { - maxParts, err := strconv.Atoi(maxPartsStr) - if err != nil && maxPartsStr != "" { - return errors.New("wrong api call") - } - - partNumberMarker, err := strconv.Atoi(partNumberMarkerStr) - if err != nil && partNumberMarkerStr != "" { - return errors.New("wrong api call") - } - - res, code := be.ListObjectParts(bucket, "", uploadId, partNumberMarker, maxParts) - return responce[*s3response.ListPartsResponse](ctx, res, code) - } - - if ctx.Request().URI().QueryArgs().Has("acl") { - res, code := be.GetObjectAcl(bucket, key) - return responce[*s3response.GetObjectAccessControlPolicyResponse](ctx, res, code) - } - - if attrs := ctx.Get("X-Amz-Object-Attributes"); attrs != "" { - res, code := be.GetObjectAttributes(bucket, key, strings.Split(attrs, ",")) - return responce[*s3response.GetObjectAttributesResponse](ctx, res, code) - } - - bRangeSl := strings.Split(ctx.Get("Range"), "=") - if len(bRangeSl) < 2 { - return errors.New("wrong api call") - } - - bRange := strings.Split(bRangeSl[1], "-") - if len(bRange) < 2 { - return errors.New("wrong api call") - } - - startOffset, err := strconv.Atoi(bRange[0]) - if err != nil { - return errors.New("wrong api call") - } - - length, err := strconv.Atoi(bRange[1]) - if err != nil { - return errors.New("wrong api call") - } - - res, code := be.GetObject(bucket, key, int64(startOffset), int64(length), ctx.Response().BodyWriter(), "") - return responce[*s3response.GetObjectResponse](ctx, res, code) - }) + app.Get("/:bucket/:key/*", s3ApiController.GetActions) // DeleteObject action // AbortMultipartUpload action - app.Delete("/:bucket/:key/*", func(ctx *fiber.Ctx) error { - bucket, key, keyEnd, uploadId := ctx.Params("bucket"), ctx.Params("key"), ctx.Params("*1"), ctx.Query("uploadId") - - if keyEnd != "" { - key = strings.Join([]string{key, keyEnd}, "/") - } - - if uploadId != "" { - expectedBucketOwner, requestPayer := ctx.Get("X-Amz-Expected-Bucket-Owner"), ctx.Get("X-Amz-Request-Payer") - - code := be.AbortMultipartUpload(&s3.AbortMultipartUploadInput{ - UploadId: &uploadId, - Bucket: &bucket, - Key: &key, - ExpectedBucketOwner: &expectedBucketOwner, - RequestPayer: &requestPayer, - }) - return responce[internal.Any](ctx, nil, code) - } - - code := be.DeleteObject(bucket, key) - return responce[internal.Any](ctx, nil, code) - }) + app.Delete("/:bucket/:key/*", s3ApiController.DeleteActions) // DeleteObjects action - app.Post("/:bucket", func(ctx *fiber.Ctx) error { - var dObj s3response.DeleteObjectEntry - if err := xml.Unmarshal(ctx.Body(), &dObj); err != nil { - return errors.New("wrong api call") - } - - code := be.DeleteObjects(ctx.Params("bucket"), &s3response.DeleteObjectsInput{Delete: dObj}) - return responce[internal.Any](ctx, nil, code) - }) + app.Post("/:bucket", s3ApiController.DeleteObjects) // CompleteMultipartUpload action // CreateMultipartUpload // RestoreObject action - app.Post("/:bucket/:key/*", func(ctx *fiber.Ctx) error { - bucket, key, keyEnd, uploadId := ctx.Params("bucket"), ctx.Params("key"), ctx.Params("*1"), ctx.Query("uploadId") - var restoreRequest s3.RestoreRequest - - if keyEnd != "" { - key = strings.Join([]string{key, keyEnd}, "/") - } - - if err := xml.Unmarshal(ctx.Body(), &restoreRequest); err == nil { - code := be.RestoreObject(bucket, key, &restoreRequest) - return responce[internal.Any](ctx, nil, code) - } - - if uploadId != "" { - var parts []s3response.Part - - if err := xml.Unmarshal(ctx.Body(), &parts); err != nil { - return errors.New("wrong api call") - } - - res, code := be.CompleteMultipartUpload(bucket, "", uploadId, parts) - return responce[*s3response.CompleteMultipartUploadResponse](ctx, res, code) - } - res, code := be.CreateMultipartUpload(&s3.CreateMultipartUploadInput{Bucket: &bucket, Key: &key}) - return responce[*s3response.InitiateMultipartUploadResponse](ctx, res, code) - }) + app.Post("/:bucket/:key/*", s3ApiController.CreateActions) // CopyObject action // PutObject action // UploadPart action // UploadPartCopy action - app.Put("/:bucket/:key/*", func(ctx *fiber.Ctx) error { - dstBucket, dstKeyStart, dstKeyEnd, uploadId, partNumberStr := ctx.Params("bucket"), ctx.Params("key"), ctx.Params("*1"), ctx.Query("uploadId"), ctx.Query("partNumber") - copySource, copySrcIfMatch, copySrcIfNoneMatch, - copySrcModifSince, copySrcUnmodifSince, acl, - grantFullControl, grantRead, grantReadACP, - granWrite, grantWriteACP := - // Copy source headers - ctx.Get("X-Amz-Copy-Source"), - ctx.Get("X-Amz-Copy-Source-If-Match"), - ctx.Get("X-Amz-Copy-Source-If-None-Match"), - ctx.Get("X-Amz-Copy-Source-If-Modified-Since"), - ctx.Get("X-Amz-Copy-Source-If-Unmodified-Since"), - // Permission headers - ctx.Get("X-Amz-Acl"), - ctx.Get("X-Amz-Grant-Full-Control"), - ctx.Get("X-Amz-Grant-Read"), - ctx.Get("X-Amz-Grant-Read-Acp"), - ctx.Get("X-Amz-Grant-Write"), - ctx.Get("X-Amz-Grant-Write-Acp") - - grants := grantFullControl + grantRead + grantReadACP + granWrite + grantWriteACP - - if dstKeyEnd != "" { - dstKeyStart = strings.Join([]string{dstKeyStart, dstKeyEnd}, "/") - } - - if partNumberStr != "" { - copySrcModifSinceDate, err := time.Parse(time.RFC3339, copySrcModifSince) - if err != nil && copySrcModifSince != "" { - return errors.New("wrong api call") - } - - copySrcUnmodifSinceDate, err := time.Parse(time.RFC3339, copySrcUnmodifSince) - if err != nil && copySrcUnmodifSince != "" { - return errors.New("wrong api call") - } - - partNumber, err := strconv.ParseInt(partNumberStr, 10, 64) - if err != nil { - return errors.New("wrong api call") - } - - res, code := be.UploadPartCopy(&s3.UploadPartCopyInput{ - Bucket: &dstBucket, - Key: &dstKeyStart, - PartNumber: &partNumber, - UploadId: &uploadId, - CopySource: ©Source, - CopySourceIfMatch: ©SrcIfMatch, - CopySourceIfNoneMatch: ©SrcIfNoneMatch, - CopySourceIfModifiedSince: ©SrcModifSinceDate, - CopySourceIfUnmodifiedSince: ©SrcUnmodifSinceDate, - }) - - return responce[*s3.UploadPartCopyOutput](ctx, res, code) - } - - if uploadId != "" { - body := io.ReadSeeker(bytes.NewReader([]byte(ctx.Body()))) - res, code := be.UploadPart(dstBucket, dstKeyStart, uploadId, body) - return responce[*s3.UploadPartOutput](ctx, res, code) - } - - if grants != "" || acl != "" { - if grants != "" && acl != "" { - return errors.New("wrong api call") - } - - code := be.PutObjectAcl(&s3.PutObjectAclInput{ - Bucket: &dstBucket, - Key: &dstKeyStart, - ACL: &acl, - GrantFullControl: &grantFullControl, - GrantRead: &grantRead, - GrantReadACP: &grantReadACP, - GrantWrite: &granWrite, - GrantWriteACP: &grantWriteACP, - }) - return responce[internal.Any](ctx, nil, code) - } - - if copySource != "" { - copySourceSplit := strings.Split(copySource, "/") - srcBucket, srcObject := copySourceSplit[0], copySourceSplit[1:] - - res, code := be.CopyObject(srcBucket, strings.Join(srcObject, "/"), dstBucket, dstKeyStart) - return responce[*s3response.CopyObjectResponse](ctx, res, code) - } - - res, code := be.PutObject(dstBucket, dstKeyStart, bytes.NewReader(ctx.Request().Body())) - return responce[string](ctx, res, code) - }) -} - -func responce[R comparable](ctx *fiber.Ctx, resp R, code s3err.ErrorCode) error { - if code != 0 { - err := s3err.GetAPIError(code) - ctx.Status(err.HTTPStatusCode) - return ctx.Send(s3err.GetAPIErrorResponse(err, "", "", "")) - } else if b, err := xml.Marshal(resp); err != nil { - return err - } else { - return ctx.Send(b) - } + app.Put("/:bucket/:key/*", s3ApiController.PutActions) }