π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Align recovery validation with cleanup stage
Neeraj Gupta170cb7387be2
diff --git a/server/pkg/controller/user/account_recovery.go b/server/pkg/controller/user/account_recovery.goindex 2b3f237a07..6e721961c2 100644--- a/server/pkg/controller/user/account_recovery.go+++ b/server/pkg/controller/user/account_recovery.go@@ -1,6 +1,7 @@package userimport (+ "context""database/sql""errors""fmt"@@ -136,6 +137,13 @@ func (c *UserController) accountRecoveryStatus(req ente.RecoverAccountRequest, a}return "", stacktrace.Propagate(err, "failed to get key attributes")}+ scheduled, err := c.DataCleanupRepo.HasScheduledDelete(context.Background(), req.UserID)+ if err != nil {+ return "", stacktrace.Propagate(err, "failed to check scheduled deletion")+ }+ if !scheduled {+ return "", stacktrace.Propagate(ErrAccountRecoveryUnavailable, "scheduled deletion is no longer recoverable")+ }recoveryEmail := email.NormalizeEmail(req.EmailID)if userID, err := c.UserRepo.GetUserIDWithEmailUnrestricted(recoveryEmail); err == nil {diff --git a/server/pkg/controller/user/user_recovery_test.go b/server/pkg/controller/user/user_recovery_test.goindex 6261c8f991..3654c71442 100644--- a/server/pkg/controller/user/user_recovery_test.go+++ b/server/pkg/controller/user/user_recovery_test.go@@ -170,6 +170,15 @@ func TestSelfAccountRecoveryStatusAndRecovery(t *testing.T) {if response.Status != ente.AccountRecoveryReady {t.Fatalf("validation status = %q, want %q", response.Status, ente.AccountRecoveryReady)}+ if _, err := db.Exec(`UPDATE data_cleanup SET stage = $1 WHERE user_id = $2`, cleanupentity.Collection, userID); err != nil {+ t.Fatalf("failed to advance cleanup: %v", err)+ }+ if _, err := controller.ValidateSelfAccountRecovery(token); !errors.Is(err, ErrAccountRecoveryUnavailable) {+ t.Fatalf("validation after cleanup advanced error = %v, want ErrAccountRecoveryUnavailable", err)+ }+ if _, err := db.Exec(`UPDATE data_cleanup SET stage = $1 WHERE user_id = $2`, cleanupentity.Scheduled, userID); err != nil {+ t.Fatalf("failed to restore scheduled cleanup fixture: %v", err)+ }gin.SetMode(gin.TestMode)ctx, _ := gin.CreateTestContext(httptest.NewRecorder())diff --git a/server/pkg/repo/datacleanup/repository.go b/server/pkg/repo/datacleanup/repository.goindex 2e045fb280..a69d0b4bcd 100644--- a/server/pkg/repo/datacleanup/repository.go+++ b/server/pkg/repo/datacleanup/repository.go@@ -19,6 +19,14 @@ func (r *Repository) Insert(ctx context.Context, userID int64) error {return stacktrace.Propagate(err, "failed to insert")}+func (r *Repository) HasScheduledDelete(ctx context.Context, userID int64) (bool, error) {+ var exists bool+ err := r.DB.QueryRowContext(ctx, `SELECT EXISTS(+ SELECT 1 FROM data_cleanup WHERE user_id = $1 AND stage = $2+ )`, userID, entity.Scheduled).Scan(&exists)+ return exists, stacktrace.Propagate(err, "failed to check scheduled delete")+}+func (r *Repository) LockScheduledDelete(ctx context.Context, tx *sql.Tx, userID int64) error {var lockedUserID int64return tx.QueryRowContext(ctx, `SELECT user_id FROM data_cleanup