Self-hosted personal gallery application with online photo management and albums, supporting Live/Motion Photos, EXIF parsing, geolocation recognition, and an explore map.
TypeScript albumsexif-extractiongeocodinglive-photomotion-photophoto-galleryphoto-sharingwebgl-viewer
fix(cloud): fence media leases when an account is marked for deletion
Timothy Yin1e4c92f8b91f
diff --git a/apps/cloud/server/api/internal/worker/[action].post.ts b/apps/cloud/server/api/internal/worker/[action].post.tsindex 9b62297e..a9d16724 100644--- a/apps/cloud/server/api/internal/worker/[action].post.ts+++ b/apps/cloud/server/api/internal/worker/[action].post.ts@@ -78,7 +78,7 @@ export default definePlatformHandler(async (event) => {const candidates = (await db.prepare(- `SELECT j.site_id,MIN(j.created_at) oldest FROM cloud_processing_jobs j LEFT JOIN cloud_site_dispatch d ON d.site_id=j.site_id WHERE ((state IN ('queued','retry_wait') AND available_at<=?) OR (state='running' AND lease_until<=?)) AND NOT EXISTS(SELECT 1 FROM cloud_processing_jobs active WHERE active.site_id=j.site_id AND active.state='running' AND active.lease_until>?) GROUP BY j.site_id ORDER BY COALESCE(d.last_claim_at,0),oldest,j.site_id LIMIT 10`,+ `SELECT j.site_id,MIN(j.created_at) oldest FROM cloud_processing_jobs j JOIN platform_sites s ON s.id=j.site_id AND s.suspended=0 LEFT JOIN cloud_site_dispatch d ON d.site_id=j.site_id WHERE ((state IN ('queued','retry_wait') AND available_at<=?) OR (state='running' AND lease_until<=?)) AND NOT EXISTS(SELECT 1 FROM cloud_processing_jobs active WHERE active.site_id=j.site_id AND active.state='running' AND active.lease_until>?) GROUP BY j.site_id ORDER BY COALESCE(d.last_claim_at,0),oldest,j.site_id LIMIT 10`,).bind(now, now, now).all<{ site_id: number }>()@@ -88,6 +88,14 @@ export default definePlatformHandler(async (event) => {id: candidate.site_id,}).claim(body.workerId, crypto.randomUUID(), now, 120000)if (!lease) continue+ // A deletion mark may race the candidate query. Do not issue fresh transport capabilities.+ if (+ !(await db+ .prepare('SELECT id FROM platform_sites WHERE id=? AND suspended=0')+ .bind(lease.siteId)+ .first())+ )+ continueconst s3 = await storage(lease.siteId,lease.connectionId,diff --git a/packages/platform/src/account-lifecycle.ts b/packages/platform/src/account-lifecycle.tsindex 254f0d32..c128f48f 100644--- a/packages/platform/src/account-lifecycle.ts+++ b/packages/platform/src/account-lifecycle.ts@@ -161,6 +161,11 @@ export async function markAccount(`UPDATE platform_sites SET suspended=1,suspension_reason='Owner account marked for deletion',revision=revision+1 WHERE id IN(SELECT site_id FROM platform_deletion_sites WHERE user_id=?) AND ${guard}`,).bind(userId, ...args),+ db+ .prepare(+ `UPDATE cloud_processing_jobs SET lease_until=? WHERE state='running' AND site_id IN(SELECT site_id FROM platform_deletion_sites WHERE user_id=?) AND ${guard}`,+ )+ .bind(now, userId, ...args),db.prepare(`DELETE FROM platform_auth_sessions WHERE user_id=? AND ${guard}`,diff --git a/tests/account-lifecycle-mail.test.ts b/tests/account-lifecycle-mail.test.tsindex 54c35bed..ce760210 100644--- a/tests/account-lifecycle-mail.test.ts+++ b/tests/account-lifecycle-mail.test.ts@@ -280,6 +280,18 @@ test('Lifecycle notices, current-login race, restore, retained deadline and retr"INSERT INTO platform_domains(hostname,site_id,verified,active) VALUES('mine.example.com',1,1,1)",).run()+ await db+ .prepare(+ "INSERT INTO cloud_uploads(site_id,id,owner_id,photo_id,source_version,connection_id,object_key,expected_bytes,expires_at,state) VALUES(1,'processing-upload',3,'p','1','s3','chronoframe/1/original.jpg',10,?,'completed')",+ )+ .bind(now + DAY)+ .run()+ await db+ .prepare(+ "INSERT INTO cloud_processing_jobs(site_id,id,upload_id,photo_id,source_version,pipeline_version,state,created_at,attempt_id,worker_id,lease_until) VALUES(1,'processing-job','processing-upload','p','1','1','running',?,'attempt','worker',?)",+ )+ .bind(now, now + 120000)+ .run()assert.equal(await markAccount(db,@@ -299,6 +311,16 @@ test('Lifecycle notices, current-login race, restore, retained deadline and retr).suspended,1,)+ assert.equal(+ (+ await db+ .prepare(+ "SELECT lease_until FROM cloud_processing_jobs WHERE id='processing-job'",+ )+ .first()+ ).lease_until,+ now,+ )await db.prepare("INSERT INTO platform_verifications(identifier,value,expires_at,created_at,updated_at) VALUES('[email protected]','own',?,?,?),('[email protected]','other',?,?,?)",