@velocity-astro/cms-astro 0.1.0-beta.1 → 0.1.0-beta.11
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/dist/admin-files.d.ts +2 -2
- package/dist/admin-files.d.ts.map +1 -1
- package/dist/admin-files.js +13 -7
- package/dist/admin-files.js.map +1 -1
- package/dist/challenge.d.ts +35 -0
- package/dist/challenge.d.ts.map +1 -0
- package/dist/challenge.js +84 -0
- package/dist/challenge.js.map +1 -0
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +4 -3
- package/dist/cli.js.map +1 -1
- package/dist/connection.d.ts +1 -0
- package/dist/connection.d.ts.map +1 -1
- package/dist/connection.js +31 -6
- package/dist/connection.js.map +1 -1
- package/dist/editor.d.ts +2 -0
- package/dist/editor.d.ts.map +1 -1
- package/dist/editor.js +9 -1
- package/dist/editor.js.map +1 -1
- package/dist/form-post.d.ts +9 -1
- package/dist/form-post.d.ts.map +1 -1
- package/dist/form-post.js +10 -3
- package/dist/form-post.js.map +1 -1
- package/dist/hosted.d.ts +76 -0
- package/dist/hosted.d.ts.map +1 -0
- package/dist/hosted.js +104 -0
- package/dist/hosted.js.map +1 -0
- package/dist/image-optimizer.d.ts +35 -0
- package/dist/image-optimizer.d.ts.map +1 -0
- package/dist/image-optimizer.js +76 -0
- package/dist/image-optimizer.js.map +1 -0
- package/dist/index.d.ts +12 -3
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +12 -3
- package/dist/index.js.map +1 -1
- package/dist/init.d.ts +2 -0
- package/dist/init.d.ts.map +1 -1
- package/dist/init.js +16 -1
- package/dist/init.js.map +1 -1
- package/dist/integration.d.ts +9 -0
- package/dist/integration.d.ts.map +1 -1
- package/dist/integration.js +15 -1
- package/dist/integration.js.map +1 -1
- package/dist/link.d.ts.map +1 -1
- package/dist/link.js +6 -2
- package/dist/link.js.map +1 -1
- package/dist/live-loader.d.ts +7 -3
- package/dist/live-loader.d.ts.map +1 -1
- package/dist/live-loader.js +12 -6
- package/dist/live-loader.js.map +1 -1
- package/dist/media-store.d.ts +15 -0
- package/dist/media-store.d.ts.map +1 -1
- package/dist/media-store.js +26 -2
- package/dist/media-store.js.map +1 -1
- package/dist/page-marks.d.ts +50 -0
- package/dist/page-marks.d.ts.map +1 -0
- package/dist/page-marks.js +90 -0
- package/dist/page-marks.js.map +1 -0
- package/dist/preview.d.ts +34 -2
- package/dist/preview.d.ts.map +1 -1
- package/dist/preview.js +81 -15
- package/dist/preview.js.map +1 -1
- package/dist/resend-mailer.d.ts +18 -1
- package/dist/resend-mailer.d.ts.map +1 -1
- package/dist/resend-mailer.js +24 -3
- package/dist/resend-mailer.js.map +1 -1
- package/dist/secret.d.ts +1 -1
- package/dist/secret.d.ts.map +1 -1
- package/dist/secret.js +3 -2
- package/dist/secret.js.map +1 -1
- package/dist/single.d.ts +18 -0
- package/dist/single.d.ts.map +1 -0
- package/dist/single.js +37 -0
- package/dist/single.js.map +1 -0
- package/dist/site-editor.d.ts +1 -1
- package/dist/site-editor.d.ts.map +1 -1
- package/dist/site-editor.js +36 -6
- package/dist/site-editor.js.map +1 -1
- package/dist/site-forms.d.ts +11 -0
- package/dist/site-forms.d.ts.map +1 -1
- package/dist/site-forms.js +37 -19
- package/dist/site-forms.js.map +1 -1
- package/dist/site-mail.d.ts +45 -0
- package/dist/site-mail.d.ts.map +1 -0
- package/dist/site-mail.js +84 -0
- package/dist/site-mail.js.map +1 -0
- package/dist/site-media.d.ts +5 -1
- package/dist/site-media.d.ts.map +1 -1
- package/dist/site-media.js +14 -5
- package/dist/site-media.js.map +1 -1
- package/dist/site-name.d.ts +9 -0
- package/dist/site-name.d.ts.map +1 -0
- package/dist/site-name.js +21 -0
- package/dist/site-name.js.map +1 -0
- package/dist/site-storage.d.ts +34 -0
- package/dist/site-storage.d.ts.map +1 -0
- package/dist/site-storage.js +118 -0
- package/dist/site-storage.js.map +1 -0
- package/package.json +11 -8
- package/routes/editor.ts +7 -6
- package/routes/form-client.js.ts +68 -0
- package/routes/media.ts +2 -2
- package/routes/preview-client.js.ts +11 -56
- package/routes/published.ts +2 -2
- package/routes/sitemap-live.xml.ts +4 -1
- package/routes/sites.ts +11 -0
package/dist/admin-files.d.ts
CHANGED
|
@@ -15,7 +15,7 @@ export declare const builtEditorDirectory: () => string;
|
|
|
15
15
|
export declare class AdminFiles {
|
|
16
16
|
#private;
|
|
17
17
|
constructor(directory: string, config: EditorPageConfig);
|
|
18
|
-
/** Answers a request for anything under the editor's address. */
|
|
19
|
-
respond(request: Request): Response;
|
|
18
|
+
/** Answers a request for anything under the editor's address. `siteName` is what an owner called the site, when they did. */
|
|
19
|
+
respond(request: Request, siteName?: string | null): Response;
|
|
20
20
|
}
|
|
21
21
|
//# sourceMappingURL=admin-files.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"admin-files.d.ts","sourceRoot":"","sources":["../src/admin-files.ts"],"names":[],"mappings":"AAIA,2EAA2E;AAC3E,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;CAC3B;AAkCD,mEAAmE;AACnE,eAAO,MAAM,oBAAoB,QAAO,MAAsB,CAAC;AAE/D;;;;GAIG;AACH,qBAAa,UAAU;;
|
|
1
|
+
{"version":3,"file":"admin-files.d.ts","sourceRoot":"","sources":["../src/admin-files.ts"],"names":[],"mappings":"AAIA,2EAA2E;AAC3E,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;CAC3B;AAkCD,mEAAmE;AACnE,eAAO,MAAM,oBAAoB,QAAO,MAAsB,CAAC;AAE/D;;;;GAIG;AACH,qBAAa,UAAU;;gBAMT,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB;IAwBvD,6HAA6H;IAC7H,OAAO,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,QAAQ;CAkB9D"}
|
package/dist/admin-files.js
CHANGED
|
@@ -33,7 +33,8 @@ export const builtEditorDirectory = () => appDirectory;
|
|
|
33
33
|
*/
|
|
34
34
|
export class AdminFiles {
|
|
35
35
|
#files = new Map();
|
|
36
|
-
#
|
|
36
|
+
#template;
|
|
37
|
+
#config;
|
|
37
38
|
#adminPath;
|
|
38
39
|
constructor(directory, config) {
|
|
39
40
|
const index = path.join(directory, 'index.html');
|
|
@@ -47,14 +48,19 @@ export class AdminFiles {
|
|
|
47
48
|
this.#files.set(name.replaceAll('\\', '/'), { body: fs.readFileSync(file), type });
|
|
48
49
|
}
|
|
49
50
|
this.#adminPath = config.adminPath;
|
|
51
|
+
this.#config = config;
|
|
52
|
+
this.#template = fs.readFileSync(index, 'utf8');
|
|
53
|
+
}
|
|
54
|
+
/** The editor's page with its settings written in, the site called `siteName` when one is given. */
|
|
55
|
+
#pageFor(siteName) {
|
|
56
|
+
const config = siteName ? { ...this.#config, siteName } : this.#config;
|
|
50
57
|
// `<` is escaped so nothing in a site's name can end the block and start a script.
|
|
51
58
|
const settings = JSON.stringify(config).replaceAll('<', '\\u003c');
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
.replace(MARKER, `<base href="${config.adminPath}/" />\n <script type="application/json" id="velocity-cms-config">${settings}</script>`);
|
|
59
|
+
// A function, so nothing in the name is read as a pattern of the replacement.
|
|
60
|
+
return this.#template.replace(MARKER, () => `<base href="${config.adminPath}/" />\n <script type="application/json" id="velocity-cms-config">${settings}</script>`);
|
|
55
61
|
}
|
|
56
|
-
/** Answers a request for anything under the editor's address. */
|
|
57
|
-
respond(request) {
|
|
62
|
+
/** Answers a request for anything under the editor's address. `siteName` is what an owner called the site, when they did. */
|
|
63
|
+
respond(request, siteName) {
|
|
58
64
|
if (request.method !== 'GET' && request.method !== 'HEAD') {
|
|
59
65
|
return new Response(null, { status: 405, headers: { allow: 'GET, HEAD' } });
|
|
60
66
|
}
|
|
@@ -71,7 +77,7 @@ export class AdminFiles {
|
|
|
71
77
|
if (inside.startsWith('assets/'))
|
|
72
78
|
return new Response(null, { status: 404 });
|
|
73
79
|
// Every other address is a screen of the editor, which works out which one in the browser.
|
|
74
|
-
return new Response(this.#
|
|
80
|
+
return new Response(this.#pageFor(siteName), { headers: PAGE_HEADERS });
|
|
75
81
|
}
|
|
76
82
|
}
|
|
77
83
|
//# sourceMappingURL=admin-files.js.map
|
package/dist/admin-files.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"admin-files.js","sourceRoot":"","sources":["../src/admin-files.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAevE,MAAM,KAAK,GAAqC;IAC9C,KAAK,EAAE,gCAAgC;IACvC,MAAM,EAAE,yBAAyB;IACjC,MAAM,EAAE,eAAe;IACvB,MAAM,EAAE,WAAW;IACnB,QAAQ,EAAE,YAAY;IACtB,OAAO,EAAE,iCAAiC;CAC3C,CAAC;AAEF,gEAAgE;AAChE,MAAM,MAAM,GAAG,qBAAqB,CAAC;AAErC;;;;GAIG;AACH,MAAM,YAAY,GAAG;IACnB,cAAc,EAAE,0BAA0B;IAC1C,eAAe,EAAE,UAAU;IAC3B,yBAAyB,EACvB,yLAAyL;IAC3L,iBAAiB,EAAE,MAAM;IACzB,wBAAwB,EAAE,SAAS;IACnC,iBAAiB,EAAE,aAAa;CACjC,CAAC;AAEF,mEAAmE;AACnE,MAAM,CAAC,MAAM,oBAAoB,GAAG,GAAW,EAAE,CAAC,YAAY,CAAC;AAE/D;;;;GAIG;AACH,MAAM,OAAO,UAAU;IACZ,MAAM,GAAG,IAAI,GAAG,EAAsB,CAAC;IACvC,
|
|
1
|
+
{"version":3,"file":"admin-files.js","sourceRoot":"","sources":["../src/admin-files.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AAevE,MAAM,KAAK,GAAqC;IAC9C,KAAK,EAAE,gCAAgC;IACvC,MAAM,EAAE,yBAAyB;IACjC,MAAM,EAAE,eAAe;IACvB,MAAM,EAAE,WAAW;IACnB,QAAQ,EAAE,YAAY;IACtB,OAAO,EAAE,iCAAiC;CAC3C,CAAC;AAEF,gEAAgE;AAChE,MAAM,MAAM,GAAG,qBAAqB,CAAC;AAErC;;;;GAIG;AACH,MAAM,YAAY,GAAG;IACnB,cAAc,EAAE,0BAA0B;IAC1C,eAAe,EAAE,UAAU;IAC3B,yBAAyB,EACvB,yLAAyL;IAC3L,iBAAiB,EAAE,MAAM;IACzB,wBAAwB,EAAE,SAAS;IACnC,iBAAiB,EAAE,aAAa;CACjC,CAAC;AAEF,mEAAmE;AACnE,MAAM,CAAC,MAAM,oBAAoB,GAAG,GAAW,EAAE,CAAC,YAAY,CAAC;AAE/D;;;;GAIG;AACH,MAAM,OAAO,UAAU;IACZ,MAAM,GAAG,IAAI,GAAG,EAAsB,CAAC;IACvC,SAAS,CAAS;IAClB,OAAO,CAAmB;IAC1B,UAAU,CAAS;IAE5B,YAAY,SAAiB,EAAE,MAAwB;QACrD,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;QACjD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE,CAAC;YAC1B,MAAM,IAAI,KAAK,CAAC,kCAAkC,KAAK,yEAAyE,CAAC,CAAC;QACpI,CAAC;QACD,KAAK,MAAM,IAAI,IAAI,EAAE,CAAC,WAAW,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;YAC9E,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;YACxC,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;YACvC,IAAI,IAAI,IAAI,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE;gBAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;QAC7H,CAAC;QACD,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,SAAS,CAAC;QACnC,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,SAAS,GAAG,EAAE,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;IAClD,CAAC;IAED,oGAAoG;IACpG,QAAQ,CAAC,QAAmC;QAC1C,MAAM,MAAM,GAAG,QAAQ,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC;QACvE,mFAAmF;QACnF,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QACnE,8EAA8E;QAC9E,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,eAAe,MAAM,CAAC,SAAS,uEAAuE,QAAQ,WAAW,CAAC,CAAC;IACzK,CAAC;IAED,6HAA6H;IAC7H,OAAO,CAAC,OAAgB,EAAE,QAAwB;QAChD,IAAI,OAAO,CAAC,MAAM,KAAK,KAAK,IAAI,OAAO,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;YAC1D,OAAO,IAAI,QAAQ,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC;QAC9E,CAAC;QACD,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC1C,MAAM,MAAM,GAAG,QAAQ,KAAK,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAC9F,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACrC,IAAI,IAAI,EAAE,CAAC;YACT,iFAAiF;YACjF,OAAO,IAAI,QAAQ,CAAC,IAAI,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;gBAC7C,OAAO,EAAE,EAAE,cAAc,EAAE,IAAI,CAAC,IAAI,EAAE,eAAe,EAAE,qCAAqC,EAAE,wBAAwB,EAAE,SAAS,EAAE;aACpI,CAAC,CAAC;QACL,CAAC;QACD,oFAAoF;QACpF,IAAI,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC;YAAE,OAAO,IAAI,QAAQ,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;QAC7E,2FAA2F;QAC3F,OAAO,IAAI,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC,CAAC;IAC1E,CAAC;CACF"}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
import { type ChallengeAccount, type ChallengeRoom } from '@velocity-astro/cms-core';
|
|
2
|
+
/** Where Cloudflare Turnstile is asked whether an answer is a person's. The only address a check goes to. */
|
|
3
|
+
export declare const TURNSTILE_VERIFY = "https://challenges.cloudflare.com/turnstile/v0/siteverify";
|
|
4
|
+
/** The host a page with a form loads the challenge from, for a site's content security policy (scripts and frames). */
|
|
5
|
+
export declare const TURNSTILE_HOST = "https://challenges.cloudflare.com";
|
|
6
|
+
/** The script that draws the challenge. `render=explicit`: the form's own script says where. */
|
|
7
|
+
export declare const TURNSTILE_SCRIPT = "https://challenges.cloudflare.com/turnstile/v0/api.js?render=explicit";
|
|
8
|
+
/** The name the challenge's answer is posted under. */
|
|
9
|
+
export declare const FORM_CHALLENGE_FIELD = "cf-turnstile-response";
|
|
10
|
+
/** Says whether what a post carries shows its sender passed the challenge. */
|
|
11
|
+
export interface ChallengeCheck {
|
|
12
|
+
/** True when the sender passed, and when the site asks for no challenge. */
|
|
13
|
+
passed(answer: unknown): Promise<boolean>;
|
|
14
|
+
}
|
|
15
|
+
export interface SiteChallengeOptions {
|
|
16
|
+
/** The challenge an owner set up in the editor's settings, read for each post. */
|
|
17
|
+
readonly account: () => Promise<ChallengeAccount | null>;
|
|
18
|
+
/** Defaults to the platform's own `fetch`. */
|
|
19
|
+
readonly fetch?: typeof globalThis.fetch;
|
|
20
|
+
/** Told when the challenge service could not be asked. Never given what a visitor sent. */
|
|
21
|
+
readonly onFault?: (error: unknown) => void;
|
|
22
|
+
}
|
|
23
|
+
/**
|
|
24
|
+
* Checks a form's sender with the challenge an owner set up (Cloudflare Turnstile). A sender who
|
|
25
|
+
* did not pass is suspected, and what they sent is kept as spam like any other suspected post.
|
|
26
|
+
* A service that cannot be asked, or that does not know the site's key, is never held against a
|
|
27
|
+
* visitor: the other checks still stand, and the fault is told to the log.
|
|
28
|
+
*/
|
|
29
|
+
export declare class SiteChallenge implements ChallengeCheck, ChallengeRoom {
|
|
30
|
+
#private;
|
|
31
|
+
constructor(options: SiteChallengeOptions);
|
|
32
|
+
passed(answer: unknown): Promise<boolean>;
|
|
33
|
+
test(): Promise<void>;
|
|
34
|
+
}
|
|
35
|
+
//# sourceMappingURL=challenge.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"challenge.d.ts","sourceRoot":"","sources":["../src/challenge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,KAAK,gBAAgB,EAAE,KAAK,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAEpG,6GAA6G;AAC7G,eAAO,MAAM,gBAAgB,8DAA8D,CAAC;AAC5F,uHAAuH;AACvH,eAAO,MAAM,cAAc,sCAAsC,CAAC;AAClE,gGAAgG;AAChG,eAAO,MAAM,gBAAgB,0EAA0D,CAAC;AACxF,uDAAuD;AACvD,eAAO,MAAM,oBAAoB,0BAA0B,CAAC;AAM5D,8EAA8E;AAC9E,MAAM,WAAW,cAAc;IAC7B,4EAA4E;IAC5E,MAAM,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAC3C;AAED,MAAM,WAAW,oBAAoB;IACnC,kFAAkF;IAClF,QAAQ,CAAC,OAAO,EAAE,MAAM,OAAO,CAAC,gBAAgB,GAAG,IAAI,CAAC,CAAC;IACzD,8CAA8C;IAC9C,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,UAAU,CAAC,KAAK,CAAC;IACzC,2FAA2F;IAC3F,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;CAC7C;AAID;;;;;GAKG;AACH,qBAAa,aAAc,YAAW,cAAc,EAAE,aAAa;;gBAGrD,OAAO,EAAE,oBAAoB;IAInC,MAAM,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;IAgBzC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CA+B5B"}
|
|
@@ -0,0 +1,84 @@
|
|
|
1
|
+
import { ConflictError } from '@velocity-astro/cms-core';
|
|
2
|
+
/** Where Cloudflare Turnstile is asked whether an answer is a person's. The only address a check goes to. */
|
|
3
|
+
export const TURNSTILE_VERIFY = 'https://challenges.cloudflare.com/turnstile/v0/siteverify';
|
|
4
|
+
/** The host a page with a form loads the challenge from, for a site's content security policy (scripts and frames). */
|
|
5
|
+
export const TURNSTILE_HOST = 'https://challenges.cloudflare.com';
|
|
6
|
+
/** The script that draws the challenge. `render=explicit`: the form's own script says where. */
|
|
7
|
+
export const TURNSTILE_SCRIPT = `${TURNSTILE_HOST}/turnstile/v0/api.js?render=explicit`;
|
|
8
|
+
/** The name the challenge's answer is posted under. */
|
|
9
|
+
export const FORM_CHALLENGE_FIELD = 'cf-turnstile-response';
|
|
10
|
+
/** The longest answer Turnstile gives. */
|
|
11
|
+
const MAX_ANSWER_LENGTH = 2048;
|
|
12
|
+
/** What a test sends in place of a person's answer. Cloudflare refuses it, and says first whether it knows the key. */
|
|
13
|
+
const TEST_ANSWER = 'velocity-cms-key-check';
|
|
14
|
+
/**
|
|
15
|
+
* Checks a form's sender with the challenge an owner set up (Cloudflare Turnstile). A sender who
|
|
16
|
+
* did not pass is suspected, and what they sent is kept as spam like any other suspected post.
|
|
17
|
+
* A service that cannot be asked, or that does not know the site's key, is never held against a
|
|
18
|
+
* visitor: the other checks still stand, and the fault is told to the log.
|
|
19
|
+
*/
|
|
20
|
+
export class SiteChallenge {
|
|
21
|
+
#options;
|
|
22
|
+
constructor(options) {
|
|
23
|
+
this.#options = options;
|
|
24
|
+
}
|
|
25
|
+
async passed(answer) {
|
|
26
|
+
let account;
|
|
27
|
+
try {
|
|
28
|
+
account = await this.#options.account();
|
|
29
|
+
}
|
|
30
|
+
catch (error) {
|
|
31
|
+
this.#options.onFault?.(error);
|
|
32
|
+
return true;
|
|
33
|
+
}
|
|
34
|
+
if (account === null)
|
|
35
|
+
return true;
|
|
36
|
+
if (typeof answer !== 'string' || answer === '' || answer.length > MAX_ANSWER_LENGTH)
|
|
37
|
+
return false;
|
|
38
|
+
const verdict = await this.#ask(account.secretKey, answer);
|
|
39
|
+
if (verdict === 'wrong-secret')
|
|
40
|
+
this.#options.onFault?.(new Error('Cloudflare Turnstile does not know the secret key saved under Settings, Forms and spam, so forms are not being checked with it.'));
|
|
41
|
+
if (verdict === 'unreachable')
|
|
42
|
+
this.#options.onFault?.(new Error('Cloudflare Turnstile could not be asked about a form\'s sender, so that post was not checked with it.'));
|
|
43
|
+
return verdict !== 'not-a-person';
|
|
44
|
+
}
|
|
45
|
+
async test() {
|
|
46
|
+
const account = await this.#options.account();
|
|
47
|
+
if (account === null)
|
|
48
|
+
throw new ConflictError('There are no keys to check yet. Save the site key and the secret key first.');
|
|
49
|
+
const verdict = await this.#ask(account.secretKey, TEST_ANSWER);
|
|
50
|
+
if (verdict === 'wrong-secret')
|
|
51
|
+
throw new ConflictError('Cloudflare does not know this secret key. Copy it again from the widget\'s settings in Cloudflare, under Turnstile.');
|
|
52
|
+
if (verdict === 'unreachable')
|
|
53
|
+
throw new ConflictError('Cloudflare could not be reached to check the key. Try again in a moment.');
|
|
54
|
+
}
|
|
55
|
+
/** Asks the one address checks go to. The visitor's own address is not sent along. */
|
|
56
|
+
async #ask(secret, answer) {
|
|
57
|
+
const send = this.#options.fetch ?? ((input, init) => globalThis.fetch(input, init));
|
|
58
|
+
try {
|
|
59
|
+
const response = await send(TURNSTILE_VERIFY, {
|
|
60
|
+
method: 'POST',
|
|
61
|
+
headers: { 'content-type': 'application/x-www-form-urlencoded' },
|
|
62
|
+
body: new URLSearchParams({ secret, response: answer }).toString(),
|
|
63
|
+
redirect: 'error',
|
|
64
|
+
signal: AbortSignal.timeout(5000),
|
|
65
|
+
});
|
|
66
|
+
const body = await response.json();
|
|
67
|
+
if (typeof body !== 'object' || body === null)
|
|
68
|
+
return 'unreachable';
|
|
69
|
+
const { success, 'error-codes': codes } = body;
|
|
70
|
+
if (success === true)
|
|
71
|
+
return 'person';
|
|
72
|
+
const said = Array.isArray(codes) ? codes.filter((code) => typeof code === 'string') : [];
|
|
73
|
+
if (said.includes('invalid-input-secret') || said.includes('missing-input-secret'))
|
|
74
|
+
return 'wrong-secret';
|
|
75
|
+
if (said.includes('internal-error') || success !== false)
|
|
76
|
+
return 'unreachable';
|
|
77
|
+
return 'not-a-person';
|
|
78
|
+
}
|
|
79
|
+
catch {
|
|
80
|
+
return 'unreachable';
|
|
81
|
+
}
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
//# sourceMappingURL=challenge.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"challenge.js","sourceRoot":"","sources":["../src/challenge.ts"],"names":[],"mappings":"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"}
|
package/dist/cli.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC;IAC3D,QAAQ,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACvC,uEAAuE;IACvE,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;CACvB;AAWD,yDAAyD;AACzD,wBAAsB,MAAM,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,EAAE,WAAW,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC;IAC3D,QAAQ,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACvC,uEAAuE;IACvE,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;CACvB;AAWD,yDAAyD;AACzD,wBAAsB,MAAM,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,EAAE,WAAW,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAwDlG"}
|
package/dist/cli.js
CHANGED
|
@@ -2,7 +2,7 @@ import { CmsAuth } from '@velocity-astro/cms-auth';
|
|
|
2
2
|
import { CmsError } from '@velocity-astro/cms-core';
|
|
3
3
|
import { connect } from './connection.js';
|
|
4
4
|
import { LogMailer } from './editor.js';
|
|
5
|
-
import { initSite } from './init.js';
|
|
5
|
+
import { initSite, runScript } from './init.js';
|
|
6
6
|
const USAGE = `Usage:
|
|
7
7
|
velocity-cms init [<email> <name>] Set this site up for the CMS: a secret in .env, the integration in the
|
|
8
8
|
Astro config. With an email and a name, also create the first owner.
|
|
@@ -18,6 +18,7 @@ export async function runCli(args, environment) {
|
|
|
18
18
|
const [asked, email, ...nameParts] = args;
|
|
19
19
|
const name = nameParts.join(' ');
|
|
20
20
|
let command = asked;
|
|
21
|
+
const dev = runScript(environment.dir ?? process.cwd(), 'dev');
|
|
21
22
|
if (command === 'init') {
|
|
22
23
|
if (email && !name) {
|
|
23
24
|
print(`Give the owner's name after the address, or leave both out.\n\n${USAGE}`);
|
|
@@ -27,7 +28,7 @@ export async function runCli(args, environment) {
|
|
|
27
28
|
if (done.code !== 0)
|
|
28
29
|
return done.code;
|
|
29
30
|
if (!email) {
|
|
30
|
-
print(
|
|
31
|
+
print(`\nNext, make the first owner:\n\n npx velocity-cms owner <email> <name>\n\nThen start the site (\`${dev}\`) and open /admin.`);
|
|
31
32
|
return 0;
|
|
32
33
|
}
|
|
33
34
|
// What init wrote is used at once; what the environment already said still wins.
|
|
@@ -54,7 +55,7 @@ export async function runCli(args, environment) {
|
|
|
54
55
|
const auth = new CmsAuth({ db: connection.db, secret, origin, siteName: 'Velocity CMS', mailer: new LogMailer(print), access: connection.cms.access });
|
|
55
56
|
if (command === 'owner') {
|
|
56
57
|
const { user, link } = await auth.createFirstOwner({ email, name });
|
|
57
|
-
print(`${user.name} <${user.email}> is the site's owner.\n\nOpen this link to sign in. It works once, for 10 minutes:\n\n${link}\n${origin.includes('localhost') ?
|
|
58
|
+
print(`${user.name} <${user.email}> is the site's owner.\n\nOpen this link to sign in. It works once, for 10 minutes:\n\n${link}\n${origin.includes('localhost') ? `\nStart the site first (\`${dev}\`), so the link has somewhere to land.\n` : ''}`);
|
|
58
59
|
}
|
|
59
60
|
else {
|
|
60
61
|
// Whoever holds the link is that person, so it is only ever printed here, for whoever runs the site.
|
package/dist/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
package/dist/connection.d.ts
CHANGED
|
@@ -11,6 +11,7 @@ export interface ConnectionOptions {
|
|
|
11
11
|
}
|
|
12
12
|
/** The site reads content as itself, with read access only. */
|
|
13
13
|
export declare const SITE: Actor;
|
|
14
|
+
/** Where the database is. On a server that runs many sites it is the site's own, whatever was asked for. */
|
|
14
15
|
export declare const resolveUrl: (options: ConnectionOptions) => string;
|
|
15
16
|
export interface Connection {
|
|
16
17
|
readonly cms: Cms;
|
package/dist/connection.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":"AAGA,OAAO,EAAa,KAAK,KAAK,EAAE,KAAK,GAAG,EAAmB,KAAK,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAE9G,OAAO,
|
|
1
|
+
{"version":3,"file":"connection.d.ts","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":"AAGA,OAAO,EAAa,KAAK,KAAK,EAAE,KAAK,GAAG,EAAmB,KAAK,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAE9G,OAAO,EAAgS,KAAK,EAAE,EAAE,MAAM,wBAAwB,CAAC;AAS/U,MAAM,WAAW,iBAAiB;IAChC;;;OAGG;IACH,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IACtB,wFAAwF;IACxF,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,+DAA+D;AAC/D,eAAO,MAAM,IAAI,EAAE,KAAyD,CAAC;AAE7E,4GAA4G;AAC5G,eAAO,MAAM,UAAU,GAAI,SAAS,iBAAiB,KAAG,MACqD,CAAC;AAE9G,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;IAClB,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,+FAA+F;IAC/F,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC;IAChB,KAAK,IAAI,IAAI,CAAC;CACf;AAQD,wBAAsB,OAAO,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,UAAU,CAAC,CA6C7E;AAID,mFAAmF;AACnF,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,UAAU,CAAC,CAehF"}
|
package/dist/connection.js
CHANGED
|
@@ -3,24 +3,41 @@ import { mkdirSync } from 'node:fs';
|
|
|
3
3
|
import path from 'node:path';
|
|
4
4
|
import { createCms } from '@velocity-astro/cms-core';
|
|
5
5
|
import { AuthTeam } from '@velocity-astro/cms-auth/team';
|
|
6
|
-
import { openDatabase, SqliteEntryRepository, SqliteFormRepository, SqliteSubmissionRepository, SqliteContactRepository, SqliteDealRepository, SqlitePipelineStore, SqliteCustomFieldsStore, SqliteMediaRepository, SqlitePluginStore, SqliteSchemaRepository, SqliteSearchIndex } from '@velocity-astro/cms-db';
|
|
7
|
-
import {
|
|
6
|
+
import { openDatabase, SqliteEntryRepository, SqliteFormRepository, SqliteSubmissionRepository, SqliteContactRepository, SqliteDealRepository, SqlitePipelineStore, SqliteSettingsStore, SqliteCustomFieldsStore, SqliteMediaRepository, SqlitePluginStore, SqliteSchemaRepository, SqliteSearchIndex } from '@velocity-astro/cms-db';
|
|
7
|
+
import { currentSite } from './hosted.js';
|
|
8
|
+
import { SharpImageOptimizer } from './image-optimizer.js';
|
|
9
|
+
import { bucketFromEnv, folderFromEnv } from './media-store.js';
|
|
10
|
+
import { SiteMediaStore } from './site-storage.js';
|
|
11
|
+
import { SiteChallenge } from './challenge.js';
|
|
8
12
|
import { siteSecret } from './secret.js';
|
|
9
13
|
import { allPlugins } from './site-plugins.js';
|
|
10
14
|
/** The site reads content as itself, with read access only. */
|
|
11
15
|
export const SITE = { kind: 'cli', id: 'astro-site', role: 'author' };
|
|
12
|
-
|
|
16
|
+
/** Where the database is. On a server that runs many sites it is the site's own, whatever was asked for. */
|
|
17
|
+
export const resolveUrl = (options) => currentSite()?.database.url ?? options.url ?? process.env.VELOCITY_CMS_DATABASE_URL ?? 'file:./cms/data.db';
|
|
13
18
|
/** Every address a host's name leads to, so a plugin can refuse a name that leads to a private machine. */
|
|
14
19
|
const lookUp = async (host) => (await lookup(host, { all: true })).map((found) => found.address);
|
|
20
|
+
/** One for the whole server: it holds a library and nothing of any site. */
|
|
21
|
+
const optimizer = new SharpImageOptimizer();
|
|
15
22
|
export async function connect(options) {
|
|
16
|
-
const
|
|
23
|
+
const site = currentSite();
|
|
24
|
+
const authToken = site ? site.database.authToken : (options.authToken ?? (process.env.VELOCITY_CMS_DATABASE_TOKEN || undefined));
|
|
17
25
|
const url = resolveUrl(options);
|
|
18
26
|
// A database that is a file is made on first use, and so is the folder it sits in.
|
|
19
27
|
const file = /^file:(?!:memory:)([^?]+)/.exec(url)?.[1];
|
|
20
28
|
if (file !== undefined)
|
|
21
29
|
mkdirSync(path.dirname(path.resolve(file.replace(/^\/\/(?=\/)/, ''))), { recursive: true });
|
|
22
30
|
const database = await openDatabase({ url, ...(authToken !== undefined && { authToken }) });
|
|
23
|
-
|
|
31
|
+
// A hosted site keeps uploads where its host says, and nowhere a setting of the server names.
|
|
32
|
+
// A site of its own keeps them where the server's settings say, then in the bucket an owner
|
|
33
|
+
// named in the editor, then in a folder beside a database that is a file.
|
|
34
|
+
const store = new SiteMediaStore({
|
|
35
|
+
account: () => cms.settings.bucketAccount(),
|
|
36
|
+
fixed: site ? site.media : bucketFromEnv(),
|
|
37
|
+
hosted: site !== undefined,
|
|
38
|
+
folder: site ? undefined : folderFromEnv(url),
|
|
39
|
+
lookup: lookUp,
|
|
40
|
+
});
|
|
24
41
|
const secret = siteSecret();
|
|
25
42
|
const cms = createCms({
|
|
26
43
|
entries: new SqliteEntryRepository(database.db),
|
|
@@ -29,16 +46,24 @@ export async function connect(options) {
|
|
|
29
46
|
submissions: new SqliteSubmissionRepository(database.db),
|
|
30
47
|
contacts: new SqliteContactRepository(database.db),
|
|
31
48
|
pipeline: new SqlitePipelineStore(database.db),
|
|
49
|
+
settings: new SqliteSettingsStore(database.db),
|
|
32
50
|
customFields: new SqliteCustomFieldsStore(database.db),
|
|
33
51
|
deals: new SqliteDealRepository(database.db),
|
|
34
52
|
team: new AuthTeam(database.db),
|
|
35
53
|
// A secret too short to sign with is the editor's to report, not a reason to read no content.
|
|
36
54
|
...(secret !== undefined && secret.length >= 32 && { previews: { secret } }),
|
|
37
|
-
|
|
55
|
+
media: {
|
|
56
|
+
storage: { files: new SqliteMediaRepository(database.db), store },
|
|
57
|
+
optimizer,
|
|
58
|
+
// The image is never logged, only that one could not be handled: the upload is kept as it arrived.
|
|
59
|
+
onOptimizerFault: (error) => console.warn('[velocity-cms] An image could not be made lighter, so it is kept as it is.', error),
|
|
60
|
+
},
|
|
38
61
|
pluginStore: new SqlitePluginStore(database.db),
|
|
39
62
|
lookup: lookUp,
|
|
40
63
|
onPluginFault: (plugin, error) => console.error(`[velocity-cms] The plugin "${plugin}" failed.`, error),
|
|
41
64
|
});
|
|
65
|
+
cms.settings.useStorage(store.room());
|
|
66
|
+
cms.settings.useChallenge(new SiteChallenge({ account: () => cms.settings.challengeAccount() }));
|
|
42
67
|
return { cms, search: new SqliteSearchIndex(database.db), db: database.db, close: () => database.close() };
|
|
43
68
|
}
|
|
44
69
|
const shared = new Map();
|
package/dist/connection.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection.js","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,SAAS,EAA2D,MAAM,0BAA0B,CAAC;AAC9G,OAAO,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,0BAA0B,EAAE,uBAAuB,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,uBAAuB,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,iBAAiB,EAAW,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"connection.js","sourceRoot":"","sources":["../src/connection.ts"],"names":[],"mappings":"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"}
|
package/dist/editor.d.ts
CHANGED
|
@@ -8,6 +8,8 @@ export interface EditorHostOptions {
|
|
|
8
8
|
/** The site's own address, such as `https://example.com`. */
|
|
9
9
|
readonly origin: string;
|
|
10
10
|
readonly siteName: string;
|
|
11
|
+
/** What an owner called the site in the editor's settings, or `null`. Asked each time the editor's page is served. */
|
|
12
|
+
readonly siteNameNow?: () => Promise<string | null>;
|
|
11
13
|
readonly mailer: Mailer;
|
|
12
14
|
/** The site's images, for image fields to choose from. */
|
|
13
15
|
readonly images?: ImageLibrary;
|
package/dist/editor.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"editor.d.ts","sourceRoot":"","sources":["../src/editor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,KAAK,cAAc,EAAE,KAAK,MAAM,EAAE,KAAK,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtG,OAAO,EAAgD,KAAK,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAE3G,OAAO,EAAQ,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAOxD,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC;IAChC,qFAAqF;IACrF,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,6DAA6D;IAC7D,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,0DAA0D;IAC1D,QAAQ,CAAC,MAAM,CAAC,EAAE,YAAY,CAAC;IAC/B,wDAAwD;IACxD,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,yFAAyF;IACzF,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,wFAAwF;IACxF,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC;IAClC,gFAAgF;IAChF,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;CAC7C;AAED;;;GAGG;AACH,qBAAa,SAAU,YAAW,MAAM;IAC1B,OAAO,CAAC,QAAQ,CAAC,GAAG;gBAAH,GAAG,GAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAmC;IAEjF,cAAc,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAI/C,cAAc,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAG1D;AAUD,qBAAa,UAAU;;IACrB,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"editor.d.ts","sourceRoot":"","sources":["../src/editor.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,KAAK,cAAc,EAAE,KAAK,MAAM,EAAE,KAAK,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtG,OAAO,EAAgD,KAAK,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAE3G,OAAO,EAAQ,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAOxD,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC;IAChC,qFAAqF;IACrF,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,6DAA6D;IAC7D,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,sHAAsH;IACtH,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IACpD,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,0DAA0D;IAC1D,QAAQ,CAAC,MAAM,CAAC,EAAE,YAAY,CAAC;IAC/B,wDAAwD;IACxD,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,yFAAyF;IACzF,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,wFAAwF;IACxF,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAC;IAClC,gFAAgF;IAChF,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI,CAAC;CAC7C;AAED;;;GAGG;AACH,qBAAa,SAAU,YAAW,MAAM;IAC1B,OAAO,CAAC,QAAQ,CAAC,GAAG;gBAAH,GAAG,GAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAmC;IAEjF,cAAc,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAI/C,cAAc,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;CAG1D;AAUD,qBAAa,UAAU;;IACrB,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;gBAeX,OAAO,EAAE,iBAAiB;IA0EtC,oCAAoC;IACpC,GAAG,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC;IAIxC,yDAAyD;IACzD,MAAM,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC;IAI3C;;;;;OAKG;IACG,KAAK,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC;IAWhD;;;;;OAKG;IACG,UAAU,CAAC,OAAO,GAAE;QAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,OAAO,CAAA;KAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAUzE;;;;;OAKG;IACH,aAAa,IAAI,MAAM,EAAE,GAAG,IAAI;CAOjC"}
|
package/dist/editor.js
CHANGED
|
@@ -38,6 +38,7 @@ export class EditorHost {
|
|
|
38
38
|
#plugins;
|
|
39
39
|
#content;
|
|
40
40
|
#onFault;
|
|
41
|
+
#siteNameNow;
|
|
41
42
|
/** When entries due to be published were last looked for. */
|
|
42
43
|
#lookedAt = 0;
|
|
43
44
|
/** Whether anything was published or taken down since `takePublished` was last called. */
|
|
@@ -71,6 +72,7 @@ export class EditorHost {
|
|
|
71
72
|
this.#plugins = cms.plugins;
|
|
72
73
|
this.#content = cms.content;
|
|
73
74
|
this.#onFault = options.onFault;
|
|
75
|
+
this.#siteNameNow = options.siteNameNow;
|
|
74
76
|
// `/admin/plugins/<name>.js`: what a running plugin adds to the editor.
|
|
75
77
|
this.#pluginFile = new RegExp(`^${adminPath.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}/plugins/([a-z][a-z0-9-]{0,39})\\.js$`);
|
|
76
78
|
this.#files = new AdminFiles(options.editorDirectory ?? builtEditorDirectory(), { siteName: options.siteName, adminPath, apiPath, authPath });
|
|
@@ -110,6 +112,11 @@ export class EditorHost {
|
|
|
110
112
|
cms.events.on('form.trashed', formChanged);
|
|
111
113
|
cms.events.on('form.restored', formChanged);
|
|
112
114
|
cms.events.on('form.deleted', formChanged);
|
|
115
|
+
// A page that draws a form was kept with or without the challenge an owner has now set up.
|
|
116
|
+
cms.events.on('settings.saved', ({ area }) => {
|
|
117
|
+
if (area === 'forms')
|
|
118
|
+
formChanged();
|
|
119
|
+
});
|
|
113
120
|
cms.events.on('type.archived', shown);
|
|
114
121
|
cms.events.on('type.restored', shown);
|
|
115
122
|
}
|
|
@@ -129,8 +136,9 @@ export class EditorHost {
|
|
|
129
136
|
*/
|
|
130
137
|
async admin(request) {
|
|
131
138
|
const name = this.#pluginFile.exec(new URL(request.url).pathname)?.[1];
|
|
139
|
+
// A name that cannot be read leaves the page with the one it started with: the editor still opens.
|
|
132
140
|
if (name === undefined)
|
|
133
|
-
return this.#files.respond(request);
|
|
141
|
+
return this.#files.respond(request, await this.#siteNameNow?.().catch(() => null));
|
|
134
142
|
if (request.method !== 'GET' && request.method !== 'HEAD')
|
|
135
143
|
return new Response(null, { status: 405, headers: { allow: 'GET, HEAD' } });
|
|
136
144
|
const file = await this.#plugins.editorFile(name);
|
package/dist/editor.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"editor.js","sourceRoot":"","sources":["../src/editor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AACjD,OAAO,EAAE,OAAO,EAAqD,MAAM,0BAA0B,CAAC;AACtG,OAAO,EAAE,WAAW,EAAsD,MAAM,0BAA0B,CAAC;AAC3G,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACpE,OAAO,EAAE,IAAI,EAAmB,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAEzD,+FAA+F;AAC/F,MAAM,cAAc,GAAG,IAAI,CAAC;AAC5B,MAAM,SAAS,GAAG,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"editor.js","sourceRoot":"","sources":["../src/editor.ts"],"names":[],"mappings":"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"}
|
package/dist/form-post.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { type ChallengeCheck } from './challenge.js';
|
|
1
2
|
import { type Cms, type DealSubject } from '@velocity-astro/cms-core';
|
|
2
3
|
/** The names a form's page sends beside its own fields. A field's key never starts with `_`. */
|
|
3
4
|
export declare const FORM_TRAP_FIELD = "_hp";
|
|
@@ -5,6 +6,8 @@ export declare const FORM_TOKEN_FIELD = "_t";
|
|
|
5
6
|
export declare const FORM_PAGE_FIELD = "_page";
|
|
6
7
|
export declare const FORM_LOCALE_FIELD = "_locale";
|
|
7
8
|
export declare const FORM_ABOUT_FIELD = "_about";
|
|
9
|
+
/** Holds the challenge's site key, so the form's script draws the challenge in a template that knows nothing of it. */
|
|
10
|
+
export declare const FORM_CHALLENGE_KEY_FIELD = "_challenge";
|
|
8
11
|
/** The largest post a form may send: plenty for words, far too little to fill a disk. */
|
|
9
12
|
export declare const MAX_FORM_POST_BYTES: number;
|
|
10
13
|
/** Says whether one more post may be taken from an address. A host with many servers supplies a shared one. */
|
|
@@ -12,6 +15,8 @@ export interface RateLimiter {
|
|
|
12
15
|
/** True when the post may go ahead, which counts it. */
|
|
13
16
|
take(address: string): boolean | Promise<boolean>;
|
|
14
17
|
}
|
|
18
|
+
/** How many posts one address may send in the limiter's stretch of time. */
|
|
19
|
+
export type PostLimit = number | (() => number | Promise<number>);
|
|
15
20
|
/** Counts posts per address in this server's memory: `limit` in any stretch of `windowMs`. */
|
|
16
21
|
export declare class MemoryRateLimiter implements RateLimiter {
|
|
17
22
|
#private;
|
|
@@ -19,7 +24,8 @@ export declare class MemoryRateLimiter implements RateLimiter {
|
|
|
19
24
|
private readonly windowMs;
|
|
20
25
|
private readonly now;
|
|
21
26
|
constructor(limit?: number, windowMs?: number, now?: () => number);
|
|
22
|
-
take
|
|
27
|
+
/** `limit` is the most to take from one address just now, when it is not the one this was made with. */
|
|
28
|
+
take(address: string, limit?: number): boolean;
|
|
23
29
|
}
|
|
24
30
|
/** Word to one of a form's people that it was filled in. */
|
|
25
31
|
export interface SubmissionNotice {
|
|
@@ -67,6 +73,8 @@ export interface FormPostsOptions {
|
|
|
67
73
|
/** Who delivers notices. Without one nobody is emailed; submissions are kept all the same. */
|
|
68
74
|
readonly mailer?: NoticeMailer | undefined;
|
|
69
75
|
readonly limiter?: RateLimiter;
|
|
76
|
+
/** Checks that a post's sender passed the site's challenge. Without one no challenge is asked. */
|
|
77
|
+
readonly challenge?: ChallengeCheck;
|
|
70
78
|
/**
|
|
71
79
|
* The entry whose own page is at a path of the site, if any, so that what is sent from a
|
|
72
80
|
* listing's page is known to be about that listing. Asked only when the form's page did not
|
package/dist/form-post.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"form-post.d.ts","sourceRoot":"","sources":["../src/form-post.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8C,KAAK,GAAG,EAAE,KAAK,WAAW,EAAqD,MAAM,0BAA0B,CAAC;AAErK,gGAAgG;AAChG,eAAO,MAAM,eAAe,QAAQ,CAAC;AACrC,eAAO,MAAM,gBAAgB,OAAO,CAAC;AACrC,eAAO,MAAM,eAAe,UAAU,CAAC;AACvC,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAC3C,eAAO,MAAM,gBAAgB,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"form-post.d.ts","sourceRoot":"","sources":["../src/form-post.ts"],"names":[],"mappings":"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"}
|
package/dist/form-post.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { FORM_CHALLENGE_FIELD } from './challenge.js';
|
|
1
2
|
import { NotFoundError, ValidationError, liveFields } from '@velocity-astro/cms-core';
|
|
2
3
|
/** The names a form's page sends beside its own fields. A field's key never starts with `_`. */
|
|
3
4
|
export const FORM_TRAP_FIELD = '_hp';
|
|
@@ -5,6 +6,8 @@ export const FORM_TOKEN_FIELD = '_t';
|
|
|
5
6
|
export const FORM_PAGE_FIELD = '_page';
|
|
6
7
|
export const FORM_LOCALE_FIELD = '_locale';
|
|
7
8
|
export const FORM_ABOUT_FIELD = '_about';
|
|
9
|
+
/** Holds the challenge's site key, so the form's script draws the challenge in a template that knows nothing of it. */
|
|
10
|
+
export const FORM_CHALLENGE_KEY_FIELD = '_challenge';
|
|
8
11
|
/** The largest post a form may send: plenty for words, far too little to fill a disk. */
|
|
9
12
|
export const MAX_FORM_POST_BYTES = 64 * 1024;
|
|
10
13
|
/** A person takes at least this long to fill in a form. What arrives sooner is suspected. */
|
|
@@ -20,7 +23,8 @@ export class MemoryRateLimiter {
|
|
|
20
23
|
this.windowMs = windowMs;
|
|
21
24
|
this.now = now;
|
|
22
25
|
}
|
|
23
|
-
take
|
|
26
|
+
/** `limit` is the most to take from one address just now, when it is not the one this was made with. */
|
|
27
|
+
take(address, limit = this.limit) {
|
|
24
28
|
const since = this.now() - this.windowMs;
|
|
25
29
|
// Forgets addresses that have gone quiet, so the list cannot grow without end.
|
|
26
30
|
if (this.#taken.size > 5000) {
|
|
@@ -29,7 +33,7 @@ export class MemoryRateLimiter {
|
|
|
29
33
|
this.#taken.delete(known);
|
|
30
34
|
}
|
|
31
35
|
const times = (this.#taken.get(address) ?? []).filter((time) => time > since);
|
|
32
|
-
if (times.length >=
|
|
36
|
+
if (times.length >= limit) {
|
|
33
37
|
this.#taken.set(address, times);
|
|
34
38
|
return false;
|
|
35
39
|
}
|
|
@@ -99,7 +103,10 @@ export class FormPosts {
|
|
|
99
103
|
return refuse(415, 'unsupported', this.#words.notAForm);
|
|
100
104
|
const page = isOwnPath(sent[FORM_PAGE_FIELD]) ? sent[FORM_PAGE_FIELD] : undefined;
|
|
101
105
|
const locale = typeof sent[FORM_LOCALE_FIELD] === 'string' ? sent[FORM_LOCALE_FIELD] : undefined;
|
|
102
|
-
const suspected = (typeof sent[FORM_TRAP_FIELD] === 'string' && sent[FORM_TRAP_FIELD] !== '') ||
|
|
106
|
+
const suspected = (typeof sent[FORM_TRAP_FIELD] === 'string' && sent[FORM_TRAP_FIELD] !== '') ||
|
|
107
|
+
!(await this.#drawnForAPerson(formKey, sent[FORM_TOKEN_FIELD])) ||
|
|
108
|
+
// Asked last: a post already suspected is not worth a question to another service.
|
|
109
|
+
!((await this.#options.challenge?.passed(sent[FORM_CHALLENGE_FIELD])) ?? true);
|
|
103
110
|
// A page that cannot be looked up costs the submission nothing but its subject.
|
|
104
111
|
const about = (await this.#marked(formKey, sent[FORM_ABOUT_FIELD])) ?? (page === undefined ? undefined : await this.#options.entryAt?.(page).catch(() => undefined));
|
|
105
112
|
try {
|