Skip to content

📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!

fix captcha replay attribution poisoning

Blue Mouse8bdac6380f5e
diff --git a/backend/apps/cloud/src/captcha/captcha.controller.ts b/backend/apps/cloud/src/captcha/captcha.controller.ts
index d497aa413..0cd3fe2f1 100644
--- a/backend/apps/cloud/src/captcha/captcha.controller.ts
+++ b/backend/apps/cloud/src/captcha/captcha.controller.ts
@@ -142,7 +142,13 @@ export class CaptchaController {
}
try {
- await this.captchaService.logCaptchaReplay(pid, headers, timestamp, ip)
+ await this.captchaService.logCaptchaReplayForChallenge(
+ challenge,
+ pid,
+ headers,
+ timestamp,
+ ip,
+ )
} catch (logReason) {
this.logger.error(
`[CaptchaController -> verify] Failed to log captcha replay: ${logReason}`,
diff --git a/backend/apps/cloud/src/captcha/captcha.service.ts b/backend/apps/cloud/src/captcha/captcha.service.ts
index a726f5eb9..2ceed7713 100644
--- a/backend/apps/cloud/src/captcha/captcha.service.ts
+++ b/backend/apps/cloud/src/captcha/captcha.service.ts
@@ -100,6 +100,26 @@ const getChallengeCacheKey = (challenge: string): string => {
return `pow_challenge:${challenge}`
}
+const getSpentChallengeCacheKey = (challenge: string): string => {
+ return `pow_challenge_spent:${challenge}`
+}
+
+const parseChallengePayload = (storedData: string): ChallengePayload => {
+ let parsed
+
+ try {
+ parsed = JSON.parse(storedData)
+ } catch {
+ return { difficulty: parseInt(storedData, 10) }
+ }
+
+ if (typeof parsed === 'object' && parsed !== null && 'difficulty' in parsed) {
+ return parsed
+ }
+
+ return { difficulty: parseInt(storedData, 10) }
+}
+
const clampDifficulty = (difficulty?: number | null): number => {
if (!Number.isFinite(difficulty)) {
return DEFAULT_POW_DIFFICULTY
@@ -171,22 +191,26 @@ const getCounter = async (key: string): Promise<number> => {
return Number.isFinite(parsed) ? parsed : 0
}
-const consumeChallenge = async (cacheKey: string): Promise<string | null> => {
- const getdel = (redis as any).getdel
-
- if (typeof getdel === 'function') {
- return getdel.call(redis, cacheKey)
- }
-
+const consumeChallenge = async (challenge: string): Promise<string | null> => {
const result = await redis.eval(
- "local value = redis.call('GET', KEYS[1]); if value then redis.call('DEL', KEYS[1]); end; return value",
- 1,
- cacheKey,
+ "local value = redis.call('GET', KEYS[1]); if value then redis.call('DEL', KEYS[1]); redis.call('SET', KEYS[2], value, 'EX', ARGV[1]); end; return value",
+ 2,
+ getChallengeCacheKey(challenge),
+ getSpentChallengeCacheKey(challenge),
+ CHALLENGE_TTL,
)
return typeof result === 'string' ? result : null
}
+const getSpentChallengePayload = async (
+ challenge: string,
+): Promise<ChallengePayload | null> => {
+ const storedData = await redis.get(getSpentChallengeCacheKey(challenge))
+
+ return storedData ? parseChallengePayload(storedData) : null
+}
+
const signCaptchaCiphertext = (ciphertext: string, key: string): string => {
// NOTE: Encryption alone (CryptoJS.Rabbit) is malleable; we add an HMAC to
// prevent token tampering and replay-bypass via ciphertext bitflips.
@@ -376,13 +400,42 @@ export class CaptchaService {
timestamp: number,
ip: string,
failureReason = 'expired_or_replayed',
+ verification?: Partial<PowVerificationResult>,
) {
await this.recordCaptchaOutcome(pid, 'replay', ip)
await this.logCaptchaEvent(pid, 'replay', headers, timestamp, ip, {
+ difficulty: verification?.difficulty,
+ difficultyMode: verification?.difficultyMode,
+ autoReasons: verification?.autoReasons,
failureReason,
})
}
+ async logCaptchaReplayForChallenge(
+ challenge: string,
+ requestPid: string,
+ headers: CaptchaHeaders,
+ timestamp: number,
+ ip: string,
+ ) {
+ const payload = await getSpentChallengePayload(challenge)
+
+ if (!payload?.pid || payload.pid !== requestPid) {
+ return false
+ }
+
+ await this.logCaptchaReplay(
+ payload.pid,
+ headers,
+ timestamp,
+ ip,
+ 'replayed_challenge',
+ payload,
+ )
+
+ return true
+ }
+
private async recordCaptchaOutcome(
pid: string,
event: CaptchaEventName,
@@ -448,6 +501,19 @@ export class CaptchaService {
return `${ciphertext}.${signature}`
}
+ private async isProjectCaptchaSecret(pid: string, secretKey: string) {
+ try {
+ const project = await this.projectService.getRedisProject(pid)
+ const captchaSecretKey = project?.captchaSecretKey
+
+ return Boolean(
+ captchaSecretKey && timingSafeEqualString(secretKey, captchaSecretKey),
+ )
+ } catch {
+ return false
+ }
+ }
+
async validateToken(
token: string,
secretKey: string,
@@ -496,25 +562,31 @@ export class CaptchaService {
if (
!parsed ||
typeof parsed !== 'object' ||
- typeof parsed.pid !== 'string' ||
- typeof parsed.challenge !== 'string' ||
- typeof parsed.timestamp !== 'number' ||
- !Number.isFinite(parsed.timestamp)
+ typeof parsed.pid !== 'string'
) {
- if (typeof parsed?.pid === 'string') {
- await this.logValidationFailure(
- parsed.pid,
- headers,
- ip,
- 'invalid_payload',
- )
- }
+ throw new BadRequestException('Invalid token payload')
+ }
+ if (isDummyPID(parsed.pid) || !isValidPID(parsed.pid)) {
throw new BadRequestException('Invalid token payload')
}
- if (!isDummyPID(parsed.pid) && !isValidPID(parsed.pid)) {
- await this.logValidationFailure(parsed.pid, headers, ip, 'invalid_pid')
+ if (!(await this.isProjectCaptchaSecret(parsed.pid, secretKey))) {
+ throw new BadRequestException('Could not decrypt token')
+ }
+
+ if (
+ typeof parsed.challenge !== 'string' ||
+ typeof parsed.timestamp !== 'number' ||
+ !Number.isFinite(parsed.timestamp)
+ ) {
+ await this.logValidationFailure(
+ parsed.pid,
+ headers,
+ ip,
+ 'invalid_payload',
+ )
+
throw new BadRequestException('Invalid token payload')
}
@@ -698,30 +770,13 @@ export class CaptchaService {
solution: string,
pid: string,
): Promise<PowVerificationResult> {
- const cacheKey = getChallengeCacheKey(challenge)
- const storedData = await consumeChallenge(cacheKey)
+ const storedData = await consumeChallenge(challenge)
if (!storedData) {
throw new BadRequestException('Invalid or expired challenge')
}
- let payload: ChallengePayload
-
- try {
- const parsed = JSON.parse(storedData)
- if (
- typeof parsed === 'object' &&
- parsed !== null &&
- 'difficulty' in parsed
- ) {
- payload = parsed
- } else {
- payload = { difficulty: parseInt(storedData, 10) }
- }
- } catch {
- payload = { difficulty: parseInt(storedData, 10) }
- }
-
+ const payload = parseChallengePayload(storedData)
const difficulty = Number(payload.difficulty)
if (
diff --git a/backend/apps/community/src/captcha/captcha.controller.ts b/backend/apps/community/src/captcha/captcha.controller.ts
index d497aa413..0cd3fe2f1 100644
--- a/backend/apps/community/src/captcha/captcha.controller.ts
+++ b/backend/apps/community/src/captcha/captcha.controller.ts
@@ -142,7 +142,13 @@ export class CaptchaController {
}
try {
- await this.captchaService.logCaptchaReplay(pid, headers, timestamp, ip)
+ await this.captchaService.logCaptchaReplayForChallenge(
+ challenge,
+ pid,
+ headers,
+ timestamp,
+ ip,
+ )
} catch (logReason) {
this.logger.error(
`[CaptchaController -> verify] Failed to log captcha replay: ${logReason}`,
diff --git a/backend/apps/community/src/captcha/captcha.service.ts b/backend/apps/community/src/captcha/captcha.service.ts
index a726f5eb9..2ceed7713 100644
--- a/backend/apps/community/src/captcha/captcha.service.ts
+++ b/backend/apps/community/src/captcha/captcha.service.ts
@@ -100,6 +100,26 @@ const getChallengeCacheKey = (challenge: string): string => {
return `pow_challenge:${challenge}`
}
+const getSpentChallengeCacheKey = (challenge: string): string => {
+ return `pow_challenge_spent:${challenge}`
+}
+
+const parseChallengePayload = (storedData: string): ChallengePayload => {
+ let parsed
+
+ try {
+ parsed = JSON.parse(storedData)
+ } catch {
+ return { difficulty: parseInt(storedData, 10) }
+ }
+
+ if (typeof parsed === 'object' && parsed !== null && 'difficulty' in parsed) {
+ return parsed
+ }
+
+ return { difficulty: parseInt(storedData, 10) }
+}
+
const clampDifficulty = (difficulty?: number | null): number => {
if (!Number.isFinite(difficulty)) {
return DEFAULT_POW_DIFFICULTY
@@ -171,22 +191,26 @@ const getCounter = async (key: string): Promise<number> => {
return Number.isFinite(parsed) ? parsed : 0
}
-const consumeChallenge = async (cacheKey: string): Promise<string | null> => {
- const getdel = (redis as any).getdel
-
- if (typeof getdel === 'function') {
- return getdel.call(redis, cacheKey)
- }
-
+const consumeChallenge = async (challenge: string): Promise<string | null> => {
const result = await redis.eval(
- "local value = redis.call('GET', KEYS[1]); if value then redis.call('DEL', KEYS[1]); end; return value",
- 1,
- cacheKey,
+ "local value = redis.call('GET', KEYS[1]); if value then redis.call('DEL', KEYS[1]); redis.call('SET', KEYS[2], value, 'EX', ARGV[1]); end; return value",
+ 2,
+ getChallengeCacheKey(challenge),
+ getSpentChallengeCacheKey(challenge),
+ CHALLENGE_TTL,
)
return typeof result === 'string' ? result : null
}
+const getSpentChallengePayload = async (
+ challenge: string,
+): Promise<ChallengePayload | null> => {
+ const storedData = await redis.get(getSpentChallengeCacheKey(challenge))
+
+ return storedData ? parseChallengePayload(storedData) : null
+}
+
const signCaptchaCiphertext = (ciphertext: string, key: string): string => {
// NOTE: Encryption alone (CryptoJS.Rabbit) is malleable; we add an HMAC to
// prevent token tampering and replay-bypass via ciphertext bitflips.
@@ -376,13 +400,42 @@ export class CaptchaService {
timestamp: number,
ip: string,
failureReason = 'expired_or_replayed',
+ verification?: Partial<PowVerificationResult>,
) {
await this.recordCaptchaOutcome(pid, 'replay', ip)
await this.logCaptchaEvent(pid, 'replay', headers, timestamp, ip, {
+ difficulty: verification?.difficulty,
+ difficultyMode: verification?.difficultyMode,
+ autoReasons: verification?.autoReasons,
failureReason,
})
}
+ async logCaptchaReplayForChallenge(
+ challenge: string,
+ requestPid: string,
+ headers: CaptchaHeaders,
+ timestamp: number,
+ ip: string,
+ ) {
+ const payload = await getSpentChallengePayload(challenge)
+
+ if (!payload?.pid || payload.pid !== requestPid) {
+ return false
+ }
+
+ await this.logCaptchaReplay(
+ payload.pid,
+ headers,
+ timestamp,
+ ip,
+ 'replayed_challenge',
+ payload,
+ )
+
+ return true
+ }
+
private async recordCaptchaOutcome(
pid: string,
event: CaptchaEventName,
@@ -448,6 +501,19 @@ export class CaptchaService {
return `${ciphertext}.${signature}`
}
+ private async isProjectCaptchaSecret(pid: string, secretKey: string) {
+ try {
+ const project = await this.projectService.getRedisProject(pid)
+ const captchaSecretKey = project?.captchaSecretKey
+
+ return Boolean(
+ captchaSecretKey && timingSafeEqualString(secretKey, captchaSecretKey),
+ )
+ } catch {
+ return false
+ }
+ }
+
async validateToken(
token: string,
secretKey: string,
@@ -496,25 +562,31 @@ export class CaptchaService {
if (
!parsed ||
typeof parsed !== 'object' ||
- typeof parsed.pid !== 'string' ||
- typeof parsed.challenge !== 'string' ||
- typeof parsed.timestamp !== 'number' ||
- !Number.isFinite(parsed.timestamp)
+ typeof parsed.pid !== 'string'
) {
- if (typeof parsed?.pid === 'string') {
- await this.logValidationFailure(
- parsed.pid,
- headers,
- ip,
- 'invalid_payload',
- )
- }
+ throw new BadRequestException('Invalid token payload')
+ }
+ if (isDummyPID(parsed.pid) || !isValidPID(parsed.pid)) {
throw new BadRequestException('Invalid token payload')
}
- if (!isDummyPID(parsed.pid) && !isValidPID(parsed.pid)) {
- await this.logValidationFailure(parsed.pid, headers, ip, 'invalid_pid')
+ if (!(await this.isProjectCaptchaSecret(parsed.pid, secretKey))) {
+ throw new BadRequestException('Could not decrypt token')
+ }
+
+ if (
+ typeof parsed.challenge !== 'string' ||
+ typeof parsed.timestamp !== 'number' ||
+ !Number.isFinite(parsed.timestamp)
+ ) {
+ await this.logValidationFailure(
+ parsed.pid,
+ headers,
+ ip,
+ 'invalid_payload',
+ )
+
throw new BadRequestException('Invalid token payload')
}
@@ -698,30 +770,13 @@ export class CaptchaService {
solution: string,
pid: string,
): Promise<PowVerificationResult> {
- const cacheKey = getChallengeCacheKey(challenge)
- const storedData = await consumeChallenge(cacheKey)
+ const storedData = await consumeChallenge(challenge)
if (!storedData) {
throw new BadRequestException('Invalid or expired challenge')
}
- let payload: ChallengePayload
-
- try {
- const parsed = JSON.parse(storedData)
- if (
- typeof parsed === 'object' &&
- parsed !== null &&
- 'difficulty' in parsed
- ) {
- payload = parsed
- } else {
- payload = { difficulty: parseInt(storedData, 10) }
- }
- } catch {
- payload = { difficulty: parseInt(storedData, 10) }
- }
-
+ const payload = parseChallengePayload(storedData)
const difficulty = Number(payload.difficulty)
if (