Skip to content

Self-hosted personal gallery application with online photo management and albums, supporting Live/Motion Photos, EXIF parsing, geolocation recognition, and an explore map.

fix(cloud): keep activity write failures non-fatal to sessions

HoshinoSuzumic712c3ab1e1f
diff --git a/apps/cloud/server/middleware/00-account-session.ts b/apps/cloud/server/middleware/00-account-session.ts
index bc2f8a98..ea77ac18 100644
--- a/apps/cloud/server/middleware/00-account-session.ts
+++ b/apps/cloud/server/middleware/00-account-session.ts
@@ -35,7 +35,9 @@ export default defineEventHandler((event) => {
control.last_active_at === null ||
control.last_active_at <= now - ACCOUNT_ACTIVITY_INTERVAL
)
- await recordAccountActivity(db, id, now)
+ await recordAccountActivity(db, id, now).catch(() => {
+ console.error('Account activity write failed')
+ })
return {
userId: id,
expiresAt: new Date(session.session.expiresAt).getTime(),
diff --git a/packages/platform/src/account-lifecycle.ts b/packages/platform/src/account-lifecycle.ts
index 5f62cfd2..1e8f6f1e 100644
--- a/packages/platform/src/account-lifecycle.ts
+++ b/packages/platform/src/account-lifecycle.ts
@@ -65,6 +65,7 @@ export async function lifecycleSettings(db: PlatformD1) {
}
export const timeValue = (value: number | string) =>
typeof value === 'number' ? value : new Date(value).getTime()
+/** Resolve inactivity or verification deadlines, including activation and account grace periods. */
export function deletionDeadline(
user: any,
s: Awaited<ReturnType<typeof lifecycleSettings>>,
@@ -88,6 +89,7 @@ export const automaticReason = (verified: boolean, days: number) =>
: `Your email address is still unverified ${days} days after registration.`
const date = (v: number) =>
new Date(v).toISOString().replace('T', ' ').replace('.000Z', ' UTC')
+/** Freeze atomically; automatic scans must still match the observed activity and policy snapshot. */
export async function markAccount(
db: PlatformD1,
userId: number,
@@ -320,6 +322,7 @@ export async function lifecycleStages(
}
}
}
+/** Scan one account page for expiry, preserving exemptions and scheduling lifecycle warnings. */
export async function scanAccounts(
db: PlatformD1,
now = Date.now(),
diff --git a/tests/cloud-session-activity.test.ts b/tests/cloud-session-activity.test.ts
index d54f7be5..5abd2993 100644
--- a/tests/cloud-session-activity.test.ts
+++ b/tests/cloud-session-activity.test.ts
@@ -23,13 +23,15 @@ const code = transpileModule(
},
).outputText
-test('valid authenticated API requests record activity; fresh timestamps, anonymous/unverified/suspended identities do not write', async () => {
+test('session activity validates identities, throttles writes and tolerates write failures without leaking details', async (t) => {
let cookie = true
let verified = true
let suspended = 0
let lastActive: number | null = null
let writes = 0
let reads = 0
+ let failWrite = false
+ let failRead = false
const db = {
prepare() {
reads++
@@ -37,6 +39,7 @@ test('valid authenticated API requests record activity; fresh timestamps, anonym
bind() {
return {
async first() {
+ if (failRead) throw new Error('Account control lookup failed')
return { suspended, last_active_at: lastActive }
},
}
@@ -71,6 +74,8 @@ test('valid authenticated API requests record activity; fresh timestamps, anonym
}),
async (_db: unknown, id: number, now: number) => {
assert.equal(id, 1)
+ if (failWrite)
+ throw new Error('secret session details must not be logged')
writes++
lastActive = now
},
@@ -107,4 +112,26 @@ test('valid authenticated API requests record activity; fresh timestamps, anonym
cookie = false
assert.equal(await request(), null)
assert.equal(reads, before, 'anonymous requests do not access activity state')
+ cookie = true
+ verified = true
+ lastActive = null
+ failWrite = true
+ const logged: unknown[][] = []
+ t.mock.method(console, 'error', (...args: unknown[]) => logged.push(args))
+ assert.equal(
+ (await request()).userId,
+ 1,
+ 'activity write failure cannot invalidate a valid session',
+ )
+ assert.equal(writes, 2)
+ assert.equal(lastActive, null)
+ assert.deepEqual(logged, [['Account activity write failed']])
+ failWrite = false
+ failRead = true
+ await assert.rejects(request(), /Account control lookup failed/)
+ assert.equal(
+ logged.length,
+ 1,
+ 'critical account control errors are not swallowed',
+ )
})