Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

[server] Clean up old SRP sessions (#14338)

neeraj-pilota2517d44b2d8
diff --git a/server/cmd/museum/main.go b/server/cmd/museum/main.go
index 155d352aca..e61999da04 100644
--- a/server/cmd/museum/main.go
+++ b/server/cmd/museum/main.go
@@ -1315,6 +1315,7 @@ func setupAndStartCrons(userAuthRepo *repo.UserAuthRepository, collectionLinkRep
}
const deletedTokenRetentionDays = 427 // 13-month deletion window (395 days) + 32-day safety buffer
+ const srpSessionCleanupBatchSize = 10_000
c := cron.New()
schedule(c, "@every 1m", func() {
@@ -1406,11 +1407,14 @@ func setupAndStartCrons(userAuthRepo *repo.UserAuthRepository, collectionLinkRep
scheduleAndRun(c, "@every 24h", func() {
emailNotificationCtrl.NudgePaidSubscriberForFamily()
- deleted, err := userAuthRepo.CleanupOldFakeSessions(context.Background())
+ })
+
+ scheduleAndRun(c, "@every 1m", func() {
+ deleted, err := userAuthRepo.CleanupOldSRPSessions(context.Background(), srpSessionCleanupBatchSize)
if err != nil {
- log.WithError(err).Error("Failed to cleanup old fake SRP sessions")
+ log.WithError(err).Error("Failed to cleanup old SRP sessions")
} else if deleted > 0 {
- log.WithField("count", deleted).Info("Cleaned up old fake SRP sessions")
+ log.WithField("count", deleted).Info("Cleaned up old SRP sessions")
}
})
diff --git a/server/migrations/154_srp_sessions_created_at_idx.down.sql b/server/migrations/154_srp_sessions_created_at_idx.down.sql
new file mode 100644
index 0000000000..19966bf88a
--- /dev/null
+++ b/server/migrations/154_srp_sessions_created_at_idx.down.sql
@@ -0,0 +1 @@
+DROP INDEX CONCURRENTLY IF EXISTS srp_sessions_created_at_idx;
diff --git a/server/migrations/154_srp_sessions_created_at_idx.up.sql b/server/migrations/154_srp_sessions_created_at_idx.up.sql
new file mode 100644
index 0000000000..41f7a31f0d
--- /dev/null
+++ b/server/migrations/154_srp_sessions_created_at_idx.up.sql
@@ -0,0 +1,2 @@
+CREATE INDEX CONCURRENTLY IF NOT EXISTS srp_sessions_created_at_idx
+ ON srp_sessions (created_at);
diff --git a/server/pkg/repo/srp.go b/server/pkg/repo/srp.go
index 63b0b5eb30..308d9e760e 100644
--- a/server/pkg/repo/srp.go
+++ b/server/pkg/repo/srp.go
@@ -225,13 +225,21 @@ func (repo *UserAuthRepository) TrySetSrpSessionVerified(ctx context.Context, se
return rowsAffected == 1, nil
}
-func (repo *UserAuthRepository) CleanupOldFakeSessions(ctx context.Context) (int64, error) {
+func (repo *UserAuthRepository) CleanupOldSRPSessions(ctx context.Context, batchSize int) (int64, error) {
result, err := repo.DB.ExecContext(ctx, `
+ WITH old_sessions AS (
+ SELECT id
+ FROM srp_sessions
+ WHERE created_at < (now_utc_micro_seconds() - (24::BIGINT * 60 * 60 * 1000 * 1000))
+ ORDER BY created_at
+ LIMIT $1
+ FOR UPDATE SKIP LOCKED
+ )
DELETE FROM srp_sessions
- WHERE is_fake = true
- AND created_at < (now_utc_micro_seconds() - (24::BIGINT * 60 * 60 * 1000 * 1000))`)
+ USING old_sessions
+ WHERE srp_sessions.id = old_sessions.id`, batchSize)
if err != nil {
- return 0, stacktrace.Propagate(err, "failed to cleanup old fake sessions")
+ return 0, stacktrace.Propagate(err, "failed to cleanup old SRP sessions")
}
rowsAffected, err := result.RowsAffected()
if err != nil {
diff --git a/server/pkg/repo/srp_test.go b/server/pkg/repo/srp_test.go
new file mode 100644
index 0000000000..aacac97e89
--- /dev/null
+++ b/server/pkg/repo/srp_test.go
@@ -0,0 +1,50 @@
+package repo
+
+import (
+ "testing"
+
+ "github.com/ente/museum/internal/testutil"
+ "github.com/google/uuid"
+ "github.com/stretchr/testify/require"
+)
+
+func TestCleanupOldSRPSessions(t *testing.T) {
+ testutil.WithServerRoot(t)
+ db := testutil.RequireTestDB(t)
+ _, err := db.Exec(`TRUNCATE TABLE srp_sessions`)
+ require.NoError(t, err)
+ t.Cleanup(func() {
+ _, err := db.Exec(`TRUNCATE TABLE srp_sessions`)
+ require.NoError(t, err)
+ })
+
+ oldRealID, oldFakeID, anotherOldRealID := uuid.New(), uuid.New(), uuid.New()
+ recentRealID, recentFakeID := uuid.New(), uuid.New()
+ _, err = db.Exec(`
+ INSERT INTO srp_sessions(id, srp_user_id, server_key, srp_a, is_fake, created_at)
+ VALUES
+ ($1, $6, 'key', 'a', false, now_utc_micro_seconds() - (25::BIGINT * 60 * 60 * 1000 * 1000)),
+ ($2, $6, 'key', 'a', true, now_utc_micro_seconds() - (25::BIGINT * 60 * 60 * 1000 * 1000)),
+ ($3, $6, 'key', 'a', false, now_utc_micro_seconds() - (25::BIGINT * 60 * 60 * 1000 * 1000)),
+ ($4, $6, 'key', 'a', false, now_utc_micro_seconds()),
+ ($5, $6, 'key', 'a', true, now_utc_micro_seconds())`,
+ oldRealID, oldFakeID, anotherOldRealID, recentRealID, recentFakeID, uuid.New())
+ require.NoError(t, err)
+
+ repository := &UserAuthRepository{DB: db}
+ deleted, err := repository.CleanupOldSRPSessions(t.Context(), 2)
+ require.NoError(t, err)
+ require.EqualValues(t, 2, deleted)
+
+ var oldCount, recentCount int
+ require.NoError(t, db.QueryRow(`SELECT COUNT(*) FROM srp_sessions WHERE id IN ($1, $2, $3)`, oldRealID, oldFakeID, anotherOldRealID).Scan(&oldCount))
+ require.NoError(t, db.QueryRow(`SELECT COUNT(*) FROM srp_sessions WHERE id IN ($1, $2)`, recentRealID, recentFakeID).Scan(&recentCount))
+ require.Equal(t, 1, oldCount)
+ require.Equal(t, 2, recentCount)
+
+ deleted, err = repository.CleanupOldSRPSessions(t.Context(), 2)
+ require.NoError(t, err)
+ require.EqualValues(t, 1, deleted)
+ require.NoError(t, db.QueryRow(`SELECT COUNT(*) FROM srp_sessions WHERE id IN ($1, $2, $3)`, oldRealID, oldFakeID, anotherOldRealID).Scan(&oldCount))
+ require.Zero(t, oldCount)
+}