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): reject domain writes for suspended sites
Timothy Yin253678eec7d5
diff --git a/apps/cloud/server/api/sites/[siteId]/domains.post.ts b/apps/cloud/server/api/sites/[siteId]/domains.post.tsindex 345dfe8f..467ea6ac 100644--- a/apps/cloud/server/api/sites/[siteId]/domains.post.ts+++ b/apps/cloud/server/api/sites/[siteId]/domains.post.ts@@ -10,8 +10,9 @@ import {siteManagementBody,} from '../../../utils/site-management'export default definePlatformHandler(async (event) => {- const { userId } = await siteManagement(event, true),+ const { userId, store } = await siteManagement(event, true),siteId = Number(getRouterParam(event, 'siteId'))+ await store.get(userId, siteId)const body = await siteManagementBody(event),db = platformDatabase(event),{ manager, config } = domainServices(db, useRuntimeConfig(event))diff --git a/packages/platform/src/domains.ts b/packages/platform/src/domains.tsindex 9635ca41..c3443802 100644--- a/packages/platform/src/domains.ts+++ b/packages/platform/src/domains.ts@@ -111,10 +111,10 @@ export function createDomainManager(const base = normalizeDomain(config.baseDomain || DEFAULT_SITE_BASE)const target = normalizeDomain(config.cnameTarget || DEFAULT_CNAME_TARGET)const resourceLimit = Math.max(1, Math.min(config.limit, 20))- const memberGuard = `EXISTS(SELECT 1 FROM platform_sites s JOIN platform_memberships m ON m.workspace_id=s.workspace_id WHERE s.id=? AND m.user_id=? AND m.role='admin')`+ const memberGuard = `EXISTS(SELECT 1 FROM platform_sites s JOIN platform_memberships m ON m.workspace_id=s.workspace_id WHERE s.id=? AND s.suspended=0 AND m.user_id=? AND m.role='admin')`async function authorize(userId: number, siteId: number, admin = true) {const row = await stmt(- `SELECT s.id,s.slug,s.revision,m.role FROM platform_sites s JOIN platform_memberships m ON m.workspace_id=s.workspace_id WHERE s.id=? AND m.user_id=?`,+ `SELECT s.id,s.slug,s.revision,m.role FROM platform_sites s JOIN platform_memberships m ON m.workspace_id=s.workspace_id WHERE s.id=? AND s.suspended=0 AND m.user_id=?`,siteId,userId,).first<{ id: number; slug: string; revision: number; role: string }>()@@ -638,7 +638,7 @@ export async function renameDefaultDomain(throw new DomainError(400, 'domain_invalid')const current = await db.prepare(- `SELECT s.slug,s.revision FROM platform_sites s JOIN platform_memberships m ON m.workspace_id=s.workspace_id WHERE s.id=? AND m.user_id=? AND m.role='admin'`,+ `SELECT s.slug,s.revision FROM platform_sites s JOIN platform_memberships m ON m.workspace_id=s.workspace_id WHERE s.id=? AND s.suspended=0 AND m.user_id=? AND m.role='admin'`,).bind(siteId, userId).first<{ slug: string; revision: number }>()@@ -648,7 +648,7 @@ export async function renameDefaultDomain(if (current.slug === input.slug) return { ok: true }const host = defaultSiteHost(input.slug, base),guard =- "EXISTS(SELECT 1 FROM platform_sites s JOIN platform_memberships m ON m.workspace_id=s.workspace_id WHERE s.id=? AND s.revision=? AND m.user_id=? AND m.role='admin')",+ "EXISTS(SELECT 1 FROM platform_sites s JOIN platform_memberships m ON m.workspace_id=s.workspace_id WHERE s.id=? AND s.suspended=0 AND s.revision=? AND m.user_id=? AND m.role='admin')",args = [siteId, current.revision, userId]try {const results = await db.batch([@@ -681,7 +681,7 @@ export async function renameDefaultDomain(),db.prepare(- `UPDATE platform_sites SET slug=?,revision=revision+1 WHERE id=? AND revision=? AND EXISTS(SELECT 1 FROM platform_memberships WHERE workspace_id=platform_sites.workspace_id AND user_id=? AND role='admin')`,+ `UPDATE platform_sites SET slug=?,revision=revision+1 WHERE id=? AND revision=? AND platform_sites.suspended=0 AND EXISTS(SELECT 1 FROM platform_memberships WHERE workspace_id=platform_sites.workspace_id AND user_id=? AND role='admin')`,).bind(input.slug, ...args),])diff --git a/tests/platform-entitlements.test.ts b/tests/platform-entitlements.test.tsindex 99a059aa..1731c0fc 100644--- a/tests/platform-entitlements.test.ts+++ b/tests/platform-entitlements.test.ts@@ -1,5 +1,6 @@import {createDomainManager,+ renameDefaultDomain,type DomainProvider,} from '../packages/platform/src/domains.ts'import test from 'node:test'@@ -169,6 +170,12 @@ test('New workspaces are free; empty galleries auto-publish; quotas and managedstatusCode: 403,code: 'domain_limit',})+ await db+ .prepare(+ `UPDATE platform_plans SET policy_json=json_set(policy_json,'$.limits.customDomains',3) WHERE id='free'`,+ )+ .run()+ const domain = await manager.request(1, one.siteId, 'existing.example.com')const two = await provision.create(2, {name: 'Two',slug: 'two-site',@@ -238,6 +245,112 @@ test('New workspaces are free; empty galleries auto-publish; quotas and managedawait directory.getPublishedSiteByHost(one.slug + '.chronoframe.art'),null,)+ for (const action of [+ 'pause',+ 'resume',+ 'delete',+ 'check',+ 'primary',+ 'redirects',+ ] as const)+ await assert.rejects(+ manager.mutate(+ 1,+ one.siteId,+ domain.hostname,+ domain.generation,+ domain.revision,+ action,+ ),+ { statusCode: 404 },+ )+ await assert.rejects(manager.defaultPrimary(1, one.siteId), {+ statusCode: 404,+ })+ await assert.rejects(+ manager.request(1, one.siteId, 'blocked.example.com'),+ { statusCode: 404 },+ )+ await assert.rejects(+ renameDefaultDomain(db, 1, one.siteId, {+ slug: 'blocked-rename',+ revision: one.revision,+ }),+ { statusCode: 403 },+ )+ const audits = (+ await db+ .prepare('SELECT COUNT(*) AS n FROM platform_domain_audit')+ .first()+ ).n+ const racedDb = {+ prepare: (query: string) => db.prepare(query),+ batch: async (statements: any[]) => {+ await db+ .prepare('UPDATE platform_sites SET suspended=1 WHERE id=?')+ .bind(one.siteId)+ .run()+ return db.batch(statements)+ },+ }+ const racedManager = createDomainManager(+ racedDb,+ {+ enabled: true,+ routingReady: true,+ baseDomain: 'chronoframe.art',+ cnameTarget: 'cname.chronoframe.art',+ limit: 20,+ },+ {+ dns: async () => 'ready',+ id: () => crypto.randomUUID(),+ provider: {} as DomainProvider,+ },+ )+ await db+ .prepare('UPDATE platform_sites SET suspended=0 WHERE id=?')+ .bind(one.siteId)+ .run()+ await assert.rejects(+ racedManager.request(1, one.siteId, 'raced.example.com'),+ )+ assert.equal(+ await db+ .prepare(+ "SELECT hostname FROM platform_custom_domains WHERE hostname='raced.example.com'",+ )+ .first(),+ null,+ )+ await db+ .prepare('UPDATE platform_sites SET suspended=0 WHERE id=?')+ .bind(one.siteId)+ .run()+ await assert.rejects(+ renameDefaultDomain(racedDb, 1, one.siteId, {+ slug: 'raced-rename',+ revision: one.revision,+ }),+ { statusCode: 409 },+ )+ assert.equal(+ (+ await db+ .prepare('SELECT slug FROM platform_sites WHERE id=?')+ .bind(one.siteId)+ .first()+ ).slug,+ one.slug,+ )+ assert.equal(+ (+ await db+ .prepare('SELECT COUNT(*) AS n FROM platform_domain_audit')+ .first()+ ).n,+ audits,+ )const expr = workspaceUsageSQL(one.siteId),now = Date.now()// One write both checks capacity and reserves it; two simultaneous uploads cannot overspend.