π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
[server] Fix upload rollback verification and expose conflict code
Neerajbb767adaddde
diff --git a/server/ente/errors.go b/server/ente/errors.goindex 37f37bc998..e9b4a7b56e 100644--- a/server/ente/errors.go+++ b/server/ente/errors.go@@ -54,6 +54,12 @@ var ErrUncategorizeCollectionAlreadyExists = errors.New("uncategorized collectiovar ErrDuplicateThumbnailObjectFound = errors.New("thumbnail object already exists")+var ErrFileUploadConflict = &ApiError{+ Code: "FILE_UPLOAD_CONFLICT",+ Message: "File upload conflicts with an existing file",+ HttpStatusCode: http.StatusBadRequest,+}+var ErrVersionMismatch = errors.New("client version is out of sync")var ErrCanNotInviteUserWithPaidPlan = errors.New("can not invite user with active paid plan")diff --git a/server/pkg/controller/file.go b/server/pkg/controller/file.goindex 1ecc407016..d88abf5ae0 100644--- a/server/pkg/controller/file.go+++ b/server/pkg/controller/file.go@@ -981,7 +981,7 @@ func (c *FileController) onDuplicateObjectDetected(ctx *gin.Context, file ente.Freturn file, nil}go c.onExistingObjectsReplaced(ctx, file, hotDC)- return ente.File{}, ente.ErrBadRequest+ return ente.File{}, ente.ErrFileUploadConflict}func (c *FileController) safeAlert(msg string) {@@ -1073,8 +1073,9 @@ func (c *FileController) deleteObjectVersionFromHotStorage(objectKey string, verreturn stacktrace.Propagate(err, "")}err = s3Client.WaitUntilObjectNotExists(&s3.HeadObjectInput{- Bucket: c.S3Config.GetHotBucket(),- Key: &objectKey,+ Bucket: c.S3Config.GetHotBucket(),+ Key: &objectKey,+ VersionId: &versionID,})if err != nil {return stacktrace.Propagate(err, "")diff --git a/server/pkg/controller/file_rollback_test.go b/server/pkg/controller/file_rollback_test.gonew file mode 100644index 0000000000..fc2d257ea9--- /dev/null+++ b/server/pkg/controller/file_rollback_test.go@@ -0,0 +1,107 @@+package controller++import (+ "io"+ "net/http"+ "strings"+ "testing"+ "time"++ "github.com/aws/aws-sdk-go/aws"+ "github.com/aws/aws-sdk-go/service/s3"+ "github.com/ente/museum/pkg/utils/s3config"+ "github.com/spf13/viper"+ "github.com/stretchr/testify/require"+)++func TestDeleteObjectVersionFromHotStorage(t *testing.T) {+ const objectKey = "1/file"+ const versionID = "new-version"++ for _, tt := range []struct {+ name string+ deleteStatus int+ headStatus int+ wantError bool+ }{+ {name: "deleted version is gone but older version remains", deleteStatus: 204, headStatus: 404},+ {name: "deleted version still exists", deleteStatus: 204, headStatus: 200, wantError: true},+ {name: "verification is forbidden", deleteStatus: 204, headStatus: 403, wantError: true},+ {name: "deletion is forbidden", deleteStatus: 403, headStatus: 404, wantError: true},+ } {+ t.Run(tt.name, func(t *testing.T) {+ viper.Reset()+ t.Cleanup(viper.Reset)+ viper.Set("s3.b2-eu-cen.key", "test-key")+ viper.Set("s3.b2-eu-cen.secret", "test-secret")+ viper.Set("s3.b2-eu-cen.endpoint", "https://s3.example.test")+ viper.Set("s3.b2-eu-cen.region", "us-east-1")+ viper.Set("s3.b2-eu-cen.bucket", "test-bucket")+ viper.Set("s3.use_path_style_urls", true)++ var deletedVersions, checkedVersions []string+ s3Config := s3config.NewS3Config()+ client := s3Config.GetHotS3Client()+ client.Config.SleepDelay = func(time.Duration) {}+ client.Config.HTTPClient = &http.Client{+ Transport: rollbackTestTransport(func(r *http.Request) (*http.Response, error) {+ require.Equal(t, "/test-bucket/"+objectKey, r.URL.Path)+ version := r.URL.Query().Get("versionId")+ status := http.StatusMethodNotAllowed+ headers := make(http.Header)+ switch r.Method {+ case http.MethodDelete:+ deletedVersions = append(deletedVersions, version)+ status = tt.deleteStatus+ case http.MethodHead:+ checkedVersions = append(checkedVersions, version)+ if version == versionID {+ status = tt.headStatus+ } else {+ status = http.StatusOK+ headers.Set("X-Amz-Version-Id", "old-version")+ }+ }+ return &http.Response{+ StatusCode: status,+ Header: headers,+ Body: io.NopCloser(strings.NewReader("")),+ Request: r,+ }, nil+ }),+ }++ controller := &FileController{S3Config: s3Config}+ err := controller.deleteObjectVersionFromHotStorage(objectKey, versionID)+ if tt.wantError {+ require.Error(t, err)+ } else {+ require.NoError(t, err)+ }+ require.Equal(t, []string{versionID}, deletedVersions)+ if tt.deleteStatus != http.StatusNoContent {+ require.Empty(t, checkedVersions)+ return+ }+ require.NotEmpty(t, checkedVersions)+ for _, version := range checkedVersions {+ require.Equal(t, versionID, version)+ }+ if !tt.wantError {+ require.Len(t, checkedVersions, 1)+ head, err := client.HeadObject(&s3.HeadObjectInput{+ Bucket: s3Config.GetHotBucket(),+ Key: aws.String(objectKey),+ })+ require.NoError(t, err)+ require.Equal(t, "old-version", aws.StringValue(head.VersionId))+ }+ })+ }+}++type rollbackTestTransport func(*http.Request) (*http.Response, error)++func (transport rollbackTestTransport) RoundTrip(r *http.Request) (*http.Response, error) {+ return transport(r)+}diff --git a/server/pkg/utils/handler/handler_test.go b/server/pkg/utils/handler/handler_test.goindex 74e4b8e8fc..d19dd7e999 100644--- a/server/pkg/utils/handler/handler_test.go+++ b/server/pkg/utils/handler/handler_test.go@@ -172,6 +172,32 @@ func TestErrorPreservesNotFoundAPIErrorResponse(t *testing.T) {require.Equal(t, ente.NotFoundError, body.Code)}+func TestErrorPreservesFileUploadConflictStatus(t *testing.T) {+ gin.SetMode(gin.TestMode)++ for _, tt := range []struct {+ name string+ err error+ code string+ }{+ {name: "legacy bad request", err: ente.ErrBadRequest},+ {name: "upload conflict", err: ente.ErrFileUploadConflict, code: "FILE_UPLOAD_CONFLICT"},+ } {+ t.Run(tt.name, func(t *testing.T) {+ recorder, ctx := testContext()+ err := stacktrace.Propagate(stacktrace.Propagate(tt.err, "create"), "handler")+ Error(ctx, err)++ require.Equal(t, http.StatusBadRequest, recorder.Code)+ var body struct {+ Code string `json:"code"`+ }+ require.NoError(t, json.Unmarshal(recorder.Body.Bytes(), &body))+ require.Equal(t, tt.code, body.Code)+ })+ }+}+func testContext() (*httptest.ResponseRecorder, *gin.Context) {recorder := httptest.NewRecorder()ctx, _ := gin.CreateTestContext(recorder)