@prenta/core 8.15.0 → 8.16.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +27 -0
- package/dist/api/route-helpers/auth.d.ts +7 -0
- package/dist/api/route-helpers/auth.d.ts.map +1 -1
- package/dist/api/route-helpers/auth.js +13 -0
- package/dist/api/route-helpers/auth.js.map +1 -1
- package/dist/api/route-helpers/forms.d.ts.map +1 -1
- package/dist/api/route-helpers/forms.js +6 -4
- package/dist/api/route-helpers/forms.js.map +1 -1
- package/dist/api/routes/auth.d.ts.map +1 -1
- package/dist/api/routes/auth.js +20 -4
- package/dist/api/routes/auth.js.map +1 -1
- package/dist/api/routes/forms.d.ts.map +1 -1
- package/dist/api/routes/forms.js +85 -5
- package/dist/api/routes/forms.js.map +1 -1
- package/dist/api/routes/scheduling.d.ts.map +1 -1
- package/dist/api/routes/scheduling.js +4 -1
- package/dist/api/routes/scheduling.js.map +1 -1
- package/dist/api/routes/system.d.ts.map +1 -1
- package/dist/api/routes/system.js +9 -2
- package/dist/api/routes/system.js.map +1 -1
- package/dist/forms/captcha-settings.d.ts +108 -0
- package/dist/forms/captcha-settings.d.ts.map +1 -0
- package/dist/forms/captcha-settings.js +257 -0
- package/dist/forms/captcha-settings.js.map +1 -0
- package/dist/forms/client-validation.d.ts +4 -0
- package/dist/forms/client-validation.d.ts.map +1 -1
- package/dist/forms/client-validation.js +4 -0
- package/dist/forms/client-validation.js.map +1 -1
- package/dist/next.d.ts.map +1 -1
- package/dist/next.js +3 -1
- package/dist/next.js.map +1 -1
- package/dist/security/captcha.d.ts +22 -2
- package/dist/security/captcha.d.ts.map +1 -1
- package/dist/security/captcha.js +42 -11
- package/dist/security/captcha.js.map +1 -1
- package/dist/server-site.d.ts.map +1 -1
- package/dist/server-site.js +3 -5
- package/dist/server-site.js.map +1 -1
- package/package.json +1 -1
package/dist/security/captcha.js
CHANGED
|
@@ -42,14 +42,26 @@ function parseTimeoutMs(raw, fallback) {
|
|
|
42
42
|
return fallback;
|
|
43
43
|
return Math.min(30_000, Math.max(1_000, Math.floor(n)));
|
|
44
44
|
}
|
|
45
|
+
const DEFAULT_RECAPTCHA_SCORE_THRESHOLD = 0.5;
|
|
46
|
+
/** A reCAPTCHA v3 score threshold in 0–1; anything else falls back to 0.5. */
|
|
47
|
+
export function normalizeScoreThreshold(raw) {
|
|
48
|
+
const n = typeof raw === 'number' ? raw : Number(raw);
|
|
49
|
+
if (raw === undefined || raw === null || raw === '' || !Number.isFinite(n)) {
|
|
50
|
+
return DEFAULT_RECAPTCHA_SCORE_THRESHOLD;
|
|
51
|
+
}
|
|
52
|
+
return Math.min(1, Math.max(0, n));
|
|
53
|
+
}
|
|
45
54
|
/**
|
|
46
55
|
* Verifies a CAPTCHA token server-side.
|
|
47
56
|
* Works for both reCAPTCHA v3 and Cloudflare Turnstile.
|
|
48
57
|
*/
|
|
49
|
-
export async function verifyCaptcha(token, config, remoteIp) {
|
|
58
|
+
export async function verifyCaptcha(token, config, remoteIp, options = {}) {
|
|
50
59
|
if (config.provider === 'none') {
|
|
51
60
|
return { success: true };
|
|
52
61
|
}
|
|
62
|
+
if (config.unavailable) {
|
|
63
|
+
return { success: false, errorCodes: ['secret-unavailable'], providerError: true };
|
|
64
|
+
}
|
|
53
65
|
if (!token) {
|
|
54
66
|
return { success: false, errorCodes: ['missing-input-response'] };
|
|
55
67
|
}
|
|
@@ -89,9 +101,20 @@ export async function verifyCaptcha(token, config, remoteIp) {
|
|
|
89
101
|
errorCodes: data['error-codes'] ?? [],
|
|
90
102
|
};
|
|
91
103
|
}
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
104
|
+
if (config.provider === 'recaptcha') {
|
|
105
|
+
// A v2 key verifies without a score, which would skip the threshold.
|
|
106
|
+
if (typeof data.score !== 'number') {
|
|
107
|
+
return { success: false, action: data.action, errorCodes: ['missing-score'] };
|
|
108
|
+
}
|
|
109
|
+
if (options.expectedAction && data.action !== options.expectedAction) {
|
|
110
|
+
return {
|
|
111
|
+
success: false,
|
|
112
|
+
score: data.score,
|
|
113
|
+
action: data.action,
|
|
114
|
+
errorCodes: ['action-mismatch'],
|
|
115
|
+
};
|
|
116
|
+
}
|
|
117
|
+
const threshold = normalizeScoreThreshold(config.scoreThreshold);
|
|
95
118
|
if (data.score < threshold) {
|
|
96
119
|
return {
|
|
97
120
|
success: false,
|
|
@@ -132,19 +155,28 @@ export function isCaptchaProviderError(result) {
|
|
|
132
155
|
* Resolves CAPTCHA config from environment variables + optional `forms.captcha`
|
|
133
156
|
* overrides in CMS config. Returns `{ provider: 'none' }` if no keys are set.
|
|
134
157
|
*/
|
|
135
|
-
|
|
158
|
+
/**
|
|
159
|
+
* Enforcement, outage policy and timeout from `CAPTCHA_*` env vars, falling
|
|
160
|
+
* back to `forms.captcha` in CMS config. Shared by every key source.
|
|
161
|
+
*/
|
|
162
|
+
export function getCaptchaPolicy() {
|
|
136
163
|
const formsCaptcha = getPrentaConfig()?.forms?.captcha;
|
|
137
|
-
|
|
138
|
-
|
|
164
|
+
return {
|
|
165
|
+
enforce: parseBool(process.env.CAPTCHA_ENFORCE, formsCaptcha?.enforce ?? true),
|
|
166
|
+
onProviderError: parseProviderErrorPolicy(process.env.CAPTCHA_ON_PROVIDER_ERROR, formsCaptcha?.onProviderError ?? 'fail-closed'),
|
|
167
|
+
timeoutMs: parseTimeoutMs(process.env.CAPTCHA_TIMEOUT_MS, formsCaptcha?.timeoutMs ?? DEFAULT_TIMEOUT_MS),
|
|
168
|
+
};
|
|
169
|
+
}
|
|
170
|
+
export function getCaptchaConfig() {
|
|
171
|
+
const { enforce, onProviderError, timeoutMs } = getCaptchaPolicy();
|
|
139
172
|
const recaptchaSiteKey = process.env.RECAPTCHA_SITE_KEY;
|
|
140
173
|
const recaptchaSecret = process.env.RECAPTCHA_SECRET_KEY;
|
|
141
174
|
if (recaptchaSiteKey && recaptchaSecret) {
|
|
142
|
-
const enforce = parseBool(process.env.CAPTCHA_ENFORCE, formsCaptcha?.enforce ?? true);
|
|
143
175
|
return {
|
|
144
176
|
provider: 'recaptcha',
|
|
145
177
|
siteKey: recaptchaSiteKey,
|
|
146
178
|
secretKey: recaptchaSecret,
|
|
147
|
-
scoreThreshold:
|
|
179
|
+
scoreThreshold: normalizeScoreThreshold(process.env.RECAPTCHA_SCORE_THRESHOLD),
|
|
148
180
|
enforce,
|
|
149
181
|
onProviderError,
|
|
150
182
|
timeoutMs,
|
|
@@ -153,7 +185,6 @@ export function getCaptchaConfig() {
|
|
|
153
185
|
const turnstileSiteKey = process.env.TURNSTILE_SITE_KEY;
|
|
154
186
|
const turnstileSecret = process.env.TURNSTILE_SECRET_KEY;
|
|
155
187
|
if (turnstileSiteKey && turnstileSecret) {
|
|
156
|
-
const enforce = parseBool(process.env.CAPTCHA_ENFORCE, formsCaptcha?.enforce ?? true);
|
|
157
188
|
return {
|
|
158
189
|
provider: 'turnstile',
|
|
159
190
|
siteKey: turnstileSiteKey,
|
|
@@ -180,7 +211,7 @@ export function getPublicCaptchaConfig(config = getCaptchaConfig()) {
|
|
|
180
211
|
enforce: config.enforce && config.provider !== 'none',
|
|
181
212
|
onProviderError: config.onProviderError,
|
|
182
213
|
timeoutMs: config.timeoutMs,
|
|
183
|
-
scoreThreshold: config.provider === 'recaptcha' ? (config.scoreThreshold
|
|
214
|
+
scoreThreshold: config.provider === 'recaptcha' ? normalizeScoreThreshold(config.scoreThreshold) : null,
|
|
184
215
|
};
|
|
185
216
|
}
|
|
186
217
|
//# sourceMappingURL=captcha.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"captcha.js","sourceRoot":"","sources":["../../src/security/captcha.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;
|
|
1
|
+
{"version":3,"file":"captcha.js","sourceRoot":"","sources":["../../src/security/captcha.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server-site.d.ts","sourceRoot":"","sources":["../src/server-site.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,UAAU,EAEV,aAAa,EACb,UAAU,EAGX,MAAM,WAAW,CAAA;AAElB,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAUpD;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,MAAM,WAAW,aAAa;IAC5B,gGAAgG;IAChG,OAAO,CAAC,EAAE,MAAM,CACd,MAAM,EACN;QAAE,MAAM,CAAC,EAAE;YAAE,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE;gBAAE,IAAI,EAAE,IAAI,CAAC;gBAAC,GAAG,EAAE,GAAG,CAAA;aAAE,KAAK,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;SAAE,CAAA;KAAE,CACtF,CAAA;IACD,kFAAkF;IAClF,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;CACnF;AAED,MAAM,WAAW,gBAAiB,SAAQ,UAAU;IAClD,sGAAsG;IACtG,YAAY,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAAA;CAC/D;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,GAAE,aAAkB,GAAG,gBAAgB,
|
|
1
|
+
{"version":3,"file":"server-site.d.ts","sourceRoot":"","sources":["../src/server-site.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,UAAU,EAEV,aAAa,EACb,UAAU,EAGX,MAAM,WAAW,CAAA;AAElB,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAUpD;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,MAAM,WAAW,aAAa;IAC5B,gGAAgG;IAChG,OAAO,CAAC,EAAE,MAAM,CACd,MAAM,EACN;QAAE,MAAM,CAAC,EAAE;YAAE,IAAI,CAAC,EAAE,CAAC,GAAG,EAAE;gBAAE,IAAI,EAAE,IAAI,CAAC;gBAAC,GAAG,EAAE,GAAG,CAAA;aAAE,KAAK,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAA;SAAE,CAAA;KAAE,CACtF,CAAA;IACD,kFAAkF;IAClF,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;CACnF;AAED,MAAM,WAAW,gBAAiB,SAAQ,UAAU;IAClD,sGAAsG;IACtG,YAAY,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAAA;CAC/D;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,GAAE,aAAkB,GAAG,gBAAgB,CAgMjG"}
|
package/dist/server-site.js
CHANGED
|
@@ -4,7 +4,7 @@ import { loadPublicChrome, normalizeChromePath } from './chrome/public.js';
|
|
|
4
4
|
import { getFormBySlug } from './forms/service.js';
|
|
5
5
|
import { buildPublicForm, resolveSubmissionFields } from './forms/submission.js';
|
|
6
6
|
import { readStoredFormsSettings } from './forms/site-settings.js';
|
|
7
|
-
import {
|
|
7
|
+
import { resolveCaptchaForForm } from './forms/captcha-settings.js';
|
|
8
8
|
/**
|
|
9
9
|
* Build the server-side Site client. The supplied `db` only needs a tiny
|
|
10
10
|
* subset of the Prisma surface (`document`, `media`) — that lets us accept
|
|
@@ -146,12 +146,10 @@ export function createServerSiteClient(db, config = {}) {
|
|
|
146
146
|
if (!form || form.status !== 'active')
|
|
147
147
|
return null;
|
|
148
148
|
const { fields, versionId } = await resolveSubmissionFields(form);
|
|
149
|
-
const captcha =
|
|
149
|
+
const captcha = await resolveCaptchaForForm(db, form.spamSettings);
|
|
150
150
|
const stored = await readStoredFormsSettings(db);
|
|
151
151
|
return buildPublicForm(form, fields, versionId, {
|
|
152
|
-
captcha: captcha.provider
|
|
153
|
-
? { provider: captcha.provider, siteKey: captcha.siteKey }
|
|
154
|
-
: undefined,
|
|
152
|
+
captcha: captcha ? { provider: captcha.provider, siteKey: captcha.siteKey } : undefined,
|
|
155
153
|
attribution: stored?.attribution,
|
|
156
154
|
});
|
|
157
155
|
},
|
package/dist/server-site.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server-site.js","sourceRoot":"","sources":["../src/server-site.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAG9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAC5D,OAAO,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAA;AAE1E,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAClD,OAAO,EAAE,eAAe,EAAE,uBAAuB,EAAmB,MAAM,uBAAuB,CAAA;AACjG,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAA;AAClE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"server-site.js","sourceRoot":"","sources":["../src/server-site.ts"],"names":[],"mappings":"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"}
|