@geekity/cms 0.51.0 → 0.52.1
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/components/badge.njk +1 -0
- package/admin/pages/account/forgot.njk +13 -7
- package/admin/pages/account/reset.njk +1 -1
- package/admin/pages/federation/followers.njk +8 -4
- package/admin/pages/federation/resend.njk +2 -2
- package/admin/pages/users/edit.njk +36 -4
- package/admin/pages/users/new.njk +19 -1
- package/admin/static/admin.css +27 -37
- 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 +1 -15
- package/dist/admin/documents.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/federation.d.ts +4 -4
- package/dist/admin/federation.d.ts.map +1 -1
- package/dist/admin/federation.js +31 -16
- package/dist/admin/federation.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 +4 -3
- 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/taxonomy.d.ts.map +1 -1
- package/dist/admin/taxonomy.js +28 -19
- package/dist/admin/taxonomy.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 +166 -43
- package/dist/admin/users.js.map +1 -1
- package/dist/cli/commands.d.ts.map +1 -1
- package/dist/cli/commands.js +13 -2
- 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/resend.d.ts.map +1 -1
- package/dist/cli/resend.js +26 -5
- package/dist/cli/resend.js.map +1 -1
- package/dist/cli/run-job.d.ts +1 -1
- package/dist/cli/run-job.d.ts.map +1 -1
- package/dist/cli/run-job.js +2 -2
- package/dist/cli/run-job.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 +79 -12
- package/dist/cli/user.js.map +1 -1
- package/dist/cms/services.d.ts.map +1 -1
- package/dist/cms/services.js +36 -14
- package/dist/cms/services.js.map +1 -1
- package/dist/config.d.ts +16 -4
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +6 -1
- package/dist/config.js.map +1 -1
- package/dist/content/authors.d.ts +6 -0
- package/dist/content/authors.d.ts.map +1 -1
- package/dist/content/authors.js +9 -0
- package/dist/content/authors.js.map +1 -1
- package/dist/content/reconcile.d.ts.map +1 -1
- package/dist/content/reconcile.js +20 -14
- package/dist/content/reconcile.js.map +1 -1
- package/dist/content/save.d.ts +33 -0
- package/dist/content/save.d.ts.map +1 -1
- package/dist/content/save.js +84 -5
- package/dist/content/save.js.map +1 -1
- package/dist/content/schedule.d.ts.map +1 -1
- package/dist/content/schedule.js +30 -6
- package/dist/content/schedule.js.map +1 -1
- package/dist/content/sync.d.ts +7 -0
- package/dist/content/sync.d.ts.map +1 -1
- package/dist/content/sync.js +41 -9
- package/dist/content/sync.js.map +1 -1
- package/dist/content/trash.d.ts.map +1 -1
- package/dist/content/trash.js +24 -17
- package/dist/content/trash.js.map +1 -1
- package/dist/content/write.d.ts.map +1 -1
- package/dist/content/write.js +64 -41
- 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/article.d.ts +27 -13
- package/dist/federation/article.d.ts.map +1 -1
- package/dist/federation/article.js +44 -33
- package/dist/federation/article.js.map +1 -1
- package/dist/federation/backfill.d.ts.map +1 -1
- package/dist/federation/backfill.js +3 -3
- package/dist/federation/backfill.js.map +1 -1
- package/dist/federation/citations.d.ts +1 -1
- package/dist/federation/citations.d.ts.map +1 -1
- package/dist/federation/citations.js +74 -19
- package/dist/federation/citations.js.map +1 -1
- package/dist/federation/delivery-plan.d.ts +17 -2
- package/dist/federation/delivery-plan.d.ts.map +1 -1
- package/dist/federation/delivery-plan.js +66 -6
- package/dist/federation/delivery-plan.js.map +1 -1
- package/dist/federation/delivery.d.ts +22 -19
- package/dist/federation/delivery.d.ts.map +1 -1
- package/dist/federation/delivery.js +186 -120
- package/dist/federation/delivery.js.map +1 -1
- package/dist/federation/federation.d.ts.map +1 -1
- package/dist/federation/federation.js +1 -3
- package/dist/federation/federation.js.map +1 -1
- package/dist/federation/handles.d.ts.map +1 -1
- package/dist/federation/handles.js +22 -1
- package/dist/federation/handles.js.map +1 -1
- package/dist/federation/keys.d.ts +5 -0
- package/dist/federation/keys.d.ts.map +1 -1
- package/dist/federation/keys.js +32 -16
- package/dist/federation/keys.js.map +1 -1
- package/dist/federation/object-ids.d.ts.map +1 -1
- package/dist/federation/object-ids.js +32 -13
- package/dist/federation/object-ids.js.map +1 -1
- package/dist/federation/ordered-queue.d.ts +16 -0
- package/dist/federation/ordered-queue.d.ts.map +1 -0
- package/dist/federation/ordered-queue.js +77 -0
- package/dist/federation/ordered-queue.js.map +1 -0
- package/dist/federation/outbox-observer.d.ts +3 -1
- package/dist/federation/outbox-observer.d.ts.map +1 -1
- package/dist/federation/outbox-observer.js +18 -6
- package/dist/federation/outbox-observer.js.map +1 -1
- package/dist/federation/paths.d.ts +3 -4
- package/dist/federation/paths.d.ts.map +1 -1
- package/dist/federation/paths.js +3 -4
- package/dist/federation/paths.js.map +1 -1
- package/dist/federation/profiles.d.ts.map +1 -1
- package/dist/federation/profiles.js +5 -4
- package/dist/federation/profiles.js.map +1 -1
- package/dist/federation/queue.d.ts +9 -4
- package/dist/federation/queue.d.ts.map +1 -1
- package/dist/federation/queue.js +12 -6
- package/dist/federation/queue.js.map +1 -1
- package/dist/federation/records.d.ts.map +1 -1
- package/dist/federation/records.js +17 -1
- package/dist/federation/records.js.map +1 -1
- package/dist/federation/relays.d.ts +20 -11
- package/dist/federation/relays.d.ts.map +1 -1
- package/dist/federation/relays.js +108 -83
- package/dist/federation/relays.js.map +1 -1
- package/dist/federation/reply-targets.d.ts +5 -2
- package/dist/federation/reply-targets.d.ts.map +1 -1
- package/dist/federation/reply-targets.js +24 -14
- package/dist/federation/reply-targets.js.map +1 -1
- package/dist/federation/resend-job.d.ts +10 -4
- package/dist/federation/resend-job.d.ts.map +1 -1
- package/dist/federation/resend-job.js +27 -19
- package/dist/federation/resend-job.js.map +1 -1
- package/dist/federation/retry-job.d.ts +26 -8
- package/dist/federation/retry-job.d.ts.map +1 -1
- package/dist/federation/retry-job.js +114 -45
- package/dist/federation/retry-job.js.map +1 -1
- package/dist/federation/send-deadline.d.ts +13 -0
- package/dist/federation/send-deadline.d.ts.map +1 -0
- package/dist/federation/send-deadline.js +30 -0
- package/dist/federation/send-deadline.js.map +1 -0
- 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/jobs/queue.d.ts.map +1 -1
- package/dist/jobs/queue.js +5 -4
- package/dist/jobs/queue.js.map +1 -1
- package/dist/jobs/types.d.ts +8 -2
- package/dist/jobs/types.d.ts.map +1 -1
- package/dist/jobs/types.js.map +1 -1
- package/dist/mcp/authoring/shared.d.ts.map +1 -1
- package/dist/mcp/authoring/shared.js +2 -3
- package/dist/mcp/authoring/shared.js.map +1 -1
- package/dist/mcp/repair/resend.js +1 -1
- package/dist/mcp/repair/resend.js.map +1 -1
- package/dist/mcp/repair/retry.d.ts.map +1 -1
- package/dist/mcp/repair/retry.js +20 -8
- package/dist/mcp/repair/retry.js.map +1 -1
- package/dist/micropub/endpoint.d.ts.map +1 -1
- package/dist/micropub/endpoint.js +3 -6
- package/dist/micropub/endpoint.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/privacy/retention.d.ts.map +1 -1
- package/dist/privacy/retention.js +9 -0
- package/dist/privacy/retention.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/setting-values.d.ts +3 -2
- package/dist/site/setting-values.d.ts.map +1 -1
- package/dist/site/setting-values.js +7 -4
- package/dist/site/setting-values.js.map +1 -1
- package/dist/site/users.d.ts +85 -11
- package/dist/site/users.d.ts.map +1 -1
- package/dist/site/users.js +237 -37
- package/dist/site/users.js.map +1 -1
- package/dist/store/deliveries.d.ts +24 -5
- package/dist/store/deliveries.d.ts.map +1 -1
- package/dist/store/deliveries.js +86 -31
- package/dist/store/deliveries.js.map +1 -1
- package/dist/store/queue-database.d.ts +19 -2
- package/dist/store/queue-database.d.ts.map +1 -1
- package/dist/store/queue-database.js +69 -4
- package/dist/store/queue-database.js.map +1 -1
- package/dist/store/queue-order.d.ts +17 -0
- package/dist/store/queue-order.d.ts.map +1 -0
- package/dist/store/queue-order.js +33 -0
- package/dist/store/queue-order.js.map +1 -0
- package/dist/store/relays.d.ts +5 -3
- package/dist/store/relays.d.ts.map +1 -1
- package/dist/store/relays.js +1 -1
- package/dist/store/relays.js.map +1 -1
- package/dist/store/schema.d.ts.map +1 -1
- package/dist/store/schema.js +23 -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/errors.d.ts +6 -0
- package/dist/util/errors.d.ts.map +1 -1
- package/dist/util/errors.js +11 -0
- package/dist/util/errors.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/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/service.d.ts +2 -2
- package/dist/webmention/service.d.ts.map +1 -1
- package/dist/webmention/service.js +3 -16
- package/dist/webmention/service.js.map +1 -1
- package/package.json +11 -11
- 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/themes/default/static/style.css +8 -8
- 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
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retention.js","sourceRoot":"","sources":["../../src/privacy/retention.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEvE,OAAO,EACL,oBAAoB,EACpB,mBAAmB,EACnB,oBAAoB,GACrB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AAEtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAExD,OAAO,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAGvD;;;;;;;;;;;GAWG;AAEH,qDAAqD;AACrD,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"retention.js","sourceRoot":"","sources":["../../src/privacy/retention.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,4 +23,11 @@ export declare function editUserPath(id: number): string;
|
|
|
23
23
|
export declare const WIKI_ADMIN_PATH = "/admin/wiki";
|
|
24
24
|
export declare function newWikiPagePath(slug: string, title: string): string;
|
|
25
25
|
export declare const PREVIEW_PATH = "/admin/preview";
|
|
26
|
+
/**
|
|
27
|
+
* A return address that stays in the admin, or `undefined`.
|
|
28
|
+
*
|
|
29
|
+
* Only a path under `/admin` that starts with a single slash, in printable
|
|
30
|
+
* ASCII with no backslash, which a browser could read as a different host.
|
|
31
|
+
*/
|
|
32
|
+
export declare function returnPath(value: unknown): string | undefined;
|
|
26
33
|
//# sourceMappingURL=admin-paths.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"admin-paths.d.ts","sourceRoot":"","sources":["../../src/site/admin-paths.ts"],"names":[],"mappings":"AAAA,kEAAkE;AAClE,eAAO,MAAM,YAAY,WAAW,CAAC;AAErC;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,oBAA6B,CAAC;AAE7D,kCAAkC;AAClC,eAAO,MAAM,UAAU,iBAA0B,CAAC;AAElD,qCAAqC;AACrC,eAAO,MAAM,UAAU,iBAA0B,CAAC;AAElD;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAE/C;AAED,eAAO,MAAM,eAAe,gBAAyB,CAAC;AAEtD,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAEnE;AAED,eAAO,MAAM,YAAY,mBAA4B,CAAC"}
|
|
1
|
+
{"version":3,"file":"admin-paths.d.ts","sourceRoot":"","sources":["../../src/site/admin-paths.ts"],"names":[],"mappings":"AAAA,kEAAkE;AAClE,eAAO,MAAM,YAAY,WAAW,CAAC;AAErC;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,oBAA6B,CAAC;AAE7D,kCAAkC;AAClC,eAAO,MAAM,UAAU,iBAA0B,CAAC;AAElD,qCAAqC;AACrC,eAAO,MAAM,UAAU,iBAA0B,CAAC;AAElD;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAE/C;AAED,eAAO,MAAM,eAAe,gBAAyB,CAAC;AAEtD,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAEnE;AAED,eAAO,MAAM,YAAY,mBAA4B,CAAC;AAEtD;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAO7D"}
|
package/dist/site/admin-paths.js
CHANGED
|
@@ -27,4 +27,22 @@ export function newWikiPagePath(slug, title) {
|
|
|
27
27
|
return `${WIKI_ADMIN_PATH}/new?${new URLSearchParams({ slug, title }).toString()}`;
|
|
28
28
|
}
|
|
29
29
|
export const PREVIEW_PATH = `${ADMIN_PREFIX}/preview`;
|
|
30
|
+
/**
|
|
31
|
+
* A return address that stays in the admin, or `undefined`.
|
|
32
|
+
*
|
|
33
|
+
* Only a path under `/admin` that starts with a single slash, in printable
|
|
34
|
+
* ASCII with no backslash, which a browser could read as a different host.
|
|
35
|
+
*/
|
|
36
|
+
export function returnPath(value) {
|
|
37
|
+
if (typeof value !== 'string' || !/^\/(?!\/)[!-[\]-~]*$/.test(value))
|
|
38
|
+
return undefined;
|
|
39
|
+
const url = URL.parse(value, PLACEHOLDER_ORIGIN);
|
|
40
|
+
if (url === null || url.origin !== PLACEHOLDER_ORIGIN)
|
|
41
|
+
return undefined;
|
|
42
|
+
const { pathname, search, hash } = url;
|
|
43
|
+
if (pathname !== ADMIN_PREFIX && !pathname.startsWith(`${ADMIN_PREFIX}/`))
|
|
44
|
+
return undefined;
|
|
45
|
+
return `${pathname}${search}${hash}`;
|
|
46
|
+
}
|
|
47
|
+
const PLACEHOLDER_ORIGIN = 'http://admin.invalid';
|
|
30
48
|
//# sourceMappingURL=admin-paths.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"admin-paths.js","sourceRoot":"","sources":["../../src/site/admin-paths.ts"],"names":[],"mappings":"AAAA,kEAAkE;AAClE,MAAM,CAAC,MAAM,YAAY,GAAG,QAAQ,CAAC;AAErC;;;;;GAKG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAG,YAAY,WAAW,CAAC;AAE7D,kCAAkC;AAClC,MAAM,CAAC,MAAM,UAAU,GAAG,GAAG,YAAY,QAAQ,CAAC;AAElD,qCAAqC;AACrC,MAAM,CAAC,MAAM,UAAU,GAAG,GAAG,YAAY,QAAQ,CAAC;AAElD;;;;;;;GAOG;AACH,MAAM,UAAU,YAAY,CAAC,EAAU;IACrC,OAAO,GAAG,UAAU,IAAI,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC;AACvC,CAAC;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,GAAG,YAAY,OAAO,CAAC;AAEtD,MAAM,UAAU,eAAe,CAAC,IAAY,EAAE,KAAa;IACzD,OAAO,GAAG,eAAe,QAAQ,IAAI,eAAe,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC;AACrF,CAAC;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,YAAY,UAAU,CAAC"}
|
|
1
|
+
{"version":3,"file":"admin-paths.js","sourceRoot":"","sources":["../../src/site/admin-paths.ts"],"names":[],"mappings":"AAAA,kEAAkE;AAClE,MAAM,CAAC,MAAM,YAAY,GAAG,QAAQ,CAAC;AAErC;;;;;GAKG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAG,YAAY,WAAW,CAAC;AAE7D,kCAAkC;AAClC,MAAM,CAAC,MAAM,UAAU,GAAG,GAAG,YAAY,QAAQ,CAAC;AAElD,qCAAqC;AACrC,MAAM,CAAC,MAAM,UAAU,GAAG,GAAG,YAAY,QAAQ,CAAC;AAElD;;;;;;;GAOG;AACH,MAAM,UAAU,YAAY,CAAC,EAAU;IACrC,OAAO,GAAG,UAAU,IAAI,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC;AACvC,CAAC;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,GAAG,YAAY,OAAO,CAAC;AAEtD,MAAM,UAAU,eAAe,CAAC,IAAY,EAAE,KAAa;IACzD,OAAO,GAAG,eAAe,QAAQ,IAAI,eAAe,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC;AACrF,CAAC;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,YAAY,UAAU,CAAC;AAEtD;;;;;GAKG;AACH,MAAM,UAAU,UAAU,CAAC,KAAc;IACvC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IACvF,MAAM,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE,kBAAkB,CAAC,CAAC;IACjD,IAAI,GAAG,KAAK,IAAI,IAAI,GAAG,CAAC,MAAM,KAAK,kBAAkB;QAAE,OAAO,SAAS,CAAC;IACxE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC;IACvC,IAAI,QAAQ,KAAK,YAAY,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,YAAY,GAAG,CAAC;QAAE,OAAO,SAAS,CAAC;IAC5F,OAAO,GAAG,QAAQ,GAAG,MAAM,GAAG,IAAI,EAAE,CAAC;AACvC,CAAC;AAED,MAAM,kBAAkB,GAAG,sBAAsB,CAAC"}
|
package/dist/site/passwords.d.ts
CHANGED
|
@@ -35,7 +35,7 @@ export declare const ARGON2_PARAMETERS: {
|
|
|
35
35
|
* {@link verifyPasswordHash} needs nothing but the stored string, and a later
|
|
36
36
|
* change to {@link ARGON2_PARAMETERS} leaves existing passwords verifiable.
|
|
37
37
|
*/
|
|
38
|
-
export declare function hashPassword(password: string): string
|
|
38
|
+
export declare function hashPassword(password: string): Promise<string>;
|
|
39
39
|
/**
|
|
40
40
|
* Whether `password` is the one `encoded` was made from.
|
|
41
41
|
*
|
|
@@ -43,5 +43,12 @@ export declare function hashPassword(password: string): string;
|
|
|
43
43
|
* must fail the login rather than take the request down. The comparison is
|
|
44
44
|
* constant time.
|
|
45
45
|
*/
|
|
46
|
-
export declare function verifyPasswordHash(encoded: string, password: string): boolean
|
|
46
|
+
export declare function verifyPasswordHash(encoded: string, password: string): Promise<boolean>;
|
|
47
|
+
export declare function passwordHashIsCurrent(encoded: string): boolean;
|
|
48
|
+
export declare const ARGON2_COST_CEILING: {
|
|
49
|
+
readonly memory: number;
|
|
50
|
+
readonly passes: number;
|
|
51
|
+
readonly parallelism: 4;
|
|
52
|
+
readonly tagLength: 64;
|
|
53
|
+
};
|
|
47
54
|
//# sourceMappingURL=passwords.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"passwords.d.ts","sourceRoot":"","sources":["../../src/site/passwords.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"passwords.d.ts","sourceRoot":"","sources":["../../src/site/passwords.ts"],"names":[],"mappings":"AAKA;;;;;;GAMG;AACH,eAAO,MAAM,iBAAiB;IAC5B,0BAA0B;aAC1B,MAAM,EAAE,KAAK;IACb,mDAAmD;aACnD,MAAM,EAAE,CAAC;IACT,+DAA+D;aAC/D,WAAW,EAAE,CAAC;IACd,2CAA2C;aAC3C,SAAS,EAAE,EAAE;IACb,6BAA6B;aAC7B,UAAU,EAAE,EAAE;IACd;;;;;OAKG;aACH,OAAO,EAAE,EAAE;CACH,CAAC;AAEX;;;;;;;;;;GAUG;AACH,wBAAsB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAWpE;AAED;;;;;;GAMG;AACH,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAO5F;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAS9D;AAED,eAAO,MAAM,mBAAmB;aAC9B,MAAM;aACN,MAAM;aACN,WAAW,EAAE,CAAC;aACd,SAAS,EAAE,EAAE;CACL,CAAC"}
|
package/dist/site/passwords.js
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { argon2, randomBytes, timingSafeEqual } from 'node:crypto';
|
|
2
|
+
import { promisify } from 'node:util';
|
|
3
|
+
const argon2Async = promisify(argon2);
|
|
2
4
|
/**
|
|
3
5
|
* Argon2id parameters, close to the OWASP baseline for a server that also
|
|
4
6
|
* serves pages: 19 MiB of memory, two passes, one lane.
|
|
@@ -36,9 +38,9 @@ export const ARGON2_PARAMETERS = {
|
|
|
36
38
|
* {@link verifyPasswordHash} needs nothing but the stored string, and a later
|
|
37
39
|
* change to {@link ARGON2_PARAMETERS} leaves existing passwords verifiable.
|
|
38
40
|
*/
|
|
39
|
-
export function hashPassword(password) {
|
|
41
|
+
export async function hashPassword(password) {
|
|
40
42
|
const salt = randomBytes(ARGON2_PARAMETERS.saltLength);
|
|
41
|
-
const tag = derive(password, salt, {
|
|
43
|
+
const tag = await derive(password.normalize('NFC'), salt, {
|
|
42
44
|
memory: ARGON2_PARAMETERS.memory,
|
|
43
45
|
passes: ARGON2_PARAMETERS.passes,
|
|
44
46
|
parallelism: ARGON2_PARAMETERS.parallelism,
|
|
@@ -54,20 +56,35 @@ export function hashPassword(password) {
|
|
|
54
56
|
* must fail the login rather than take the request down. The comparison is
|
|
55
57
|
* constant time.
|
|
56
58
|
*/
|
|
57
|
-
export function verifyPasswordHash(encoded, password) {
|
|
59
|
+
export async function verifyPasswordHash(encoded, password) {
|
|
58
60
|
const parsed = parsePhc(encoded);
|
|
59
61
|
if (parsed === undefined)
|
|
60
62
|
return false;
|
|
61
|
-
const
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
63
|
+
const normalised = password.normalize('NFC');
|
|
64
|
+
if (await matches(parsed, normalised))
|
|
65
|
+
return true;
|
|
66
|
+
return normalised !== password && matches(parsed, password);
|
|
67
|
+
}
|
|
68
|
+
export function passwordHashIsCurrent(encoded) {
|
|
69
|
+
const parsed = parsePhc(encoded);
|
|
70
|
+
return (parsed !== undefined &&
|
|
71
|
+
parsed.memory === ARGON2_PARAMETERS.memory &&
|
|
72
|
+
parsed.passes === ARGON2_PARAMETERS.passes &&
|
|
73
|
+
parsed.parallelism === ARGON2_PARAMETERS.parallelism &&
|
|
74
|
+
parsed.tagLength === ARGON2_PARAMETERS.tagLength);
|
|
75
|
+
}
|
|
76
|
+
export const ARGON2_COST_CEILING = {
|
|
77
|
+
memory: ARGON2_PARAMETERS.memory * 4,
|
|
78
|
+
passes: ARGON2_PARAMETERS.passes * 4,
|
|
79
|
+
parallelism: 4,
|
|
80
|
+
tagLength: 64,
|
|
81
|
+
};
|
|
82
|
+
async function matches(parsed, password) {
|
|
83
|
+
const tag = await derive(password, parsed.salt, parsed);
|
|
67
84
|
return tag.length === parsed.tag.length && timingSafeEqual(tag, parsed.tag);
|
|
68
85
|
}
|
|
69
|
-
function derive(password, salt, parameters) {
|
|
70
|
-
return Buffer.from(
|
|
86
|
+
async function derive(password, salt, parameters) {
|
|
87
|
+
return Buffer.from(await argon2Async('argon2id', {
|
|
71
88
|
message: Buffer.from(password, 'utf8'),
|
|
72
89
|
nonce: salt,
|
|
73
90
|
memory: parameters.memory,
|
|
@@ -93,16 +110,30 @@ function parsePhc(encoded) {
|
|
|
93
110
|
const memory = costs.get('m');
|
|
94
111
|
const passes = costs.get('t');
|
|
95
112
|
const parallelism = costs.get('p');
|
|
96
|
-
if (!isPositiveInteger(memory) ||
|
|
113
|
+
if (!isPositiveInteger(memory) ||
|
|
114
|
+
!isPositiveInteger(passes) ||
|
|
115
|
+
!isPositiveInteger(parallelism) ||
|
|
116
|
+
!withinCostCeiling({ memory, passes, parallelism }) ||
|
|
117
|
+
// argon2 needs at least eight blocks of memory per lane.
|
|
118
|
+
memory < 8 * parallelism) {
|
|
97
119
|
return undefined;
|
|
98
120
|
}
|
|
99
121
|
const salt = fromBase64(parts[4]);
|
|
100
122
|
const tag = fromBase64(parts[5]);
|
|
101
|
-
if (salt === undefined ||
|
|
123
|
+
if (salt === undefined ||
|
|
124
|
+
tag === undefined ||
|
|
125
|
+
salt.length < 8 ||
|
|
126
|
+
tag.length < 4 ||
|
|
127
|
+
tag.length > ARGON2_COST_CEILING.tagLength) {
|
|
102
128
|
return undefined;
|
|
103
129
|
}
|
|
104
130
|
return { memory, passes, parallelism, tagLength: tag.length, salt, tag };
|
|
105
131
|
}
|
|
132
|
+
function withinCostCeiling(costs) {
|
|
133
|
+
return (costs.memory <= ARGON2_COST_CEILING.memory &&
|
|
134
|
+
costs.passes <= ARGON2_COST_CEILING.passes &&
|
|
135
|
+
costs.parallelism <= ARGON2_COST_CEILING.parallelism);
|
|
136
|
+
}
|
|
106
137
|
function isPositiveInteger(value) {
|
|
107
138
|
return value !== undefined && Number.isInteger(value) && value > 0;
|
|
108
139
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"passwords.js","sourceRoot":"","sources":["../../src/site/passwords.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"passwords.js","sourceRoot":"","sources":["../../src/site/passwords.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,8 +38,9 @@ export declare function relayList(value: string): string[];
|
|
|
38
38
|
* A relay inbox URL, or `undefined` when it is not an absolute http(s) one.
|
|
39
39
|
*
|
|
40
40
|
* Unlike {@link normalizeBaseUrl} this keeps the whole URL bar a trailing
|
|
41
|
-
* slash: a relay inbox is a path —
|
|
42
|
-
* an origin, and some relays hang
|
|
41
|
+
* slash on a path with nothing after it: a relay inbox is a path —
|
|
42
|
+
* `/user/_____relay_____/inbox` — rather than an origin, and some relays hang
|
|
43
|
+
* one off a query string, whose final slash is part of a value.
|
|
43
44
|
*/
|
|
44
45
|
export declare function normalizeRelayInbox(value: string): string | undefined;
|
|
45
46
|
/** A security contact textarea as its URIs, in order, repeats dropped. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setting-values.d.ts","sourceRoot":"","sources":["../../src/site/setting-values.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAG5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,KAAK,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAExE;;;;;;;;GAQG;AACH,eAAO,MAAM,aAAa,QAAsC,CAAC;AAEjE,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,mBAAmB,CAElF;AAED,gGAAgG;AAChG,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,MAAM,CAE3D;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,eAAe,CAE1E;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,gBAAgB,CAExE;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,IAAI,aAAa,CAErE;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,MAAM,CAE3D;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,SAAS,OAAO,EAAE,GAAG,MAAM,EAAE,CAK1E;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAclE;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAKlD;AAED;;;;;;;GAOG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAOjD;AAED
|
|
1
|
+
{"version":3,"file":"setting-values.d.ts","sourceRoot":"","sources":["../../src/site/setting-values.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAG5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,KAAK,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAExE;;;;;;;;GAQG;AACH,eAAO,MAAM,aAAa,QAAsC,CAAC;AAEjE,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,mBAAmB,CAElF;AAED,gGAAgG;AAChG,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,MAAM,CAE3D;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,eAAe,CAE1E;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,gBAAgB,CAExE;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,IAAI,aAAa,CAErE;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,MAAM,CAE3D;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,SAAS,OAAO,EAAE,GAAG,MAAM,EAAE,CAK1E;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAclE;AAED,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAKlD;AAED;;;;;;;GAOG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAOjD;AAED;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAgBrE;AAED,0EAA0E;AAC1E,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAO3D;AAKD;;;;;GAKG;AACH,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAM1E;AAED,yEAAyE;AACzE,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAEzE;AAYD;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAMvE;AAED,kEAAkE;AAClE,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAStD"}
|
|
@@ -83,8 +83,9 @@ export function relayList(value) {
|
|
|
83
83
|
* A relay inbox URL, or `undefined` when it is not an absolute http(s) one.
|
|
84
84
|
*
|
|
85
85
|
* Unlike {@link normalizeBaseUrl} this keeps the whole URL bar a trailing
|
|
86
|
-
* slash: a relay inbox is a path —
|
|
87
|
-
* an origin, and some relays hang
|
|
86
|
+
* slash on a path with nothing after it: a relay inbox is a path —
|
|
87
|
+
* `/user/_____relay_____/inbox` — rather than an origin, and some relays hang
|
|
88
|
+
* one off a query string, whose final slash is part of a value.
|
|
88
89
|
*/
|
|
89
90
|
export function normalizeRelayInbox(value) {
|
|
90
91
|
const trimmed = value.trim();
|
|
@@ -99,8 +100,10 @@ export function normalizeRelayInbox(value) {
|
|
|
99
100
|
}
|
|
100
101
|
if (parsed.protocol !== 'http:' && parsed.protocol !== 'https:')
|
|
101
102
|
return undefined;
|
|
102
|
-
|
|
103
|
-
|
|
103
|
+
if (parsed.search === '' && parsed.hash === '' && parsed.pathname !== '/') {
|
|
104
|
+
parsed.pathname = parsed.pathname.replace(/\/$/, '');
|
|
105
|
+
}
|
|
106
|
+
return parsed.href;
|
|
104
107
|
}
|
|
105
108
|
/** A security contact textarea as its URIs, in order, repeats dropped. */
|
|
106
109
|
export function securityContactList(value) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setting-values.js","sourceRoot":"","sources":["../../src/site/setting-values.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"setting-values.js","sourceRoot":"","sources":["../../src/site/setting-values.ts"],"names":[],"mappings":"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"}
|
package/dist/site/users.d.ts
CHANGED
|
@@ -25,6 +25,11 @@ export declare function usersFile(dataDir: string): string;
|
|
|
25
25
|
export interface User {
|
|
26
26
|
/** Its id, stable for the life of the user, and what a session names. */
|
|
27
27
|
readonly id: number;
|
|
28
|
+
/**
|
|
29
|
+
* A random name for this one person, never handed to anybody else. Absent
|
|
30
|
+
* for a user written before uids existed; nothing fills it in.
|
|
31
|
+
*/
|
|
32
|
+
readonly uid?: string | undefined;
|
|
28
33
|
/** Login name, unique and compared case sensitively. */
|
|
29
34
|
readonly username: string;
|
|
30
35
|
/**
|
|
@@ -100,6 +105,7 @@ export interface User {
|
|
|
100
105
|
* stored, query string and all, because that is what has to be matched.
|
|
101
106
|
*/
|
|
102
107
|
readonly actorId?: string | undefined;
|
|
108
|
+
readonly sessionsValidAfter?: string | undefined;
|
|
103
109
|
/** When the user was created, as an ISO 8601 instant. */
|
|
104
110
|
readonly createdAt: string;
|
|
105
111
|
}
|
|
@@ -167,6 +173,8 @@ export interface CreateUserInput {
|
|
|
167
173
|
email?: string | undefined;
|
|
168
174
|
/** When the account is created. Defaults to the system clock. */
|
|
169
175
|
now?: Date | undefined;
|
|
176
|
+
/** Add the user only while the file holds nobody, as first-run setup does. */
|
|
177
|
+
onlyIfNoUsers?: boolean | undefined;
|
|
170
178
|
}
|
|
171
179
|
/** Thrown when a username is already taken. Usernames are the login key. */
|
|
172
180
|
export declare class DuplicateUsernameError extends Error {
|
|
@@ -175,6 +183,15 @@ export declare class DuplicateUsernameError extends Error {
|
|
|
175
183
|
readonly username: string;
|
|
176
184
|
constructor(username: string);
|
|
177
185
|
}
|
|
186
|
+
/**
|
|
187
|
+
* Thrown for a name a deleted user's fediverse account held. Its followers'
|
|
188
|
+
* servers know the actor by it, and its key files and follower records stay
|
|
189
|
+
* on disk: a new person under that name would sign with the old key and reach
|
|
190
|
+
* the old followers.
|
|
191
|
+
*/
|
|
192
|
+
export declare class RetiredUsernameError extends DuplicateUsernameError {
|
|
193
|
+
constructor(username: string);
|
|
194
|
+
}
|
|
178
195
|
/**
|
|
179
196
|
* Every user, by name, without password hashes.
|
|
180
197
|
*
|
|
@@ -205,6 +222,18 @@ export declare function countUsers(dataDir: string): number;
|
|
|
205
222
|
export declare function findUser(dataDir: string, username: string): StoredUser | undefined;
|
|
206
223
|
/** The user behind a session's `userId`, or `undefined`. */
|
|
207
224
|
export declare function findUserById(dataDir: string, id: number): User | undefined;
|
|
225
|
+
/** Who a session, reset link or token was issued to. */
|
|
226
|
+
export interface IssuedTo {
|
|
227
|
+
readonly userId: number;
|
|
228
|
+
readonly userUid?: string | undefined;
|
|
229
|
+
readonly issuedAt?: string | undefined;
|
|
230
|
+
}
|
|
231
|
+
/**
|
|
232
|
+
* The user `issued` names, when the file still holds that same person under
|
|
233
|
+
* its id: the uids must match, and one issued with none matches only a user
|
|
234
|
+
* who has none.
|
|
235
|
+
*/
|
|
236
|
+
export declare function userIssuedTo(dataDir: string, issued: IssuedTo): User | undefined;
|
|
208
237
|
/**
|
|
209
238
|
* The user a forgot-password form named, by either of the two things somebody
|
|
210
239
|
* might type: their username or their email address.
|
|
@@ -218,22 +247,31 @@ export declare function findUserById(dataDir: string, id: number): User | undefi
|
|
|
218
247
|
* would. The empty string matches nobody, however many users have no email.
|
|
219
248
|
*/
|
|
220
249
|
export declare function findUserByIdentifier(dataDir: string, identifier: string): User | undefined;
|
|
250
|
+
/** Thrown when first-run setup is asked to add a user to a site that has one. */
|
|
251
|
+
export declare class SetupClosedError extends Error {
|
|
252
|
+
readonly name = "SetupClosedError";
|
|
253
|
+
constructor();
|
|
254
|
+
}
|
|
221
255
|
/**
|
|
222
256
|
* Hash the password and add the user to the file.
|
|
223
257
|
*
|
|
224
|
-
* Throws {@link DuplicateUsernameError} when the name is taken
|
|
225
|
-
*
|
|
226
|
-
* `
|
|
227
|
-
*
|
|
228
|
-
*
|
|
258
|
+
* Throws {@link DuplicateUsernameError} when the name is taken, or differs
|
|
259
|
+
* from a taken one only by case or punctuation: such names share a key file
|
|
260
|
+
* under `data/keys`, and fediverse servers treat handles that differ only by
|
|
261
|
+
* case as one account; and {@link RetiredUsernameError} when a deleted user's
|
|
262
|
+
* fediverse account held it. Throws
|
|
263
|
+
* {@link SetupClosedError} when `onlyIfNoUsers` is set and the file already
|
|
264
|
+
* holds somebody. Both checks are inside the write, not before it, which is
|
|
265
|
+
* what makes the first the rule the `UNIQUE` index used to be: two requests
|
|
266
|
+
* adding at the same moment queue behind one another on the file, so the
|
|
267
|
+
* second one reads the first one's work and is refused.
|
|
229
268
|
*/
|
|
230
269
|
export declare function createUser(input: CreateUserInput): Promise<User>;
|
|
231
|
-
export type UserChange = Partial<Omit<StoredUser, 'id' | 'username' | 'createdAt'>>;
|
|
270
|
+
export type UserChange = Partial<Omit<StoredUser, 'id' | 'uid' | 'username' | 'createdAt'>>;
|
|
232
271
|
export declare function updateUser(dataDir: string, userId: number, change: (user: StoredUser, everyone: readonly StoredUser[]) => UserChange): Promise<boolean>;
|
|
233
272
|
/**
|
|
234
273
|
* Hash a new password and put it on a user, replacing the old one. Returns
|
|
235
|
-
* `false` when there is no such user.
|
|
236
|
-
* of them a password change should end is the caller's business.
|
|
274
|
+
* `false` when there is no such user.
|
|
237
275
|
*/
|
|
238
276
|
export declare function setUserPassword(input: {
|
|
239
277
|
/** Which site's users file to write. */
|
|
@@ -242,6 +280,7 @@ export declare function setUserPassword(input: {
|
|
|
242
280
|
userId: number;
|
|
243
281
|
/** The new plain password, hashed on the way in. */
|
|
244
282
|
password: string;
|
|
283
|
+
now: Date;
|
|
245
284
|
}): Promise<boolean>;
|
|
246
285
|
/**
|
|
247
286
|
* Put an email address on a user, or take the one they had off.
|
|
@@ -267,8 +306,9 @@ export declare function setUserEmail(input: {
|
|
|
267
306
|
* what the form on the users screen submits: four boxes and a Save, and a
|
|
268
307
|
* field somebody cleared is a field they no longer want. {@link cleanProfile}
|
|
269
308
|
* drops the empties, so a profile with nothing left in it leaves the user with
|
|
270
|
-
* no `profile` key rather than with an empty object. Returns
|
|
271
|
-
* there is no such user
|
|
309
|
+
* no `profile` key rather than with an empty object. Returns whether the
|
|
310
|
+
* stored profile changed, so `false` both when there is no such user and when
|
|
311
|
+
* the save left it as it was.
|
|
272
312
|
*/
|
|
273
313
|
export declare function setUserProfile(input: {
|
|
274
314
|
/** Which site's users file to write. */
|
|
@@ -286,6 +326,7 @@ export declare function setUserProfile(input: {
|
|
|
286
326
|
* link with no URL is not somewhere this person is.
|
|
287
327
|
*/
|
|
288
328
|
export declare function cleanProfile(profile: UserProfile): UserProfile | undefined;
|
|
329
|
+
export declare function isAvatarUrl(avatar: string): boolean;
|
|
289
330
|
/**
|
|
290
331
|
* Turn one notice on or off for one user.
|
|
291
332
|
*
|
|
@@ -365,6 +406,10 @@ export declare class ConflictingActorIdError extends Error {
|
|
|
365
406
|
readonly username: string;
|
|
366
407
|
constructor(username: string, what: string);
|
|
367
408
|
}
|
|
409
|
+
export declare class InvalidActorIdError extends Error {
|
|
410
|
+
readonly name = "InvalidActorIdError";
|
|
411
|
+
constructor(actorId: string);
|
|
412
|
+
}
|
|
368
413
|
/**
|
|
369
414
|
* Write the actor id a user was published under elsewhere.
|
|
370
415
|
*
|
|
@@ -381,6 +426,7 @@ export declare class ConflictingActorIdError extends Error {
|
|
|
381
426
|
export declare function setUserActorId(input: {
|
|
382
427
|
/** Which site's users file to write. */
|
|
383
428
|
dataDir: string;
|
|
429
|
+
baseUrl: string;
|
|
384
430
|
/** Whose record, by login name. */
|
|
385
431
|
username: string;
|
|
386
432
|
/** The id they were published under, query string and all. */
|
|
@@ -393,15 +439,37 @@ export declare class UnknownUserError extends Error {
|
|
|
393
439
|
readonly username: string;
|
|
394
440
|
constructor(username: string);
|
|
395
441
|
}
|
|
442
|
+
/** Why a user could not be removed. */
|
|
443
|
+
export type UserRemovalRefusal = 'only-user' | 'own-account';
|
|
444
|
+
/** Thrown when removing a user would break a rule about who the site keeps. */
|
|
445
|
+
export declare class UserRemovalRefusedError extends Error {
|
|
446
|
+
readonly name = "UserRemovalRefusedError";
|
|
447
|
+
/** Which rule the removal would have broken. */
|
|
448
|
+
readonly reason: UserRemovalRefusal;
|
|
449
|
+
/** Whose removal was refused. */
|
|
450
|
+
readonly username: string;
|
|
451
|
+
constructor(reason: UserRemovalRefusal, username: string);
|
|
452
|
+
}
|
|
453
|
+
/**
|
|
454
|
+
* Take a user out of the file. Returns whether they were there.
|
|
455
|
+
*
|
|
456
|
+
* Throws {@link UserRemovalRefusedError} rather than leave the site with
|
|
457
|
+
* nobody or let `signedInAs` remove themselves.
|
|
458
|
+
*/
|
|
396
459
|
export declare function removeUserRecord(input: {
|
|
397
460
|
dataDir: string;
|
|
398
461
|
userId: number;
|
|
462
|
+
/** The user asking for the removal, when it is a person. */
|
|
463
|
+
signedInAs?: number | null | undefined;
|
|
464
|
+
beforeRemoval?: ((userId: number) => void | Promise<void>) | undefined;
|
|
465
|
+
/** Whether the user's name is retired with them, so nobody new can take it. */
|
|
466
|
+
retire?: ((user: User) => boolean) | undefined;
|
|
399
467
|
}): Promise<boolean>;
|
|
400
468
|
/**
|
|
401
469
|
* The user, when the password is theirs; `undefined` when it is not, or when
|
|
402
470
|
* there is no such user. The two failures are deliberately indistinguishable.
|
|
403
471
|
*/
|
|
404
|
-
export declare function verifyUserPassword(dataDir: string, username: string, password: string): User | undefined
|
|
472
|
+
export declare function verifyUserPassword(dataDir: string, username: string, password: string): Promise<User | undefined>;
|
|
405
473
|
/** The file as it is on disk: the users, and the next id to hand out. */
|
|
406
474
|
export interface UsersFileContents {
|
|
407
475
|
/** Everyone who may sign in, in the order the file lists them. */
|
|
@@ -415,6 +483,12 @@ export interface UsersFileContents {
|
|
|
415
483
|
* person it was written for.
|
|
416
484
|
*/
|
|
417
485
|
nextId: number;
|
|
486
|
+
/**
|
|
487
|
+
* Usernames, folded as {@link fileToken} folds them, of deleted users who
|
|
488
|
+
* had a fediverse account. Their followers' servers still know the actor by
|
|
489
|
+
* that name, so no new user may take one.
|
|
490
|
+
*/
|
|
491
|
+
retired?: string[];
|
|
418
492
|
}
|
|
419
493
|
/** The bytes of the file, as it is written. */
|
|
420
494
|
export declare function usersJsonText(contents: UsersFileContents): string;
|
package/dist/site/users.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"users.d.ts","sourceRoot":"","sources":["../../src/site/users.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"users.d.ts","sourceRoot":"","sources":["../../src/site/users.ts"],"names":[],"mappings":"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"}
|