mirror of
https://github.com/koala73/worldmonitor.git
synced 2026-04-25 17:14:57 +02:00
New leads/v1 sebuf service with two POST RPCs:
- SubmitContact → /api/leads/v1/submit-contact
- RegisterInterest → /api/leads/v1/register-interest
Handler logic ported 1:1 from api/contact.js + api/register-interest.js:
- Turnstile verification (desktop sources bypass, preserved)
- Honeypot (website field) silently accepts without upstream calls
- Free-email-domain gate on SubmitContact (422 ApiError)
- validateEmail (disposable/offensive/typo-TLD/MX) on RegisterInterest
- Convex writes via ConvexHttpClient (contactMessages:submit, registerInterest:register)
- Resend notification + confirmation emails (HTML templates unchanged)
Shared helpers moved to server/_shared/:
- turnstile.ts (getClientIp + verifyTurnstile)
- email-validation.ts (disposable/offensive/MX checks)
Rate limits preserved via ENDPOINT_RATE_POLICIES:
- submit-contact: 3/hour per IP (was in-memory 3/hr)
- register-interest: 5/hour per IP (was in-memory 5/hr; desktop
sources previously capped at 2/hr via shared in-memory map —
now 5/hr like everyone else, accepting the small regression in
exchange for Upstash-backed global limiting)
Callers updated:
- pro-test/src/App.tsx contact form → new submit-contact path
- src-tauri/sidecar/local-api-server.mjs cloud-fallback rewrites
/api/register-interest → /api/leads/v1/register-interest when
proxying; keeps local path for older desktop builds
- src/services/runtime.ts isKeyFreeApiTarget allows both old and
new paths through the WORLDMONITOR_API_KEY-optional gate
Tests:
- tests/contact-handler.test.mjs rewritten to call submitContact
handler directly; asserts on ValidationError / ApiError
- tests/email-validation.test.mjs + tests/turnstile.test.mjs
point at the new server/_shared/ modules
Deleted: api/contact.js, api/register-interest.js, api/_ip-rate-limit.js,
api/_turnstile.js, api/_email-validation.js, api/_turnstile.test.mjs.
Manifest entries removed (58 → 56). Docs updated (api-platform,
api-commerce, usage-rate-limits).
Verified: npm run typecheck + typecheck:api + lint:api-contract
(88 files / 56 entries) + lint:boundaries pass; full test:data
(5852 tests) passes; make generate is zero-diff.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
80 lines
2.2 KiB
JavaScript
80 lines
2.2 KiB
JavaScript
import assert from 'node:assert/strict';
|
|
import test from 'node:test';
|
|
import { getClientIp, verifyTurnstile } from '../server/_shared/turnstile.ts';
|
|
|
|
const originalFetch = globalThis.fetch;
|
|
const originalEnv = { ...process.env };
|
|
const originalConsoleError = console.error;
|
|
|
|
function restoreEnv() {
|
|
Object.keys(process.env).forEach((key) => {
|
|
if (!(key in originalEnv)) delete process.env[key];
|
|
});
|
|
Object.assign(process.env, originalEnv);
|
|
}
|
|
|
|
test.afterEach(() => {
|
|
globalThis.fetch = originalFetch;
|
|
console.error = originalConsoleError;
|
|
restoreEnv();
|
|
});
|
|
|
|
test('getClientIp prefers x-real-ip, then cf-connecting-ip, then x-forwarded-for', () => {
|
|
const request = new Request('https://worldmonitor.app/api/test', {
|
|
headers: {
|
|
'x-forwarded-for': '198.51.100.8, 203.0.113.10',
|
|
'cf-connecting-ip': '203.0.113.7',
|
|
'x-real-ip': '192.0.2.5',
|
|
},
|
|
});
|
|
|
|
assert.equal(getClientIp(request), '192.0.2.5');
|
|
});
|
|
|
|
test('verifyTurnstile allows missing secret when policy is allow', async () => {
|
|
delete process.env.TURNSTILE_SECRET_KEY;
|
|
process.env.VERCEL_ENV = 'production';
|
|
|
|
const ok = await verifyTurnstile({
|
|
token: 'token',
|
|
ip: '192.0.2.1',
|
|
missingSecretPolicy: 'allow',
|
|
});
|
|
|
|
assert.equal(ok, true);
|
|
});
|
|
|
|
test('verifyTurnstile rejects missing secret in production when policy is allow-in-development', async () => {
|
|
delete process.env.TURNSTILE_SECRET_KEY;
|
|
process.env.VERCEL_ENV = 'production';
|
|
console.error = () => {};
|
|
|
|
const ok = await verifyTurnstile({
|
|
token: 'token',
|
|
ip: '192.0.2.1',
|
|
logPrefix: '[test]',
|
|
missingSecretPolicy: 'allow-in-development',
|
|
});
|
|
|
|
assert.equal(ok, false);
|
|
});
|
|
|
|
test('verifyTurnstile posts to Cloudflare and returns success state', async () => {
|
|
process.env.TURNSTILE_SECRET_KEY = 'test-secret';
|
|
let requestBody;
|
|
globalThis.fetch = async (_url, options) => {
|
|
requestBody = options.body;
|
|
return new Response(JSON.stringify({ success: true }));
|
|
};
|
|
|
|
const ok = await verifyTurnstile({
|
|
token: 'valid-token',
|
|
ip: '203.0.113.15',
|
|
});
|
|
|
|
assert.equal(ok, true);
|
|
assert.equal(requestBody.get('secret'), 'test-secret');
|
|
assert.equal(requestBody.get('response'), 'valid-token');
|
|
assert.equal(requestBody.get('remoteip'), '203.0.113.15');
|
|
});
|