π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Invalidate file counts during stale membership cleanup
Neeraj Gupta154751c1932b
diff --git a/server/pkg/repo/trash.go b/server/pkg/repo/trash.goindex b33e1604d1..df3a5734e7 100644--- a/server/pkg/repo/trash.go+++ b/server/pkg/repo/trash.go@@ -188,25 +188,29 @@ func (t *TrashRepository) CleanUpDeletedFilesFromCollection(ctx context.Context,return stacktrace.Propagate(err, "")}defer tx.Rollback()- rows, err := tx.QueryContext(ctx, `SELECT DISTINCT collection_id FROM- collection_files WHERE file_id = ANY($1) AND is_deleted = $2`, pq.Array(fileIDs), false)+ updationTime := time.Microseconds()+ rows, err := tx.QueryContext(ctx, `UPDATE collection_files AS cf+ SET is_deleted = TRUE, updation_time = $2+ FROM collections AS c+ WHERE cf.file_id = ANY($1) AND cf.is_deleted = FALSE+ AND c.collection_id = cf.collection_id+ RETURNING cf.collection_id, c.owner_id = $3`, pq.Array(fileIDs), updationTime, userID)if err != nil {return stacktrace.Propagate(err, "")}defer rows.Close()cIDs := make([]int64, 0)+ removedOwnedMembership := falsefor rows.Next() {var cID int64- if err := rows.Scan(&cID); err != nil {+ var owned bool+ if err := rows.Scan(&cID, &owned); err != nil {return stacktrace.Propagate(err, "")}cIDs = append(cIDs, cID)+ removedOwnedMembership = removedOwnedMembership || owned}- updationTime := time.Microseconds()- _, err = tx.ExecContext(ctx, `UPDATE collection_files- SET is_deleted = $1, updation_time = $2 WHERE file_id = ANY($3)`,- true, updationTime, pq.Array(fileIDs))- if err != nil {+ if err := rows.Err(); err != nil {return stacktrace.Propagate(err, "")}_, err = tx.ExecContext(ctx, `UPDATE collections SET updation_time = $1@@ -214,8 +218,21 @@ func (t *TrashRepository) CleanUpDeletedFilesFromCollection(ctx context.Context,if err != nil {return stacktrace.Propagate(err, "")}- err = tx.Commit()- return stacktrace.Propagate(err, "")+ if removedOwnedMembership {+ if _, err := applyUsageDelta(ctx, tx, userID, 0, 0, 0, true); err != nil {+ return stacktrace.Propagate(err, "failed to invalidate file counts")+ }+ }+ if err := tx.Commit(); err != nil {+ return stacktrace.Propagate(err, "")+ }+ if removedOwnedMembership {+ logrus.WithFields(logrus.Fields{+ "user_id": userID,+ "file_ids": fileIDs,+ }).Info("cleaned stale owned file memberships")+ }+ return nil}func (t *TrashRepository) Delete(ctx context.Context, userID int64, fileIDs []int64) error {diff --git a/server/pkg/repo/trash_test.go b/server/pkg/repo/trash_test.goindex b2b301b4c5..a39d33f250 100644--- a/server/pkg/repo/trash_test.go+++ b/server/pkg/repo/trash_test.go@@ -144,6 +144,66 @@ func TestTrashFilesRollsBackWhenFileLinkCleanupFails(t *testing.T) {}}+func TestStaleCleanupInvalidatesOnlyRemovedOwnedMemberships(t *testing.T) {+ for _, tc := range []struct {+ name string+ collectionOwner int64+ ready bool+ wantVersion int64+ }{+ {"ready owned", 1, true, 1},+ {"legacy owned", 1, false, 1},+ {"shared only", 2, true, 0},+ } {+ t.Run(tc.name, func(t *testing.T) {+ repository, db, userID := setupCollectionMembershipTest(t)+ if tc.collectionOwner != userID {+ testutil.InsertUser(t, db, testutil.UserFixture{UserID: tc.collectionOwner, Email: "[email protected]", CreationTime: 1})+ }+ if tc.ready {+ setReadyFileCounts(t, db, userID, 1, 1)+ }+ if _, err := db.Exec(`UPDATE usage SET storage_consumed = 123 WHERE user_id = $1`, userID); err != nil {+ t.Fatal(err)+ }+ collectionID := insertObjectTestCollection(t, db, tc.collectionOwner)+ fileID := insertObjectTestFile(t, db, userID)+ linkObjectTestFileToCollection(t, db, collectionID, fileID, userID)+ // Legacy owner columns can be NULL, and soft-deleted collections still count.+ if _, err := db.Exec(`UPDATE collection_files SET c_owner_id = NULL, f_owner_id = NULL;+ UPDATE collections SET is_deleted = TRUE`); err != nil {+ t.Fatal(err)+ }+ if _, err := db.Exec(`INSERT INTO trash(file_id, collection_id, user_id, delete_by, updated_at, is_deleted)+ VALUES ($1, $2, $3, 1, 1, TRUE)`, fileID, collectionID, userID); err != nil {+ t.Fatal(err)+ }++ for attempt := 0; attempt < 2; attempt++ {+ if err := repository.TrashRepo.CleanUpDeletedFilesFromCollection(t.Context(), []int64{fileID}, userID); err != nil {+ t.Fatal(err)+ }+ photos, locker, version := readFileCountState(t, db, userID)+ if tc.wantVersion == 0 {+ assertReadyFileCounts(t, db, userID, 1, 1, 0)+ } else if photos.Valid || locker.Valid || version != tc.wantVersion {+ t.Fatalf("attempt %d: counts = (%v, %v, %d), want (NULL, NULL, %d)", attempt, photos, locker, version, tc.wantVersion)+ }+ }+ var deleted bool+ var storage int64+ if err := db.QueryRow(`SELECT cf.is_deleted, u.storage_consumed+ FROM collection_files cf JOIN usage u ON u.user_id = $1+ WHERE cf.file_id = $2`, userID, fileID).Scan(&deleted, &storage); err != nil {+ t.Fatal(err)+ }+ if !deleted || storage != 123 {+ t.Fatalf("deleted = %t, storage = %d, want true, 123", deleted, storage)+ }+ })+ }+}+func setupTrashTest(t *testing.T) (*TrashRepository, *sql.DB) {t.Helper()