@geekity/cms 0.51.0 → 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.
Files changed (181) hide show
  1. package/admin/pages/account/forgot.njk +13 -7
  2. package/admin/pages/account/reset.njk +1 -1
  3. package/admin/pages/users/edit.njk +36 -4
  4. package/admin/pages/users/new.njk +19 -1
  5. package/dist/admin/admin-bar.d.ts.map +1 -1
  6. package/dist/admin/admin-bar.js +11 -10
  7. package/dist/admin/admin-bar.js.map +1 -1
  8. package/dist/admin/autosave.d.ts.map +1 -1
  9. package/dist/admin/autosave.js +1 -2
  10. package/dist/admin/autosave.js.map +1 -1
  11. package/dist/admin/confirm-password.d.ts +19 -1
  12. package/dist/admin/confirm-password.d.ts.map +1 -1
  13. package/dist/admin/confirm-password.js +40 -8
  14. package/dist/admin/confirm-password.js.map +1 -1
  15. package/dist/admin/connected-apps.d.ts.map +1 -1
  16. package/dist/admin/connected-apps.js +1 -0
  17. package/dist/admin/connected-apps.js.map +1 -1
  18. package/dist/admin/credentials.d.ts +0 -1
  19. package/dist/admin/credentials.d.ts.map +1 -1
  20. package/dist/admin/credentials.js +1 -2
  21. package/dist/admin/credentials.js.map +1 -1
  22. package/dist/admin/documents.d.ts +0 -7
  23. package/dist/admin/documents.d.ts.map +1 -1
  24. package/dist/admin/documents.js +1 -15
  25. package/dist/admin/documents.js.map +1 -1
  26. package/dist/admin/export.d.ts +2 -0
  27. package/dist/admin/export.d.ts.map +1 -1
  28. package/dist/admin/export.js +5 -4
  29. package/dist/admin/export.js.map +1 -1
  30. package/dist/admin/headers.d.ts.map +1 -1
  31. package/dist/admin/headers.js +4 -0
  32. package/dist/admin/headers.js.map +1 -1
  33. package/dist/admin/index.d.ts +7 -7
  34. package/dist/admin/index.d.ts.map +1 -1
  35. package/dist/admin/index.js +5 -5
  36. package/dist/admin/index.js.map +1 -1
  37. package/dist/admin/indieauth-consent.d.ts.map +1 -1
  38. package/dist/admin/indieauth-consent.js +3 -2
  39. package/dist/admin/indieauth-consent.js.map +1 -1
  40. package/dist/admin/legacy-migrations.d.ts.map +1 -1
  41. package/dist/admin/legacy-migrations.js +6 -2
  42. package/dist/admin/legacy-migrations.js.map +1 -1
  43. package/dist/admin/plugins.d.ts +2 -0
  44. package/dist/admin/plugins.d.ts.map +1 -1
  45. package/dist/admin/plugins.js +15 -11
  46. package/dist/admin/plugins.js.map +1 -1
  47. package/dist/admin/recovery.d.ts +7 -4
  48. package/dist/admin/recovery.d.ts.map +1 -1
  49. package/dist/admin/recovery.js +68 -43
  50. package/dist/admin/recovery.js.map +1 -1
  51. package/dist/admin/routes.d.ts.map +1 -1
  52. package/dist/admin/routes.js +99 -76
  53. package/dist/admin/routes.js.map +1 -1
  54. package/dist/admin/uploads.d.ts +4 -13
  55. package/dist/admin/uploads.d.ts.map +1 -1
  56. package/dist/admin/uploads.js +9 -28
  57. package/dist/admin/uploads.js.map +1 -1
  58. package/dist/admin/users.d.ts +7 -0
  59. package/dist/admin/users.d.ts.map +1 -1
  60. package/dist/admin/users.js +156 -43
  61. package/dist/admin/users.js.map +1 -1
  62. package/dist/cli/commands.d.ts.map +1 -1
  63. package/dist/cli/commands.js +12 -1
  64. package/dist/cli/commands.js.map +1 -1
  65. package/dist/cli/help.d.ts.map +1 -1
  66. package/dist/cli/help.js +5 -4
  67. package/dist/cli/help.js.map +1 -1
  68. package/dist/cli/password.js +3 -3
  69. package/dist/cli/password.js.map +1 -1
  70. package/dist/cli/serve.d.ts.map +1 -1
  71. package/dist/cli/serve.js +17 -0
  72. package/dist/cli/serve.js.map +1 -1
  73. package/dist/cli/user.d.ts +1 -1
  74. package/dist/cli/user.d.ts.map +1 -1
  75. package/dist/cli/user.js +74 -11
  76. package/dist/cli/user.js.map +1 -1
  77. package/dist/config.d.ts +8 -4
  78. package/dist/config.d.ts.map +1 -1
  79. package/dist/config.js +4 -1
  80. package/dist/config.js.map +1 -1
  81. package/dist/federation/actor.d.ts.map +1 -1
  82. package/dist/federation/actor.js +9 -5
  83. package/dist/federation/actor.js.map +1 -1
  84. package/dist/federation/keys.d.ts.map +1 -1
  85. package/dist/federation/keys.js +6 -15
  86. package/dist/federation/keys.js.map +1 -1
  87. package/dist/files/atomic.d.ts +7 -1
  88. package/dist/files/atomic.d.ts.map +1 -1
  89. package/dist/files/atomic.js +75 -14
  90. package/dist/files/atomic.js.map +1 -1
  91. package/dist/files/data-files.d.ts +12 -0
  92. package/dist/files/data-files.d.ts.map +1 -1
  93. package/dist/files/data-files.js +24 -0
  94. package/dist/files/data-files.js.map +1 -1
  95. package/dist/files/lock-file.d.ts.map +1 -0
  96. package/dist/{jobs → files}/lock-file.js +1 -1
  97. package/dist/files/lock-file.js.map +1 -0
  98. package/dist/gemini/certificate.d.ts.map +1 -1
  99. package/dist/gemini/certificate.js +15 -12
  100. package/dist/gemini/certificate.js.map +1 -1
  101. package/dist/indieauth/grants.d.ts +1 -0
  102. package/dist/indieauth/grants.d.ts.map +1 -1
  103. package/dist/indieauth/grants.js.map +1 -1
  104. package/dist/indieauth/tokens.d.ts +4 -1
  105. package/dist/indieauth/tokens.d.ts.map +1 -1
  106. package/dist/indieauth/tokens.js +7 -3
  107. package/dist/indieauth/tokens.js.map +1 -1
  108. package/dist/jobs/file-records.js +1 -1
  109. package/dist/jobs/file-records.js.map +1 -1
  110. package/dist/jobs/processes.d.ts +0 -1
  111. package/dist/jobs/processes.d.ts.map +1 -1
  112. package/dist/jobs/processes.js +1 -9
  113. package/dist/jobs/processes.js.map +1 -1
  114. package/dist/notifications/mail-service.d.ts.map +1 -1
  115. package/dist/notifications/mail-service.js +16 -1
  116. package/dist/notifications/mail-service.js.map +1 -1
  117. package/dist/plugin.d.ts +3 -2
  118. package/dist/plugin.d.ts.map +1 -1
  119. package/dist/plugin.js.map +1 -1
  120. package/dist/plugins/site.d.ts.map +1 -1
  121. package/dist/plugins/site.js +1 -1
  122. package/dist/plugins/site.js.map +1 -1
  123. package/dist/site/admin-paths.d.ts +7 -0
  124. package/dist/site/admin-paths.d.ts.map +1 -1
  125. package/dist/site/admin-paths.js +18 -0
  126. package/dist/site/admin-paths.js.map +1 -1
  127. package/dist/site/passwords.d.ts +9 -2
  128. package/dist/site/passwords.d.ts.map +1 -1
  129. package/dist/site/passwords.js +45 -14
  130. package/dist/site/passwords.js.map +1 -1
  131. package/dist/site/users.d.ts +67 -11
  132. package/dist/site/users.d.ts.map +1 -1
  133. package/dist/site/users.js +207 -35
  134. package/dist/site/users.js.map +1 -1
  135. package/dist/store/schema.d.ts.map +1 -1
  136. package/dist/store/schema.js +11 -0
  137. package/dist/store/schema.js.map +1 -1
  138. package/dist/store/sessions.d.ts +3 -0
  139. package/dist/store/sessions.d.ts.map +1 -1
  140. package/dist/store/sessions.js +27 -18
  141. package/dist/store/sessions.js.map +1 -1
  142. package/dist/store/tokens.d.ts +4 -2
  143. package/dist/store/tokens.d.ts.map +1 -1
  144. package/dist/store/tokens.js +16 -10
  145. package/dist/store/tokens.js.map +1 -1
  146. package/dist/util/html-tree.d.ts +4 -0
  147. package/dist/util/html-tree.d.ts.map +1 -1
  148. package/dist/util/html-tree.js +34 -0
  149. package/dist/util/html-tree.js.map +1 -1
  150. package/dist/util/process-alive.d.ts +3 -0
  151. package/dist/util/process-alive.d.ts.map +1 -0
  152. package/dist/util/process-alive.js +11 -0
  153. package/dist/util/process-alive.js.map +1 -0
  154. package/dist/web/compression.js +2 -3
  155. package/dist/web/compression.js.map +1 -1
  156. package/dist/web/indieauth-bearer.js +2 -2
  157. package/dist/web/indieauth-bearer.js.map +1 -1
  158. package/dist/web/indieauth-token.js +3 -3
  159. package/dist/web/indieauth-token.js.map +1 -1
  160. package/dist/web/session.d.ts +6 -1
  161. package/dist/web/session.d.ts.map +1 -1
  162. package/dist/web/session.js +21 -3
  163. package/dist/web/session.js.map +1 -1
  164. package/dist/web/signed-in.d.ts.map +1 -1
  165. package/dist/web/signed-in.js +6 -2
  166. package/dist/web/signed-in.js.map +1 -1
  167. package/dist/web/throttle.d.ts +26 -18
  168. package/dist/web/throttle.d.ts.map +1 -1
  169. package/dist/web/throttle.js +130 -24
  170. package/dist/web/throttle.js.map +1 -1
  171. package/package.json +4 -4
  172. package/templates/site/gitignore +4 -0
  173. package/themes/default/mail/email-changed.html.njk +17 -0
  174. package/themes/default/mail/email-changed.subject.njk +1 -0
  175. package/themes/default/mail/email-changed.txt.njk +14 -0
  176. package/themes/default/mail/password-changed.html.njk +1 -1
  177. package/themes/default/mail/password-changed.txt.njk +2 -1
  178. package/themes/default/partials/jsonld.njk +1 -1
  179. package/dist/jobs/lock-file.d.ts.map +0 -1
  180. package/dist/jobs/lock-file.js.map +0 -1
  181. /package/dist/{jobs → files}/lock-file.d.ts +0 -0
@@ -1 +1 @@
1
- {"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/web/session.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/web/session.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"signed-in.d.ts","sourceRoot":"","sources":["../../src/web/signed-in.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAGpC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAG7D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAE3C;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,GAAG,aAAa,GAAG,SAAS,CAGnF;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,GAAG,eAAe,GAAG,SAAS,CAgBnF"}
1
+ {"version":3,"file":"signed-in.d.ts","sourceRoot":"","sources":["../../src/web/signed-in.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAGpC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAG7D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAE3C;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,GAAG,aAAa,GAAG,SAAS,CAGnF;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAAC,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,GAAG,eAAe,GAAG,SAAS,CAoBnF"}
@@ -1,5 +1,5 @@
1
1
  import { commenterOf } from '../comments/viewer.js';
2
- import { findUserById } from '../site/users.js';
2
+ import { userIssuedTo } from '../site/users.js';
3
3
  import { sessionIdFrom } from './session.js';
4
4
  /**
5
5
  * Who the public site knows is reading it, when the request carries a login.
@@ -37,7 +37,11 @@ export function signedInAccount(c) {
37
37
  const session = c.var.admin.getSession(id);
38
38
  if (session?.userId == null)
39
39
  return undefined;
40
- const user = findUserById(c.var.config.dataDir, session.userId);
40
+ const user = userIssuedTo(c.var.config.dataDir, {
41
+ userId: session.userId,
42
+ userUid: session.userUid,
43
+ issuedAt: session.createdAt,
44
+ });
41
45
  if (user === undefined)
42
46
  return undefined;
43
47
  return { user, csrfToken: session.csrfToken };
@@ -1 +1 @@
1
- {"version":3,"file":"signed-in.js","sourceRoot":"","sources":["../../src/web/signed-in.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGpD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAG7C;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAU,iBAAiB,CAAC,CAAsB;IACtD,MAAM,OAAO,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;IACnC,OAAO,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;AAClE,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,eAAe,CAAC,CAAsB;IACpD,MAAM,EAAE,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;IAC5B,IAAI,EAAE,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAEvC,wEAAwE;IACxE,yEAAyE;IACzE,6EAA6E;IAC7E,0EAA0E;IAC1E,kCAAkC;IAClC,MAAM,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;IAC3C,IAAI,OAAO,EAAE,MAAM,IAAI,IAAI;QAAE,OAAO,SAAS,CAAC;IAE9C,MAAM,IAAI,GAAG,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;IAChE,IAAI,IAAI,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAEzC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC;AAChD,CAAC"}
1
+ {"version":3,"file":"signed-in.js","sourceRoot":"","sources":["../../src/web/signed-in.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGpD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAG7C;;;;;;;;;;;;;;;GAeG;AACH,MAAM,UAAU,iBAAiB,CAAC,CAAsB;IACtD,MAAM,OAAO,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;IACnC,OAAO,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;AAClE,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,eAAe,CAAC,CAAsB;IACpD,MAAM,EAAE,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;IAC5B,IAAI,EAAE,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAEvC,wEAAwE;IACxE,yEAAyE;IACzE,6EAA6E;IAC7E,0EAA0E;IAC1E,kCAAkC;IAClC,MAAM,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;IAC3C,IAAI,OAAO,EAAE,MAAM,IAAI,IAAI;QAAE,OAAO,SAAS,CAAC;IAE9C,MAAM,IAAI,GAAG,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE;QAC9C,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,QAAQ,EAAE,OAAO,CAAC,SAAS;KAC5B,CAAC,CAAC;IACH,IAAI,IAAI,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAEzC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC;AAChD,CAAC"}
@@ -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`. Left alone that reaches years,
10
- * which is a denial of service against the site's own owner rather than
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 an attacker can grow.
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 leftmost entry is the client the
72
- * first proxy saw. Otherwise it is the socket's own address, which is
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
- * The keys one sign-in attempt is counted against: the username it named and
79
- * the address it came from.
80
- *
81
- * The username is folded to lower case so `Ada` and `ada` are one key, and it
82
- * is used whether or not any such user exists — a username nobody has locks
83
- * out exactly as a real one does, so the lockout cannot be used to find out
84
- * which usernames the site has.
85
- */
86
- export declare function loginKeys(username: string, address: string | undefined): string[];
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":"AACA,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;;;;;;;;;GASG;AACH,eAAO,MAAM,oBAAoB,KAAK,CAAC;AAEvC,sDAAsD;AACtD,MAAM,WAAW,oBAAoB;IACnC,0DAA0D;IAC1D,QAAQ,EAAE,MAAM,CAAC;IACjB,oDAAoD;IACpD,cAAc,EAAE,MAAM,CAAC;IACvB,GAAG,EAAE,KAAK,CAAC;CACZ;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,yEAAyE;IACzE,IAAI,IAAI,MAAM,CAAC;CAChB;AAYD;;;;;;;;;GASG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,oBAAoB,GAAG,aAAa,CAqEhF;AAED,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;;;;;;;;;;GAUG;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;;;;;;;;GAQG;AACH,wBAAgB,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,EAAE,CAIjF;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAGpD"}
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"}
@@ -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`. Left alone that reaches years,
7
- * which is a denial of service against the site's own owner rather than
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 leftmost entry is the client the
113
- * first proxy saw. Otherwise it is the socket's own address, which is
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 first = forwarded?.split(',')[0]?.trim();
121
- if (first !== undefined && first !== '')
122
- return first;
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 keys one sign-in attempt is counted against: the username it named and
134
- * the address it came from.
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
- export function loginKeys(username, address) {
142
- const keys = [`user:${username.toLowerCase()}`];
143
- if (address !== undefined)
144
- keys.push(`addr:${address}`);
145
- return keys;
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,
@@ -1 +1 @@
1
- {"version":3,"file":"throttle.js","sourceRoot":"","sources":["../../src/web/throttle.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"throttle.js","sourceRoot":"","sources":["../../src/web/throttle.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@geekity/cms",
3
- "version": "0.51.0",
3
+ "version": "0.52.0",
4
4
  "type": "module",
5
5
  "description": "A file-first CMS: Markdown content, a SQLite index, a Hono server that is both the editor and the public site.",
6
6
  "license": "MIT",
@@ -56,11 +56,11 @@
56
56
  "@hono/node-server": "^2.1.5",
57
57
  "@js-temporal/polyfill": "^0.5.1",
58
58
  "gray-matter": "^4.0.3",
59
- "hono": "^4.13.14",
59
+ "hono": "^4.13.16",
60
60
  "js-yaml": "^5.5.0",
61
61
  "markdown-it": "^15.0.3",
62
62
  "markdown-it-footnote": "^4.0.0",
63
- "nodemailer": "^10.2.1",
63
+ "nodemailer": "^10.3.1",
64
64
  "nunjucks": "^3.2.4",
65
65
  "sax": "^1.6.1",
66
66
  "semver": "^7.8.5",
@@ -78,7 +78,7 @@
78
78
  "@lezer/highlight": "^1.2.5",
79
79
  "@tailwindcss/cli": "^4.3.3",
80
80
  "@types/markdown-it-footnote": "^3.0.4",
81
- "@types/node": "^26.6.5",
81
+ "@types/node": "^26.6.6",
82
82
  "@types/nodemailer": "^8.0.2",
83
83
  "@types/nunjucks": "^3.2.6",
84
84
  "@types/sax": "^1.2.7",
@@ -1,3 +1,7 @@
1
1
  node_modules/
2
2
  data/
3
3
  .env
4
+
5
+ # Held while an update to a content/_data file runs
6
+ content/_data/**/*.lock
7
+ content/_data/**/*.lock.takeover
@@ -0,0 +1,17 @@
1
+ <p>Hello {{ username }},</p>
2
+
3
+ <p>
4
+ The email address for <strong>{{ username }}</strong> on {{ site.title }} has
5
+ just been {% if email %}changed to {{ email }}{% else %}removed{% endif %}. This address will not get
6
+ password reset links or notices from the site any more.
7
+ </p>
8
+
9
+ <p>If you or another admin of this site made that change, there is nothing to do.</p>
10
+
11
+ <p>
12
+ If nobody did, sign in at
13
+ <a href="{{ baseUrl }}/admin/login">{{ baseUrl }}/admin/login</a> and change
14
+ your password, or ask whoever runs this site to look at the account.
15
+ </p>
16
+
17
+ <p>&mdash; {{ site.title }}</p>
@@ -0,0 +1 @@
1
+ The email address for {{ username }} on {{ site.title }} was changed
@@ -0,0 +1,14 @@
1
+ Hello {{ username }},
2
+
3
+ The email address for {{ username }} on {{ site.title }} has just been
4
+ {% if email %}changed to {{ email }}{% else %}removed{% endif %}. This address will
5
+ not get password reset links or notices from the site any more.
6
+
7
+ If you or another admin of this site made that change, there is nothing to do.
8
+
9
+ If nobody did, sign in at {{ baseUrl }}/admin/login and change your password,
10
+ or ask whoever runs this site to look at the account.
11
+
12
+ --
13
+ {{ site.title }}
14
+ {{ baseUrl }}
@@ -3,7 +3,7 @@
3
3
 
4
4
  <p>
5
5
  The password for <strong>{{ username }}</strong> on {{ site.title }} has just
6
- been set through a reset link.{% if signedOut %} Every browser that was signed in as {{ username }} was signed out.{% endif %}
6
+ been set through a reset link.{% if signedOut %} Every browser that was signed in as {{ username }} was signed out.{% endif %}{% if appsDisconnected %} Every app connected to the account was disconnected, so each one has to be connected again.{% endif %}
7
7
  </p>
8
8
 
9
9
  <p>If that was you, there is nothing to do.</p>
@@ -4,7 +4,8 @@
4
4
  Hello {{ username }},
5
5
 
6
6
  The password for {{ username }} on {{ site.title }} has just been set through a
7
- reset link.{% if signedOut %} Every browser that was signed in as {{ username }} was signed out.{% endif %}
7
+ reset link.{% if signedOut %} Every browser that was signed in as {{ username }} was signed out.{% endif %}{% if appsDisconnected %} Every app connected to the account was disconnected, so each one has to be connected again.{% endif %}
8
+
8
9
 
9
10
  If that was you, there is nothing to do.
10
11
 
@@ -48,7 +48,7 @@
48
48
  fediverse actor are one identity — decision-14 makes their archive URL the
49
49
  actor id. -#}
50
50
  {% set sameAs = [] %}
51
- {% for link in siteAuthor.links %}{% set _ = sameAs.push(link.href) %}{% endfor %}
51
+ {% for link in siteAuthor.links %}{% set _ = sameAs.push(link.href | absoluteUrl) %}{% endfor %}
52
52
  {% if personUrl %}{% set _ = sameAs.push(personUrl) %}{% endif %}
53
53
  {% set address = { "@type": "PostalAddress", "addressLocality": siteAuthor.location } if siteAuthor.location else "" %}
54
54
  {% set entryType = "BlogPosting" if type == "post" else "Article" %}
@@ -1 +0,0 @@
1
- {"version":3,"file":"lock-file.d.ts","sourceRoot":"","sources":["../../src/jobs/lock-file.ts"],"names":[],"mappings":"AAUA,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEhD;AAED,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAErD;AAED;;;;;;;;GAQG;AACH,wBAAsB,YAAY,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAe1F"}
@@ -1 +0,0 @@
1
- {"version":3,"file":"lock-file.js","sourceRoot":"","sources":["../../src/jobs/lock-file.ts"],"names":[],"mappings":"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"}
File without changes