@geekity/cms 0.50.1 → 0.52.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/admin/pages/account/forgot.njk +13 -7
- package/admin/pages/account/reset.njk +1 -1
- package/admin/pages/documents/editor.njk +40 -1
- package/admin/pages/users/edit.njk +36 -4
- package/admin/pages/users/new.njk +19 -1
- package/admin/static/admin.css +32 -25
- package/dist/admin/admin-bar.d.ts.map +1 -1
- package/dist/admin/admin-bar.js +11 -10
- package/dist/admin/admin-bar.js.map +1 -1
- package/dist/admin/autosave.d.ts.map +1 -1
- package/dist/admin/autosave.js +1 -2
- package/dist/admin/autosave.js.map +1 -1
- package/dist/admin/confirm-password.d.ts +19 -1
- package/dist/admin/confirm-password.d.ts.map +1 -1
- package/dist/admin/confirm-password.js +40 -8
- package/dist/admin/confirm-password.js.map +1 -1
- package/dist/admin/connected-apps.d.ts.map +1 -1
- package/dist/admin/connected-apps.js +1 -0
- package/dist/admin/connected-apps.js.map +1 -1
- package/dist/admin/credentials.d.ts +0 -1
- package/dist/admin/credentials.d.ts.map +1 -1
- package/dist/admin/credentials.js +1 -2
- package/dist/admin/credentials.js.map +1 -1
- package/dist/admin/documents.d.ts +0 -7
- package/dist/admin/documents.d.ts.map +1 -1
- package/dist/admin/documents.js +29 -19
- package/dist/admin/documents.js.map +1 -1
- package/dist/admin/editor-layout.js +2 -2
- package/dist/admin/editor-layout.js.map +1 -1
- package/dist/admin/export.d.ts +2 -0
- package/dist/admin/export.d.ts.map +1 -1
- package/dist/admin/export.js +5 -4
- package/dist/admin/export.js.map +1 -1
- package/dist/admin/headers.d.ts.map +1 -1
- package/dist/admin/headers.js +4 -0
- package/dist/admin/headers.js.map +1 -1
- package/dist/admin/index.d.ts +7 -7
- package/dist/admin/index.d.ts.map +1 -1
- package/dist/admin/index.js +5 -5
- package/dist/admin/index.js.map +1 -1
- package/dist/admin/indieauth-consent.d.ts.map +1 -1
- package/dist/admin/indieauth-consent.js +3 -2
- package/dist/admin/indieauth-consent.js.map +1 -1
- package/dist/admin/legacy-migrations.d.ts.map +1 -1
- package/dist/admin/legacy-migrations.js +6 -2
- package/dist/admin/legacy-migrations.js.map +1 -1
- package/dist/admin/plugins.d.ts +2 -0
- package/dist/admin/plugins.d.ts.map +1 -1
- package/dist/admin/plugins.js +15 -11
- package/dist/admin/plugins.js.map +1 -1
- package/dist/admin/recovery.d.ts +7 -4
- package/dist/admin/recovery.d.ts.map +1 -1
- package/dist/admin/recovery.js +68 -43
- package/dist/admin/recovery.js.map +1 -1
- package/dist/admin/routes.d.ts.map +1 -1
- package/dist/admin/routes.js +99 -76
- package/dist/admin/routes.js.map +1 -1
- package/dist/admin/uploads.d.ts +4 -13
- package/dist/admin/uploads.d.ts.map +1 -1
- package/dist/admin/uploads.js +9 -28
- package/dist/admin/uploads.js.map +1 -1
- package/dist/admin/users.d.ts +7 -0
- package/dist/admin/users.d.ts.map +1 -1
- package/dist/admin/users.js +156 -43
- package/dist/admin/users.js.map +1 -1
- package/dist/admin/wiki-mentions.d.ts +31 -0
- package/dist/admin/wiki-mentions.d.ts.map +1 -0
- package/dist/admin/wiki-mentions.js +129 -0
- package/dist/admin/wiki-mentions.js.map +1 -0
- package/dist/cli/commands.d.ts.map +1 -1
- package/dist/cli/commands.js +12 -1
- package/dist/cli/commands.js.map +1 -1
- package/dist/cli/help.d.ts.map +1 -1
- package/dist/cli/help.js +5 -4
- package/dist/cli/help.js.map +1 -1
- package/dist/cli/password.js +3 -3
- package/dist/cli/password.js.map +1 -1
- package/dist/cli/serve.d.ts.map +1 -1
- package/dist/cli/serve.js +17 -0
- package/dist/cli/serve.js.map +1 -1
- package/dist/cli/user.d.ts +1 -1
- package/dist/cli/user.d.ts.map +1 -1
- package/dist/cli/user.js +74 -11
- package/dist/cli/user.js.map +1 -1
- package/dist/cms/services.d.ts.map +1 -1
- package/dist/cms/services.js +10 -1
- package/dist/cms/services.js.map +1 -1
- package/dist/config.d.ts +8 -4
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +4 -1
- package/dist/config.js.map +1 -1
- package/dist/content/document-form.d.ts +2 -0
- package/dist/content/document-form.d.ts.map +1 -1
- package/dist/content/document-form.js +10 -0
- package/dist/content/document-form.js.map +1 -1
- package/dist/content/document-kind.d.ts +5 -0
- package/dist/content/document-kind.d.ts.map +1 -1
- package/dist/content/document-kind.js +3 -0
- package/dist/content/document-kind.js.map +1 -1
- package/dist/content/sqlite/backlinks.d.ts.map +1 -1
- package/dist/content/sqlite/backlinks.js +4 -3
- package/dist/content/sqlite/backlinks.js.map +1 -1
- package/dist/content/sqlite/lookups.d.ts.map +1 -1
- package/dist/content/sqlite/lookups.js +6 -2
- package/dist/content/sqlite/lookups.js.map +1 -1
- package/dist/content/sqlite/schema.d.ts.map +1 -1
- package/dist/content/sqlite/schema.js +18 -0
- package/dist/content/sqlite/schema.js.map +1 -1
- package/dist/content/sqlite/writes.d.ts.map +1 -1
- package/dist/content/sqlite/writes.js +6 -0
- package/dist/content/sqlite/writes.js.map +1 -1
- package/dist/content/store.d.ts +3 -3
- package/dist/content/wiki-aliases.d.ts +23 -0
- package/dist/content/wiki-aliases.d.ts.map +1 -0
- package/dist/content/wiki-aliases.js +45 -0
- package/dist/content/wiki-aliases.js.map +1 -0
- package/dist/content/wiki-mentions.d.ts +30 -0
- package/dist/content/wiki-mentions.d.ts.map +1 -0
- package/dist/content/wiki-mentions.js +120 -0
- package/dist/content/wiki-mentions.js.map +1 -0
- package/dist/content/write.d.ts +2 -2
- package/dist/content/write.d.ts.map +1 -1
- package/dist/content/write.js +26 -3
- package/dist/content/write.js.map +1 -1
- package/dist/federation/actor.d.ts.map +1 -1
- package/dist/federation/actor.js +9 -5
- package/dist/federation/actor.js.map +1 -1
- package/dist/federation/keys.d.ts.map +1 -1
- package/dist/federation/keys.js +6 -15
- package/dist/federation/keys.js.map +1 -1
- package/dist/files/atomic.d.ts +7 -1
- package/dist/files/atomic.d.ts.map +1 -1
- package/dist/files/atomic.js +75 -14
- package/dist/files/atomic.js.map +1 -1
- package/dist/files/data-files.d.ts +12 -0
- package/dist/files/data-files.d.ts.map +1 -1
- package/dist/files/data-files.js +24 -0
- package/dist/files/data-files.js.map +1 -1
- package/dist/files/lock-file.d.ts.map +1 -0
- package/dist/{jobs → files}/lock-file.js +1 -1
- package/dist/files/lock-file.js.map +1 -0
- package/dist/gemini/certificate.d.ts.map +1 -1
- package/dist/gemini/certificate.js +15 -12
- package/dist/gemini/certificate.js.map +1 -1
- package/dist/indieauth/grants.d.ts +1 -0
- package/dist/indieauth/grants.d.ts.map +1 -1
- package/dist/indieauth/grants.js.map +1 -1
- package/dist/indieauth/tokens.d.ts +4 -1
- package/dist/indieauth/tokens.d.ts.map +1 -1
- package/dist/indieauth/tokens.js +7 -3
- package/dist/indieauth/tokens.js.map +1 -1
- package/dist/jobs/file-records.js +1 -1
- package/dist/jobs/file-records.js.map +1 -1
- package/dist/jobs/processes.d.ts +0 -1
- package/dist/jobs/processes.d.ts.map +1 -1
- package/dist/jobs/processes.js +1 -9
- package/dist/jobs/processes.js.map +1 -1
- package/dist/mcp/authoring/wiki.d.ts.map +1 -1
- package/dist/mcp/authoring/wiki.js +20 -5
- package/dist/mcp/authoring/wiki.js.map +1 -1
- package/dist/notifications/mail-service.d.ts.map +1 -1
- package/dist/notifications/mail-service.js +16 -1
- package/dist/notifications/mail-service.js.map +1 -1
- package/dist/plugin.d.ts +3 -2
- package/dist/plugin.d.ts.map +1 -1
- package/dist/plugin.js.map +1 -1
- package/dist/plugins/site.d.ts.map +1 -1
- package/dist/plugins/site.js +1 -1
- package/dist/plugins/site.js.map +1 -1
- package/dist/site/admin-paths.d.ts +7 -0
- package/dist/site/admin-paths.d.ts.map +1 -1
- package/dist/site/admin-paths.js +18 -0
- package/dist/site/admin-paths.js.map +1 -1
- package/dist/site/passwords.d.ts +9 -2
- package/dist/site/passwords.d.ts.map +1 -1
- package/dist/site/passwords.js +45 -14
- package/dist/site/passwords.js.map +1 -1
- package/dist/site/users.d.ts +67 -11
- package/dist/site/users.d.ts.map +1 -1
- package/dist/site/users.js +207 -35
- package/dist/site/users.js.map +1 -1
- package/dist/store/schema.d.ts.map +1 -1
- package/dist/store/schema.js +11 -0
- package/dist/store/schema.js.map +1 -1
- package/dist/store/sessions.d.ts +3 -0
- package/dist/store/sessions.d.ts.map +1 -1
- package/dist/store/sessions.js +27 -18
- package/dist/store/sessions.js.map +1 -1
- package/dist/store/tokens.d.ts +4 -2
- package/dist/store/tokens.d.ts.map +1 -1
- package/dist/store/tokens.js +16 -10
- package/dist/store/tokens.js.map +1 -1
- package/dist/util/html-tree.d.ts +4 -0
- package/dist/util/html-tree.d.ts.map +1 -1
- package/dist/util/html-tree.js +34 -0
- package/dist/util/html-tree.js.map +1 -1
- package/dist/util/process-alive.d.ts +3 -0
- package/dist/util/process-alive.d.ts.map +1 -0
- package/dist/util/process-alive.js +11 -0
- package/dist/util/process-alive.js.map +1 -0
- package/dist/web/compression.js +2 -3
- package/dist/web/compression.js.map +1 -1
- package/dist/web/conversation-feed.d.ts +15 -4
- package/dist/web/conversation-feed.d.ts.map +1 -1
- package/dist/web/conversation-feed.js +31 -5
- package/dist/web/conversation-feed.js.map +1 -1
- package/dist/web/feed-item.d.ts +3 -1
- package/dist/web/feed-item.d.ts.map +1 -1
- package/dist/web/feed-item.js +5 -1
- package/dist/web/feed-item.js.map +1 -1
- package/dist/web/feed-routes.d.ts.map +1 -1
- package/dist/web/feed-routes.js +2 -0
- package/dist/web/feed-routes.js.map +1 -1
- package/dist/web/feed-rss.d.ts.map +1 -1
- package/dist/web/feed-rss.js +25 -2
- package/dist/web/feed-rss.js.map +1 -1
- package/dist/web/feed-source.d.ts +10 -3
- package/dist/web/feed-source.d.ts.map +1 -1
- package/dist/web/feed-source.js.map +1 -1
- package/dist/web/feeds.js +1 -1
- package/dist/web/feeds.js.map +1 -1
- package/dist/web/indieauth-bearer.js +2 -2
- package/dist/web/indieauth-bearer.js.map +1 -1
- package/dist/web/indieauth-token.js +3 -3
- package/dist/web/indieauth-token.js.map +1 -1
- package/dist/web/session.d.ts +6 -1
- package/dist/web/session.d.ts.map +1 -1
- package/dist/web/session.js +21 -3
- package/dist/web/session.js.map +1 -1
- package/dist/web/signed-in.d.ts.map +1 -1
- package/dist/web/signed-in.js +6 -2
- package/dist/web/signed-in.js.map +1 -1
- package/dist/web/throttle.d.ts +26 -18
- package/dist/web/throttle.d.ts.map +1 -1
- package/dist/web/throttle.js +130 -24
- package/dist/web/throttle.js.map +1 -1
- package/dist/webmention/reply-context/feed.d.ts +26 -0
- package/dist/webmention/reply-context/feed.d.ts.map +1 -0
- package/dist/webmention/reply-context/feed.js +107 -0
- package/dist/webmention/reply-context/feed.js.map +1 -0
- package/dist/webmention/reply-context.d.ts +5 -1
- package/dist/webmention/reply-context.d.ts.map +1 -1
- package/dist/webmention/reply-context.js +21 -10
- package/dist/webmention/reply-context.js.map +1 -1
- package/dist/webmention/reply-contexts.js +5 -0
- package/dist/webmention/reply-contexts.js.map +1 -1
- package/package.json +6 -4
- package/templates/site/gitignore +4 -0
- package/themes/default/mail/email-changed.html.njk +17 -0
- package/themes/default/mail/email-changed.subject.njk +1 -0
- package/themes/default/mail/email-changed.txt.njk +14 -0
- package/themes/default/mail/password-changed.html.njk +1 -1
- package/themes/default/mail/password-changed.txt.njk +2 -1
- package/themes/default/partials/jsonld.njk +1 -1
- package/dist/jobs/lock-file.d.ts.map +0 -1
- package/dist/jobs/lock-file.js.map +0 -1
- /package/dist/{jobs → files}/lock-file.d.ts +0 -0
package/dist/web/throttle.d.ts
CHANGED
|
@@ -6,13 +6,12 @@ import type { GeekityEnv } from './env.ts';
|
|
|
6
6
|
* How far the wait is allowed to double.
|
|
7
7
|
*
|
|
8
8
|
* The lockout doubles for every failure past the threshold, so the wait after
|
|
9
|
-
* `n` extra failures is `lockoutSeconds * 2^n`.
|
|
10
|
-
*
|
|
11
|
-
* against an attacker: anybody who can guess a username could lock it shut for
|
|
12
|
-
* good. The multiplier stops here — with the default fifteen minutes, four
|
|
13
|
-
* hours.
|
|
9
|
+
* `n` extra failures is `lockoutSeconds * 2^n`. The multiplier stops here —
|
|
10
|
+
* with the default fifteen minutes, four hours.
|
|
14
11
|
*/
|
|
15
12
|
export declare const LOCKOUT_GROWTH_LIMIT = 16;
|
|
13
|
+
export declare const THROTTLE_CAPACITY = 4096;
|
|
14
|
+
export declare const USERNAME_ATTEMPT_FACTOR = 10;
|
|
16
15
|
/** What {@link createLoginThrottle} needs to know. */
|
|
17
16
|
export interface LoginThrottleOptions {
|
|
18
17
|
/** Failed attempts a key may make before it is locked. */
|
|
@@ -20,13 +19,14 @@ export interface LoginThrottleOptions {
|
|
|
20
19
|
/** How long the first lockout lasts, in seconds. */
|
|
21
20
|
lockoutSeconds: number;
|
|
22
21
|
now: Clock;
|
|
22
|
+
lockout?: 'escalating' | 'fixed';
|
|
23
23
|
}
|
|
24
24
|
/**
|
|
25
25
|
* A count of recent failures per key, and the lockout it earns.
|
|
26
26
|
*
|
|
27
27
|
* Deliberately in memory: a restart clears it. The thing it defends against is
|
|
28
28
|
* a run of guesses over minutes, which no restart interrupts, and keeping it
|
|
29
|
-
* out of SQLite means a failed login writes nothing
|
|
29
|
+
* out of SQLite means a failed login writes nothing to disk.
|
|
30
30
|
*/
|
|
31
31
|
export interface LoginThrottle {
|
|
32
32
|
/**
|
|
@@ -39,6 +39,7 @@ export interface LoginThrottle {
|
|
|
39
39
|
fail(keys: readonly string[]): void;
|
|
40
40
|
/** Forget every failure against these keys, which is what a success does. */
|
|
41
41
|
succeed(keys: readonly string[]): void;
|
|
42
|
+
forgetPrefix(prefix: string): void;
|
|
42
43
|
/** How many keys are remembered. For the test that pins the sweeping. */
|
|
43
44
|
size(): number;
|
|
44
45
|
}
|
|
@@ -68,22 +69,29 @@ export declare function createRequestLimit(options: RequestLimitOptions): Reques
|
|
|
68
69
|
* `X-Forwarded-For` is only believed when the site says it is behind a proxy,
|
|
69
70
|
* because anybody may send it: on a site reached directly, trusting it would
|
|
70
71
|
* let one attacker put every guess on a different make-believe address and
|
|
71
|
-
* never be locked out by address at all. The
|
|
72
|
-
*
|
|
72
|
+
* never be locked out by address at all. The rightmost entry is the one the
|
|
73
|
+
* proxy in front of the site added itself; anything to its left came with the
|
|
74
|
+
* request and may be made up. Otherwise it is the socket's own address, which is
|
|
73
75
|
* unavailable when the app is being driven in process rather than served — a
|
|
74
76
|
* test, or an embedding — and `undefined` is the honest answer there.
|
|
75
77
|
*/
|
|
76
78
|
export declare function clientAddress(c: Context<GeekityEnv>, config: Pick<ResolvedConfig, 'trustProxy'>): string | undefined;
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
79
|
+
export interface SignInAttempt {
|
|
80
|
+
readonly identifier: string;
|
|
81
|
+
readonly address: string | undefined;
|
|
82
|
+
readonly confirming?: boolean;
|
|
83
|
+
}
|
|
84
|
+
export interface SignInThrottle {
|
|
85
|
+
retryAfter(attempt: SignInAttempt): number | undefined;
|
|
86
|
+
fail(attempt: SignInAttempt): void;
|
|
87
|
+
succeed(attempt: SignInAttempt): void;
|
|
88
|
+
forget(identifier: string): void;
|
|
89
|
+
}
|
|
90
|
+
export declare function createSignInThrottle(options: LoginThrottleOptions): SignInThrottle;
|
|
91
|
+
export declare function signInKeys(attempt: SignInAttempt): {
|
|
92
|
+
strict: string[];
|
|
93
|
+
wide: string[];
|
|
94
|
+
};
|
|
87
95
|
/**
|
|
88
96
|
* A wait in words, for the message the locked-out visitor reads. Rounded up,
|
|
89
97
|
* so it never says a shorter time than the one actually left.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"throttle.d.ts","sourceRoot":"","sources":["../../src/web/throttle.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"throttle.d.ts","sourceRoot":"","sources":["../../src/web/throttle.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAEpC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAE3C;;;;;;GAMG;AACH,eAAO,MAAM,oBAAoB,KAAK,CAAC;AAEvC,eAAO,MAAM,iBAAiB,OAAO,CAAC;AAEtC,eAAO,MAAM,uBAAuB,KAAK,CAAC;AAI1C,sDAAsD;AACtD,MAAM,WAAW,oBAAoB;IACnC,0DAA0D;IAC1D,QAAQ,EAAE,MAAM,CAAC;IACjB,oDAAoD;IACpD,cAAc,EAAE,MAAM,CAAC;IACvB,GAAG,EAAE,KAAK,CAAC;IACX,OAAO,CAAC,EAAE,YAAY,GAAG,OAAO,CAAC;CAClC;AAED;;;;;;GAMG;AACH,MAAM,WAAW,aAAa;IAC5B;;;;OAIG;IACH,UAAU,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,GAAG,SAAS,CAAC;IACxD,mDAAmD;IACnD,IAAI,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI,CAAC;IACpC,6EAA6E;IAC7E,OAAO,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,IAAI,CAAC;IACvC,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,yEAAyE;IACzE,IAAI,IAAI,MAAM,CAAC;CAChB;AAYD;;;;;;;;;GASG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,oBAAoB,GAAG,aAAa,CAmFhF;AAaD,MAAM,WAAW,mBAAmB;IAClC,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,MAAM,CAAC;IACtB,GAAG,EAAE,KAAK,CAAC;CACZ;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC;CACvC;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,mBAAmB,GAAG,YAAY,CAgB7E;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,aAAa,CAC3B,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,EACtB,MAAM,EAAE,IAAI,CAAC,cAAc,EAAE,YAAY,CAAC,GACzC,MAAM,GAAG,SAAS,CAapB;AAED,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,QAAQ,CAAC,UAAU,CAAC,EAAE,OAAO,CAAC;CAC/B;AAED,MAAM,WAAW,cAAc;IAC7B,UAAU,CAAC,OAAO,EAAE,aAAa,GAAG,MAAM,GAAG,SAAS,CAAC;IACvD,IAAI,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI,CAAC;IACnC,OAAO,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI,CAAC;IACtC,MAAM,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;CAClC;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,oBAAoB,GAAG,cAAc,CAkClF;AAED,wBAAgB,UAAU,CAAC,OAAO,EAAE,aAAa,GAAG;IAAE,MAAM,EAAE,MAAM,EAAE,CAAC;IAAC,IAAI,EAAE,MAAM,EAAE,CAAA;CAAE,CAOvF;AAsDD;;;GAGG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAGpD"}
|
package/dist/web/throttle.js
CHANGED
|
@@ -1,15 +1,16 @@
|
|
|
1
|
+
import { isIPv4, isIPv6 } from 'node:net';
|
|
1
2
|
import { getConnInfo } from '@hono/node-server/conninfo';
|
|
2
3
|
/**
|
|
3
4
|
* How far the wait is allowed to double.
|
|
4
5
|
*
|
|
5
6
|
* The lockout doubles for every failure past the threshold, so the wait after
|
|
6
|
-
* `n` extra failures is `lockoutSeconds * 2^n`.
|
|
7
|
-
*
|
|
8
|
-
* against an attacker: anybody who can guess a username could lock it shut for
|
|
9
|
-
* good. The multiplier stops here — with the default fifteen minutes, four
|
|
10
|
-
* hours.
|
|
7
|
+
* `n` extra failures is `lockoutSeconds * 2^n`. The multiplier stops here —
|
|
8
|
+
* with the default fifteen minutes, four hours.
|
|
11
9
|
*/
|
|
12
10
|
export const LOCKOUT_GROWTH_LIMIT = 16;
|
|
11
|
+
export const THROTTLE_CAPACITY = 4096;
|
|
12
|
+
export const USERNAME_ATTEMPT_FACTOR = 10;
|
|
13
|
+
const KEY_PART_LENGTH = 320;
|
|
13
14
|
/**
|
|
14
15
|
* Build a login throttle.
|
|
15
16
|
*
|
|
@@ -24,6 +25,7 @@ export function createLoginThrottle(options) {
|
|
|
24
25
|
const clock = options.now;
|
|
25
26
|
const attempts = Math.max(1, Math.trunc(options.attempts));
|
|
26
27
|
const window = Math.max(1, options.lockoutSeconds) * 1000;
|
|
28
|
+
const escalating = (options.lockout ?? 'escalating') === 'escalating';
|
|
27
29
|
const entries = new Map();
|
|
28
30
|
/** The row for a key, or `undefined` when it has none or its row is stale. */
|
|
29
31
|
function live(key, at) {
|
|
@@ -36,7 +38,6 @@ export function createLoginThrottle(options) {
|
|
|
36
38
|
}
|
|
37
39
|
return entry;
|
|
38
40
|
}
|
|
39
|
-
/** Drop every stale row. Cheap: the map only holds keys that failed recently. */
|
|
40
41
|
function sweep(at) {
|
|
41
42
|
for (const [key, entry] of entries) {
|
|
42
43
|
if (at >= entry.expiresAt)
|
|
@@ -66,7 +67,7 @@ export function createLoginThrottle(options) {
|
|
|
66
67
|
// so a slow trickle of typos never adds up to a lockout.
|
|
67
68
|
entry.expiresAt = at + window;
|
|
68
69
|
}
|
|
69
|
-
else {
|
|
70
|
+
else if (escalating) {
|
|
70
71
|
// The wait doubles for each failure past the threshold, and the row
|
|
71
72
|
// outlives the lockout by one window so the next failure is counted
|
|
72
73
|
// as the escalation it is rather than as a fresh start.
|
|
@@ -74,18 +75,45 @@ export function createLoginThrottle(options) {
|
|
|
74
75
|
entry.lockedUntil = at + wait;
|
|
75
76
|
entry.expiresAt = entry.lockedUntil + window;
|
|
76
77
|
}
|
|
78
|
+
else {
|
|
79
|
+
entry.lockedUntil = at + window;
|
|
80
|
+
entry.expiresAt = entry.lockedUntil;
|
|
81
|
+
}
|
|
82
|
+
// Re-inserted so the map's order is the order keys last failed in,
|
|
83
|
+
// which is what the eviction below reads.
|
|
84
|
+
entries.delete(key);
|
|
77
85
|
entries.set(key, entry);
|
|
78
86
|
}
|
|
87
|
+
evictBeyondCapacity(entries, at);
|
|
79
88
|
},
|
|
80
89
|
succeed(keys) {
|
|
81
90
|
for (const key of keys)
|
|
82
91
|
entries.delete(key);
|
|
83
92
|
},
|
|
93
|
+
forgetPrefix(prefix) {
|
|
94
|
+
for (const key of entries.keys()) {
|
|
95
|
+
if (key.startsWith(prefix))
|
|
96
|
+
entries.delete(key);
|
|
97
|
+
}
|
|
98
|
+
},
|
|
84
99
|
size() {
|
|
85
100
|
return entries.size;
|
|
86
101
|
},
|
|
87
102
|
};
|
|
88
103
|
}
|
|
104
|
+
function evictBeyondCapacity(entries, at) {
|
|
105
|
+
for (const [key, entry] of entries) {
|
|
106
|
+
if (entries.size <= THROTTLE_CAPACITY)
|
|
107
|
+
return;
|
|
108
|
+
if (entry.lockedUntil <= at)
|
|
109
|
+
entries.delete(key);
|
|
110
|
+
}
|
|
111
|
+
for (const key of entries.keys()) {
|
|
112
|
+
if (entries.size <= THROTTLE_CAPACITY)
|
|
113
|
+
return;
|
|
114
|
+
entries.delete(key);
|
|
115
|
+
}
|
|
116
|
+
}
|
|
89
117
|
export function createRequestLimit(options) {
|
|
90
118
|
const window = options.windowSeconds * 1000;
|
|
91
119
|
const entries = new Map();
|
|
@@ -109,17 +137,18 @@ export function createRequestLimit(options) {
|
|
|
109
137
|
* `X-Forwarded-For` is only believed when the site says it is behind a proxy,
|
|
110
138
|
* because anybody may send it: on a site reached directly, trusting it would
|
|
111
139
|
* let one attacker put every guess on a different make-believe address and
|
|
112
|
-
* never be locked out by address at all. The
|
|
113
|
-
*
|
|
140
|
+
* never be locked out by address at all. The rightmost entry is the one the
|
|
141
|
+
* proxy in front of the site added itself; anything to its left came with the
|
|
142
|
+
* request and may be made up. Otherwise it is the socket's own address, which is
|
|
114
143
|
* unavailable when the app is being driven in process rather than served — a
|
|
115
144
|
* test, or an embedding — and `undefined` is the honest answer there.
|
|
116
145
|
*/
|
|
117
146
|
export function clientAddress(c, config) {
|
|
118
147
|
if (config.trustProxy) {
|
|
119
148
|
const forwarded = c.req.header('x-forwarded-for');
|
|
120
|
-
const
|
|
121
|
-
if (
|
|
122
|
-
return
|
|
149
|
+
const nearest = forwarded?.split(',').at(-1)?.trim();
|
|
150
|
+
if (nearest !== undefined && nearest !== '')
|
|
151
|
+
return nearest;
|
|
123
152
|
}
|
|
124
153
|
try {
|
|
125
154
|
const address = getConnInfo(c).remote.address;
|
|
@@ -129,20 +158,97 @@ export function clientAddress(c, config) {
|
|
|
129
158
|
return undefined;
|
|
130
159
|
}
|
|
131
160
|
}
|
|
161
|
+
export function createSignInThrottle(options) {
|
|
162
|
+
const strict = createLoginThrottle(options);
|
|
163
|
+
const wide = createLoginThrottle({
|
|
164
|
+
...options,
|
|
165
|
+
attempts: Math.max(1, Math.trunc(options.attempts)) * USERNAME_ATTEMPT_FACTOR,
|
|
166
|
+
lockout: 'fixed',
|
|
167
|
+
});
|
|
168
|
+
function wait(attempt) {
|
|
169
|
+
const keys = signInKeys(attempt);
|
|
170
|
+
const waits = [strict.retryAfter(keys.strict), wide.retryAfter(keys.wide)];
|
|
171
|
+
const longest = Math.max(0, ...waits.map((each) => each ?? 0));
|
|
172
|
+
return longest > 0 ? longest : undefined;
|
|
173
|
+
}
|
|
174
|
+
return {
|
|
175
|
+
retryAfter: wait,
|
|
176
|
+
fail(attempt) {
|
|
177
|
+
const keys = signInKeys(attempt);
|
|
178
|
+
strict.fail(keys.strict);
|
|
179
|
+
wide.fail(keys.wide);
|
|
180
|
+
},
|
|
181
|
+
succeed(attempt) {
|
|
182
|
+
const keys = signInKeys(attempt);
|
|
183
|
+
strict.succeed(keys.strict);
|
|
184
|
+
wide.succeed(keys.wide);
|
|
185
|
+
},
|
|
186
|
+
forget(identifier) {
|
|
187
|
+
const name = keyPart(identifier);
|
|
188
|
+
strict.forgetPrefix(pairKey(name, ''));
|
|
189
|
+
strict.succeed([confirmingKey(name)]);
|
|
190
|
+
wide.succeed([identifierKey(name)]);
|
|
191
|
+
},
|
|
192
|
+
};
|
|
193
|
+
}
|
|
194
|
+
export function signInKeys(attempt) {
|
|
195
|
+
const name = keyPart(attempt.identifier);
|
|
196
|
+
const address = attempt.address === undefined ? undefined : addressKey(attempt.address);
|
|
197
|
+
const strict = [pairKey(name, address ?? '')];
|
|
198
|
+
if (address !== undefined)
|
|
199
|
+
strict.push(`addr:${address}`);
|
|
200
|
+
if (attempt.confirming === true)
|
|
201
|
+
strict.push(confirmingKey(name));
|
|
202
|
+
return { strict, wide: [identifierKey(name)] };
|
|
203
|
+
}
|
|
132
204
|
/**
|
|
133
|
-
* The
|
|
134
|
-
*
|
|
135
|
-
*
|
|
136
|
-
* The username is folded to lower case so `Ada` and `ada` are one key, and it
|
|
137
|
-
* is used whether or not any such user exists — a username nobody has locks
|
|
138
|
-
* out exactly as a real one does, so the lockout cannot be used to find out
|
|
139
|
-
* which usernames the site has.
|
|
205
|
+
* The address as a throttle counts it. An IPv6 client is usually handed a
|
|
206
|
+
* whole /64, so counting each address in it separately would give one client
|
|
207
|
+
* more addresses than it could ever be locked out of.
|
|
140
208
|
*/
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
209
|
+
function addressKey(address) {
|
|
210
|
+
if (isIPv4(address))
|
|
211
|
+
return address;
|
|
212
|
+
const groups = ipv6Groups(address);
|
|
213
|
+
if (groups === undefined)
|
|
214
|
+
return address.slice(0, KEY_PART_LENGTH);
|
|
215
|
+
if (groups.slice(0, 5).every((group) => group === 0) && groups[5] === 0xffff) {
|
|
216
|
+
const [high = 0, low = 0] = groups.slice(6);
|
|
217
|
+
return [high >> 8, high & 0xff, low >> 8, low & 0xff].join('.');
|
|
218
|
+
}
|
|
219
|
+
return `${groups
|
|
220
|
+
.slice(0, 4)
|
|
221
|
+
.map((group) => group.toString(16))
|
|
222
|
+
.join(':')}::/64`;
|
|
223
|
+
}
|
|
224
|
+
function ipv6Groups(address) {
|
|
225
|
+
let text = address.split('%')[0] ?? '';
|
|
226
|
+
if (!isIPv6(text))
|
|
227
|
+
return undefined;
|
|
228
|
+
const embedded = /(\d+)\.(\d+)\.(\d+)\.(\d+)$/.exec(text);
|
|
229
|
+
if (embedded !== null) {
|
|
230
|
+
const [a, b, c, d] = embedded.slice(1).map(Number);
|
|
231
|
+
text = `${text.slice(0, embedded.index)}${((a << 8) | b).toString(16)}:${((c << 8) | d).toString(16)}`;
|
|
232
|
+
}
|
|
233
|
+
const hex = (part) => part === '' ? [] : part.split(':').map((group) => Number.parseInt(group, 16));
|
|
234
|
+
const [head = '', tail] = text.split('::');
|
|
235
|
+
if (tail === undefined)
|
|
236
|
+
return hex(head);
|
|
237
|
+
const before = hex(head);
|
|
238
|
+
const after = hex(tail);
|
|
239
|
+
return [...before, ...Array(8 - before.length - after.length).fill(0), ...after];
|
|
240
|
+
}
|
|
241
|
+
function keyPart(identifier) {
|
|
242
|
+
return identifier.slice(0, KEY_PART_LENGTH).toLowerCase();
|
|
243
|
+
}
|
|
244
|
+
function pairKey(name, address) {
|
|
245
|
+
return `pair:${name}\u0000${address}`;
|
|
246
|
+
}
|
|
247
|
+
function confirmingKey(name) {
|
|
248
|
+
return `session:${name}`;
|
|
249
|
+
}
|
|
250
|
+
function identifierKey(name) {
|
|
251
|
+
return `user:${name}`;
|
|
146
252
|
}
|
|
147
253
|
/**
|
|
148
254
|
* A wait in words, for the message the locked-out visitor reads. Rounded up,
|
package/dist/web/throttle.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"throttle.js","sourceRoot":"","sources":["../../src/web/throttle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAOzD
|
|
1
|
+
{"version":3,"file":"throttle.js","sourceRoot":"","sources":["../../src/web/throttle.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import type { HtmlPage } from './page.ts';
|
|
2
|
+
import type { Limits } from './source.ts';
|
|
3
|
+
/**
|
|
4
|
+
* The RSS feed a cited post is published in, which `source:inReplyTo` names
|
|
5
|
+
* in its `feedUrl` and `feedTitle` so a reader can follow the other side of a
|
|
6
|
+
* conversation.
|
|
7
|
+
*/
|
|
8
|
+
export interface AnsweredFeed {
|
|
9
|
+
readonly url: string;
|
|
10
|
+
/** Left out when the feed has no title. */
|
|
11
|
+
readonly title?: string;
|
|
12
|
+
}
|
|
13
|
+
/**
|
|
14
|
+
* The feed a page's post is in: the RSS feed the page advertises, when an item
|
|
15
|
+
* there is the post. An item that names the feed it came from in an RSS 2.0
|
|
16
|
+
* `<source>` is credited to that feed instead, which is how a site-wide feed
|
|
17
|
+
* such as rss.chat's points at each author's own.
|
|
18
|
+
*/
|
|
19
|
+
export declare function answeredFeed(page: HtmlPage, target: string, limits: Limits): Promise<AnsweredFeed | undefined>;
|
|
20
|
+
/**
|
|
21
|
+
* Which feed an RSS document credits with the item whose `guid` or `link` is
|
|
22
|
+
* one of `names`, or `undefined` when no item is. Reads what it can of a feed
|
|
23
|
+
* that is cut short or not quite well-formed.
|
|
24
|
+
*/
|
|
25
|
+
export declare function feedHolding(xml: string, feedUrl: string, names: ReadonlySet<string>): AnsweredFeed | undefined;
|
|
26
|
+
//# sourceMappingURL=feed.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"feed.d.ts","sourceRoot":"","sources":["../../../src/webmention/reply-context/feed.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAE1C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAE1C;;;;GAIG;AACH,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,2CAA2C;IAC3C,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;CACzB;AAID;;;;;GAKG;AACH,wBAAsB,YAAY,CAChC,IAAI,EAAE,QAAQ,EACd,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,YAAY,GAAG,SAAS,CAAC,CAkBnC;AAYD;;;;GAIG;AACH,wBAAgB,WAAW,CACzB,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,WAAW,CAAC,MAAM,CAAC,GACzB,YAAY,GAAG,SAAS,CA8C1B"}
|
|
@@ -0,0 +1,107 @@
|
|
|
1
|
+
import sax from 'sax';
|
|
2
|
+
import { elementsIn, hasRel } from '../../util/html-tree.js';
|
|
3
|
+
import { fetchPublic, webUrl } from '../fetch-public.js';
|
|
4
|
+
import { canonicalLink } from './page.js';
|
|
5
|
+
import { resolved, withoutDirectionControls } from './source.js';
|
|
6
|
+
const RSS_TYPE = /^\s*application\/rss\+xml\s*(;|$)/i;
|
|
7
|
+
/**
|
|
8
|
+
* The feed a page's post is in: the RSS feed the page advertises, when an item
|
|
9
|
+
* there is the post. An item that names the feed it came from in an RSS 2.0
|
|
10
|
+
* `<source>` is credited to that feed instead, which is how a site-wide feed
|
|
11
|
+
* such as rss.chat's points at each author's own.
|
|
12
|
+
*/
|
|
13
|
+
export async function answeredFeed(page, target, limits) {
|
|
14
|
+
const href = advertisedFeed(page);
|
|
15
|
+
if (href === undefined || limits.deadline.aborted)
|
|
16
|
+
return undefined;
|
|
17
|
+
const fetched = await fetchPublic(href, {
|
|
18
|
+
lookup: limits.lookup,
|
|
19
|
+
signal: limits.deadline,
|
|
20
|
+
maxBytes: limits.maxBytes,
|
|
21
|
+
overflow: 'truncate',
|
|
22
|
+
accept: 'application/rss+xml, application/xml;q=0.9, text/xml;q=0.9',
|
|
23
|
+
contentType: { pattern: /xml/i, name: 'an RSS feed' },
|
|
24
|
+
});
|
|
25
|
+
if (!fetched.ok)
|
|
26
|
+
return undefined;
|
|
27
|
+
const names = new Set([target, page.url, canonicalLink(page.root, page.url)].filter((url) => url !== undefined));
|
|
28
|
+
return feedHolding(new TextDecoder().decode(fetched.body), fetched.url, names);
|
|
29
|
+
}
|
|
30
|
+
function advertisedFeed(page) {
|
|
31
|
+
for (const element of elementsIn(page.root)) {
|
|
32
|
+
if (element.name !== 'link' || !hasRel(element, 'alternate'))
|
|
33
|
+
continue;
|
|
34
|
+
if (!RSS_TYPE.test(element.attributes['type'] ?? ''))
|
|
35
|
+
continue;
|
|
36
|
+
const href = resolved(element.attributes['href'], page.url);
|
|
37
|
+
if (href !== undefined)
|
|
38
|
+
return href;
|
|
39
|
+
}
|
|
40
|
+
return undefined;
|
|
41
|
+
}
|
|
42
|
+
/**
|
|
43
|
+
* Which feed an RSS document credits with the item whose `guid` or `link` is
|
|
44
|
+
* one of `names`, or `undefined` when no item is. Reads what it can of a feed
|
|
45
|
+
* that is cut short or not quite well-formed.
|
|
46
|
+
*/
|
|
47
|
+
export function feedHolding(xml, feedUrl, names) {
|
|
48
|
+
const wanted = new Set([...names].map(normalized));
|
|
49
|
+
const parser = sax.parser(true, { trim: false, normalize: false });
|
|
50
|
+
const path = [];
|
|
51
|
+
let channelTitle = '';
|
|
52
|
+
let text = '';
|
|
53
|
+
let item;
|
|
54
|
+
let found;
|
|
55
|
+
parser.onopentag = (tag) => {
|
|
56
|
+
path.push(tag.name);
|
|
57
|
+
text = '';
|
|
58
|
+
if (tag.name === 'item' && path.at(-2) === 'channel')
|
|
59
|
+
item = { names: [], sourceTitle: '' };
|
|
60
|
+
const url = tag.attributes['url'];
|
|
61
|
+
if (item !== undefined && tag.name === 'source' && typeof url === 'string') {
|
|
62
|
+
item.source = url;
|
|
63
|
+
}
|
|
64
|
+
};
|
|
65
|
+
parser.onclosetag = (name) => {
|
|
66
|
+
const parent = path.at(-2);
|
|
67
|
+
if (name === 'title' && parent === 'channel')
|
|
68
|
+
channelTitle = text;
|
|
69
|
+
if (item !== undefined && parent === 'item') {
|
|
70
|
+
if (name === 'guid' || name === 'link')
|
|
71
|
+
item.names.push(normalized(text.trim()));
|
|
72
|
+
if (name === 'source')
|
|
73
|
+
item.sourceTitle = text;
|
|
74
|
+
}
|
|
75
|
+
if (name === 'item' && item !== undefined) {
|
|
76
|
+
if (found === undefined && item.names.some((named) => wanted.has(named))) {
|
|
77
|
+
found = credited(item, feedUrl, channelTitle);
|
|
78
|
+
}
|
|
79
|
+
item = undefined;
|
|
80
|
+
}
|
|
81
|
+
path.pop();
|
|
82
|
+
text = '';
|
|
83
|
+
};
|
|
84
|
+
const append = (chunk) => {
|
|
85
|
+
text += chunk;
|
|
86
|
+
};
|
|
87
|
+
parser.ontext = append;
|
|
88
|
+
parser.oncdata = append;
|
|
89
|
+
parser.onerror = () => {
|
|
90
|
+
parser.error = null;
|
|
91
|
+
parser.resume();
|
|
92
|
+
};
|
|
93
|
+
parser.write(xml).close();
|
|
94
|
+
return found;
|
|
95
|
+
}
|
|
96
|
+
function credited(item, feedUrl, channelTitle) {
|
|
97
|
+
const source = item.source === undefined ? undefined : resolved(item.source, feedUrl);
|
|
98
|
+
const url = source ?? webUrl(feedUrl)?.href;
|
|
99
|
+
if (url === undefined)
|
|
100
|
+
return undefined;
|
|
101
|
+
const title = withoutDirectionControls(source === undefined ? channelTitle : item.sourceTitle);
|
|
102
|
+
return { url, ...(title === '' ? {} : { title }) };
|
|
103
|
+
}
|
|
104
|
+
function normalized(url) {
|
|
105
|
+
return webUrl(url)?.href ?? url;
|
|
106
|
+
}
|
|
107
|
+
//# sourceMappingURL=feed.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"feed.js","sourceRoot":"","sources":["../../../src/webmention/reply-context/feed.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,8 +2,10 @@ import type { HeldAt } from '../comments/conversation.ts';
|
|
|
2
2
|
import type { CitedImage, CitedPicture, PictureSource } from './cited-picture.ts';
|
|
3
3
|
import type { HostLookup } from '../util/public-address.ts';
|
|
4
4
|
import type { FediverseLookup } from './reply-context/fediverse.ts';
|
|
5
|
+
import type { AnsweredFeed } from './reply-context/feed.ts';
|
|
5
6
|
import type { Oembed } from './reply-context/oembed.ts';
|
|
6
7
|
export type { FediverseLookup, FediversePost } from './reply-context/fediverse.ts';
|
|
8
|
+
export type { AnsweredFeed } from './reply-context/feed.ts';
|
|
7
9
|
/**
|
|
8
10
|
* Reply context: what a reply shows of the post it answers.
|
|
9
11
|
*
|
|
@@ -56,6 +58,8 @@ export interface ReplyContext {
|
|
|
56
58
|
readonly location?: string;
|
|
57
59
|
/** Its picture, copied into the site's uploads. */
|
|
58
60
|
readonly picture?: CitedPicture;
|
|
61
|
+
/** The RSS feed it is published in, when its page names one that holds it. */
|
|
62
|
+
readonly feed?: AnsweredFeed;
|
|
59
63
|
}
|
|
60
64
|
export interface CitedAuthor {
|
|
61
65
|
readonly name: string;
|
|
@@ -118,5 +122,5 @@ export declare function readReplyContext(html: string, target: string, base?: st
|
|
|
118
122
|
* fetched, so a reply to a comment shows the comment rather than the whole
|
|
119
123
|
* post it is on, and a reply to the site's own post never fetches its page.
|
|
120
124
|
*/
|
|
121
|
-
export declare function heldReplyContext(target: string, held: HeldAt): ReplyContext;
|
|
125
|
+
export declare function heldReplyContext(target: string, held: HeldAt, feed?: AnsweredFeed): ReplyContext;
|
|
122
126
|
//# sourceMappingURL=reply-context.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reply-context.d.ts","sourceRoot":"","sources":["../../src/webmention/reply-context.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAIlF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAE5D,OAAO,KAAK,EAAE,eAAe,EAAiB,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"reply-context.d.ts","sourceRoot":"","sources":["../../src/webmention/reply-context.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ import { readCitedStart } from './cited-start.js';
|
|
|
5
5
|
import { webUrl } from './fetch-public.js';
|
|
6
6
|
import { citedEntry } from './microformats.js';
|
|
7
7
|
import { fediversePostOf, fediverseSource } from './reply-context/fediverse.js';
|
|
8
|
+
import { answeredFeed } from './reply-context/feed.js';
|
|
8
9
|
import { jsonLdEventSource, jsonLdSource } from './reply-context/json-ld.js';
|
|
9
10
|
import { fetchOembed, knownEndpoint, oembedEndpoint, oembedSource, withoutSuffix, } from './reply-context/oembed.js';
|
|
10
11
|
import { canonicalLink, entrySource, eventSource, pageSource, readPage, syndicationOf, } from './reply-context/page.js';
|
|
@@ -63,15 +64,24 @@ export async function fetchReplyContext(target, options) {
|
|
|
63
64
|
if (read.page === undefined) {
|
|
64
65
|
return { ok: true, context: { url: target }, picture: { url: read.image, kind: 'photo' } };
|
|
65
66
|
}
|
|
66
|
-
const
|
|
67
|
-
const
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
67
|
+
const citedPage = read.page;
|
|
68
|
+
const post = await fediversePostOf(citedPage, options.fediverse, limits);
|
|
69
|
+
const original = known === undefined ? await originalOf(target, citedPage, post, limits) : undefined;
|
|
70
|
+
const found = (original === undefined
|
|
71
|
+
? undefined
|
|
72
|
+
: await describeOriginal(target, original, options.fediverse, limits)) ??
|
|
73
|
+
(await describePage(target, citedPage, post, known, limits));
|
|
74
|
+
if (found === undefined)
|
|
75
|
+
return refuse('nothing to show');
|
|
76
|
+
const feed = await answeredFeed(citedPage, target, limits);
|
|
77
|
+
return feed === undefined ? found : { ...found, context: { ...found.context, feed } };
|
|
78
|
+
}
|
|
79
|
+
async function describeOriginal(target, original, fediverse, limits) {
|
|
80
|
+
const post = await fediversePostOf(original, fediverse, limits);
|
|
81
|
+
const found = await describePage(target, original, post, undefined, limits);
|
|
82
|
+
return found === undefined
|
|
83
|
+
? undefined
|
|
84
|
+
: { ...found, context: { ...found.context, original: original.url } };
|
|
75
85
|
}
|
|
76
86
|
async function describePage(target, page, post, known, limits) {
|
|
77
87
|
const { root, url, entry, event } = page;
|
|
@@ -198,7 +208,7 @@ export function readReplyContext(html, target, base = target, oembed) {
|
|
|
198
208
|
* fetched, so a reply to a comment shows the comment rather than the whole
|
|
199
209
|
* post it is on, and a reply to the site's own post never fetches its page.
|
|
200
210
|
*/
|
|
201
|
-
export function heldReplyContext(target, held) {
|
|
211
|
+
export function heldReplyContext(target, held, feed) {
|
|
202
212
|
const said = held.kind === 'reply'
|
|
203
213
|
? held.reply
|
|
204
214
|
: {
|
|
@@ -216,6 +226,7 @@ export function heldReplyContext(target, held) {
|
|
|
216
226
|
...(text === '' ? {} : { text }),
|
|
217
227
|
author: { name: said.author.name, ...(url === undefined ? {} : { url: url.href }) },
|
|
218
228
|
published: said.published.toISOString(),
|
|
229
|
+
...(feed === undefined ? {} : { feed }),
|
|
219
230
|
};
|
|
220
231
|
}
|
|
221
232
|
/** The first words of a text, marked as cut when they are. */
|