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): limit redemption attempts to three per fifteen minutes

Timothy Yinac75af8575e3
diff --git a/apps/cloud/i18n/locales/en.json b/apps/cloud/i18n/locales/en.json
index 2b789afc..5d44005d 100644
--- a/apps/cloud/i18n/locales/en.json
+++ b/apps/cloud/i18n/locales/en.json
@@ -667,7 +667,7 @@
"viewPlan": "View plan and usage",
"invalidCode": "This code is invalid, unavailable, expired, exhausted or has already been redeemed.",
"permanentActive": "Your current plan already has no expiration. This code was not consumed.",
- "rateLimit": "Too many attempts. Wait a few minutes and try again.",
+ "rateLimit": "Up to 3 attempts are allowed per 15 minutes. Please try again later.",
"changed": "Your subscription changed. Check the code again before confirming.",
"adminOnly": "Only workspace administrators can redeem activation codes.",
"failed": "Could not load or save subscription information. Try again.",
diff --git a/apps/cloud/i18n/locales/zh-Hans.json b/apps/cloud/i18n/locales/zh-Hans.json
index 0868cd07..8ba85aef 100644
--- a/apps/cloud/i18n/locales/zh-Hans.json
+++ b/apps/cloud/i18n/locales/zh-Hans.json
@@ -667,7 +667,7 @@
"viewPlan": "查看套餐与用量",
"invalidCode": "激活码无效、不可用、已过期、已达兑换上限或已被你兑换。",
"permanentActive": "当前套餐已长期有效,该激活码未被消耗。",
- "rateLimit": "尝试次数过多,请稍后重试。",
+ "rateLimit": "每 15 分钟最多尝试 3 次,请稍后再试。",
"changed": "订阅状态已变化,请重新检查激活码后确认。",
"adminOnly": "仅工作空间管理员可以兑换激活码。",
"failed": "无法读取或保存订阅信息,请重试。",
diff --git a/packages/platform/src/activation.ts b/packages/platform/src/activation.ts
index 67188c8e..eec72f40 100644
--- a/packages/platform/src/activation.ts
+++ b/packages/platform/src/activation.ts
@@ -127,7 +127,7 @@ async function attempt(db: PlatformD1, userId: number, now: number) {
const window = Math.floor(now / 900000) * 900000
const row = await db
.prepare(
- 'INSERT INTO platform_activation_attempts(user_id,window_start,attempts) VALUES(?,?,1) ON CONFLICT(user_id,window_start) DO UPDATE SET attempts=attempts+1 WHERE attempts<20 RETURNING attempts',
+ 'INSERT INTO platform_activation_attempts(user_id,window_start,attempts) VALUES(?,?,1) ON CONFLICT(user_id,window_start) DO UPDATE SET attempts=attempts+1 WHERE attempts<3 RETURNING attempts',
)
.bind(userId, window)
.first()
diff --git a/tests/platform-subscriptions.test.ts b/tests/platform-subscriptions.test.ts
index 82b6e421..a00336e6 100644
--- a/tests/platform-subscriptions.test.ts
+++ b/tests/platform-subscriptions.test.ts
@@ -22,8 +22,8 @@ import {
generateActivationCodes,
activationHash,
normalizeActivationCode,
- previewActivation,
- redeemActivation,
+ previewActivation as previewWithLimit,
+ redeemActivation as redeemWithLimit,
} from '../packages/platform/src/activation.ts'
import {
pricingCatalog,
@@ -33,6 +33,22 @@ const require = createRequire(import.meta.url),
{ Miniflare, convertV4MiniflareOptions } = createRequire(
require.resolve('wrangler/package.json'),
)('miniflare')
+// Each business scenario gets an isolated rate budget; the limiter itself is
+// exercised separately below against real concurrent D1 requests.
+async function previewActivation(db: any, userId: number, ...args: any[]) {
+ await db
+ .prepare('DELETE FROM platform_activation_attempts WHERE user_id=?')
+ .bind(userId)
+ .run()
+ return (previewWithLimit as any)(db, userId, ...args)
+}
+async function redeemActivation(db: any, userId: number, ...args: any[]) {
+ await db
+ .prepare('DELETE FROM platform_activation_attempts WHERE user_id=?')
+ .bind(userId)
+ .run()
+ return (redeemWithLimit as any)(db, userId, ...args)
+}
test('Activation codes generate 12 alphanumeric characters and normalize custom and legacy identities', async () => {
const batch = await generateActivationCodes(
{ count: 500, planId: 'free', duration: { unit: 'days', value: 1 } },
@@ -630,20 +646,40 @@ test('Real D1 defaults, live expiry, activation races/idempotency and workspace
0,
)
const rateWindow = now + 9000000
- for (let i = 0; i < 20; i++)
+ for (let i = 0; i < 3; i++)
await assert.rejects(
- () => previewActivation(db, 1, one.id, 'invalid-code', rateWindow),
+ () => previewWithLimit(db, 1, one.id, 'invalid-code', rateWindow),
(error: any) => error.code === 'invalid_activation_code',
)
await assert.rejects(
- () => previewActivation(db, 1, one.id, 'invalid-code', rateWindow),
+ () => previewWithLimit(db, 1, one.id, 'invalid-code', rateWindow),
(error: any) => error.code === 'activation_rate_limit',
)
await assert.rejects(
() =>
- previewActivation(db, 1, one.id, 'invalid-code', rateWindow + 900000),
+ previewWithLimit(db, 1, one.id, 'invalid-code', rateWindow + 900000),
(error: any) => error.code === 'invalid_activation_code',
)
+ const parallel = await Promise.allSettled(
+ Array.from({ length: 6 }, () =>
+ previewWithLimit(db, 1, one.id, 'invalid-code', rateWindow + 1800000),
+ ),
+ )
+ assert.equal(
+ parallel.filter((r: any) => r.reason?.code === 'invalid_activation_code')
+ .length,
+ 3,
+ )
+ assert.equal(
+ parallel.filter((r: any) => r.reason?.code === 'activation_rate_limit')
+ .length,
+ 3,
+ )
+ assert.deepEqual(
+ await redeemWithLimit(db, 1, one.id, input, rateWindow + 1800000),
+ duplicate[0],
+ 'a successful receipt retry does not consume the exhausted budget',
+ )
} finally {
await mf.dispose()
}