@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.
Files changed (257) hide show
  1. package/admin/pages/account/forgot.njk +13 -7
  2. package/admin/pages/account/reset.njk +1 -1
  3. package/admin/pages/documents/editor.njk +40 -1
  4. package/admin/pages/users/edit.njk +36 -4
  5. package/admin/pages/users/new.njk +19 -1
  6. package/admin/static/admin.css +32 -25
  7. package/dist/admin/admin-bar.d.ts.map +1 -1
  8. package/dist/admin/admin-bar.js +11 -10
  9. package/dist/admin/admin-bar.js.map +1 -1
  10. package/dist/admin/autosave.d.ts.map +1 -1
  11. package/dist/admin/autosave.js +1 -2
  12. package/dist/admin/autosave.js.map +1 -1
  13. package/dist/admin/confirm-password.d.ts +19 -1
  14. package/dist/admin/confirm-password.d.ts.map +1 -1
  15. package/dist/admin/confirm-password.js +40 -8
  16. package/dist/admin/confirm-password.js.map +1 -1
  17. package/dist/admin/connected-apps.d.ts.map +1 -1
  18. package/dist/admin/connected-apps.js +1 -0
  19. package/dist/admin/connected-apps.js.map +1 -1
  20. package/dist/admin/credentials.d.ts +0 -1
  21. package/dist/admin/credentials.d.ts.map +1 -1
  22. package/dist/admin/credentials.js +1 -2
  23. package/dist/admin/credentials.js.map +1 -1
  24. package/dist/admin/documents.d.ts +0 -7
  25. package/dist/admin/documents.d.ts.map +1 -1
  26. package/dist/admin/documents.js +29 -19
  27. package/dist/admin/documents.js.map +1 -1
  28. package/dist/admin/editor-layout.js +2 -2
  29. package/dist/admin/editor-layout.js.map +1 -1
  30. package/dist/admin/export.d.ts +2 -0
  31. package/dist/admin/export.d.ts.map +1 -1
  32. package/dist/admin/export.js +5 -4
  33. package/dist/admin/export.js.map +1 -1
  34. package/dist/admin/headers.d.ts.map +1 -1
  35. package/dist/admin/headers.js +4 -0
  36. package/dist/admin/headers.js.map +1 -1
  37. package/dist/admin/index.d.ts +7 -7
  38. package/dist/admin/index.d.ts.map +1 -1
  39. package/dist/admin/index.js +5 -5
  40. package/dist/admin/index.js.map +1 -1
  41. package/dist/admin/indieauth-consent.d.ts.map +1 -1
  42. package/dist/admin/indieauth-consent.js +3 -2
  43. package/dist/admin/indieauth-consent.js.map +1 -1
  44. package/dist/admin/legacy-migrations.d.ts.map +1 -1
  45. package/dist/admin/legacy-migrations.js +6 -2
  46. package/dist/admin/legacy-migrations.js.map +1 -1
  47. package/dist/admin/plugins.d.ts +2 -0
  48. package/dist/admin/plugins.d.ts.map +1 -1
  49. package/dist/admin/plugins.js +15 -11
  50. package/dist/admin/plugins.js.map +1 -1
  51. package/dist/admin/recovery.d.ts +7 -4
  52. package/dist/admin/recovery.d.ts.map +1 -1
  53. package/dist/admin/recovery.js +68 -43
  54. package/dist/admin/recovery.js.map +1 -1
  55. package/dist/admin/routes.d.ts.map +1 -1
  56. package/dist/admin/routes.js +99 -76
  57. package/dist/admin/routes.js.map +1 -1
  58. package/dist/admin/uploads.d.ts +4 -13
  59. package/dist/admin/uploads.d.ts.map +1 -1
  60. package/dist/admin/uploads.js +9 -28
  61. package/dist/admin/uploads.js.map +1 -1
  62. package/dist/admin/users.d.ts +7 -0
  63. package/dist/admin/users.d.ts.map +1 -1
  64. package/dist/admin/users.js +156 -43
  65. package/dist/admin/users.js.map +1 -1
  66. package/dist/admin/wiki-mentions.d.ts +31 -0
  67. package/dist/admin/wiki-mentions.d.ts.map +1 -0
  68. package/dist/admin/wiki-mentions.js +129 -0
  69. package/dist/admin/wiki-mentions.js.map +1 -0
  70. package/dist/cli/commands.d.ts.map +1 -1
  71. package/dist/cli/commands.js +12 -1
  72. package/dist/cli/commands.js.map +1 -1
  73. package/dist/cli/help.d.ts.map +1 -1
  74. package/dist/cli/help.js +5 -4
  75. package/dist/cli/help.js.map +1 -1
  76. package/dist/cli/password.js +3 -3
  77. package/dist/cli/password.js.map +1 -1
  78. package/dist/cli/serve.d.ts.map +1 -1
  79. package/dist/cli/serve.js +17 -0
  80. package/dist/cli/serve.js.map +1 -1
  81. package/dist/cli/user.d.ts +1 -1
  82. package/dist/cli/user.d.ts.map +1 -1
  83. package/dist/cli/user.js +74 -11
  84. package/dist/cli/user.js.map +1 -1
  85. package/dist/cms/services.d.ts.map +1 -1
  86. package/dist/cms/services.js +10 -1
  87. package/dist/cms/services.js.map +1 -1
  88. package/dist/config.d.ts +8 -4
  89. package/dist/config.d.ts.map +1 -1
  90. package/dist/config.js +4 -1
  91. package/dist/config.js.map +1 -1
  92. package/dist/content/document-form.d.ts +2 -0
  93. package/dist/content/document-form.d.ts.map +1 -1
  94. package/dist/content/document-form.js +10 -0
  95. package/dist/content/document-form.js.map +1 -1
  96. package/dist/content/document-kind.d.ts +5 -0
  97. package/dist/content/document-kind.d.ts.map +1 -1
  98. package/dist/content/document-kind.js +3 -0
  99. package/dist/content/document-kind.js.map +1 -1
  100. package/dist/content/sqlite/backlinks.d.ts.map +1 -1
  101. package/dist/content/sqlite/backlinks.js +4 -3
  102. package/dist/content/sqlite/backlinks.js.map +1 -1
  103. package/dist/content/sqlite/lookups.d.ts.map +1 -1
  104. package/dist/content/sqlite/lookups.js +6 -2
  105. package/dist/content/sqlite/lookups.js.map +1 -1
  106. package/dist/content/sqlite/schema.d.ts.map +1 -1
  107. package/dist/content/sqlite/schema.js +18 -0
  108. package/dist/content/sqlite/schema.js.map +1 -1
  109. package/dist/content/sqlite/writes.d.ts.map +1 -1
  110. package/dist/content/sqlite/writes.js +6 -0
  111. package/dist/content/sqlite/writes.js.map +1 -1
  112. package/dist/content/store.d.ts +3 -3
  113. package/dist/content/wiki-aliases.d.ts +23 -0
  114. package/dist/content/wiki-aliases.d.ts.map +1 -0
  115. package/dist/content/wiki-aliases.js +45 -0
  116. package/dist/content/wiki-aliases.js.map +1 -0
  117. package/dist/content/wiki-mentions.d.ts +30 -0
  118. package/dist/content/wiki-mentions.d.ts.map +1 -0
  119. package/dist/content/wiki-mentions.js +120 -0
  120. package/dist/content/wiki-mentions.js.map +1 -0
  121. package/dist/content/write.d.ts +2 -2
  122. package/dist/content/write.d.ts.map +1 -1
  123. package/dist/content/write.js +26 -3
  124. package/dist/content/write.js.map +1 -1
  125. package/dist/federation/actor.d.ts.map +1 -1
  126. package/dist/federation/actor.js +9 -5
  127. package/dist/federation/actor.js.map +1 -1
  128. package/dist/federation/keys.d.ts.map +1 -1
  129. package/dist/federation/keys.js +6 -15
  130. package/dist/federation/keys.js.map +1 -1
  131. package/dist/files/atomic.d.ts +7 -1
  132. package/dist/files/atomic.d.ts.map +1 -1
  133. package/dist/files/atomic.js +75 -14
  134. package/dist/files/atomic.js.map +1 -1
  135. package/dist/files/data-files.d.ts +12 -0
  136. package/dist/files/data-files.d.ts.map +1 -1
  137. package/dist/files/data-files.js +24 -0
  138. package/dist/files/data-files.js.map +1 -1
  139. package/dist/files/lock-file.d.ts.map +1 -0
  140. package/dist/{jobs → files}/lock-file.js +1 -1
  141. package/dist/files/lock-file.js.map +1 -0
  142. package/dist/gemini/certificate.d.ts.map +1 -1
  143. package/dist/gemini/certificate.js +15 -12
  144. package/dist/gemini/certificate.js.map +1 -1
  145. package/dist/indieauth/grants.d.ts +1 -0
  146. package/dist/indieauth/grants.d.ts.map +1 -1
  147. package/dist/indieauth/grants.js.map +1 -1
  148. package/dist/indieauth/tokens.d.ts +4 -1
  149. package/dist/indieauth/tokens.d.ts.map +1 -1
  150. package/dist/indieauth/tokens.js +7 -3
  151. package/dist/indieauth/tokens.js.map +1 -1
  152. package/dist/jobs/file-records.js +1 -1
  153. package/dist/jobs/file-records.js.map +1 -1
  154. package/dist/jobs/processes.d.ts +0 -1
  155. package/dist/jobs/processes.d.ts.map +1 -1
  156. package/dist/jobs/processes.js +1 -9
  157. package/dist/jobs/processes.js.map +1 -1
  158. package/dist/mcp/authoring/wiki.d.ts.map +1 -1
  159. package/dist/mcp/authoring/wiki.js +20 -5
  160. package/dist/mcp/authoring/wiki.js.map +1 -1
  161. package/dist/notifications/mail-service.d.ts.map +1 -1
  162. package/dist/notifications/mail-service.js +16 -1
  163. package/dist/notifications/mail-service.js.map +1 -1
  164. package/dist/plugin.d.ts +3 -2
  165. package/dist/plugin.d.ts.map +1 -1
  166. package/dist/plugin.js.map +1 -1
  167. package/dist/plugins/site.d.ts.map +1 -1
  168. package/dist/plugins/site.js +1 -1
  169. package/dist/plugins/site.js.map +1 -1
  170. package/dist/site/admin-paths.d.ts +7 -0
  171. package/dist/site/admin-paths.d.ts.map +1 -1
  172. package/dist/site/admin-paths.js +18 -0
  173. package/dist/site/admin-paths.js.map +1 -1
  174. package/dist/site/passwords.d.ts +9 -2
  175. package/dist/site/passwords.d.ts.map +1 -1
  176. package/dist/site/passwords.js +45 -14
  177. package/dist/site/passwords.js.map +1 -1
  178. package/dist/site/users.d.ts +67 -11
  179. package/dist/site/users.d.ts.map +1 -1
  180. package/dist/site/users.js +207 -35
  181. package/dist/site/users.js.map +1 -1
  182. package/dist/store/schema.d.ts.map +1 -1
  183. package/dist/store/schema.js +11 -0
  184. package/dist/store/schema.js.map +1 -1
  185. package/dist/store/sessions.d.ts +3 -0
  186. package/dist/store/sessions.d.ts.map +1 -1
  187. package/dist/store/sessions.js +27 -18
  188. package/dist/store/sessions.js.map +1 -1
  189. package/dist/store/tokens.d.ts +4 -2
  190. package/dist/store/tokens.d.ts.map +1 -1
  191. package/dist/store/tokens.js +16 -10
  192. package/dist/store/tokens.js.map +1 -1
  193. package/dist/util/html-tree.d.ts +4 -0
  194. package/dist/util/html-tree.d.ts.map +1 -1
  195. package/dist/util/html-tree.js +34 -0
  196. package/dist/util/html-tree.js.map +1 -1
  197. package/dist/util/process-alive.d.ts +3 -0
  198. package/dist/util/process-alive.d.ts.map +1 -0
  199. package/dist/util/process-alive.js +11 -0
  200. package/dist/util/process-alive.js.map +1 -0
  201. package/dist/web/compression.js +2 -3
  202. package/dist/web/compression.js.map +1 -1
  203. package/dist/web/conversation-feed.d.ts +15 -4
  204. package/dist/web/conversation-feed.d.ts.map +1 -1
  205. package/dist/web/conversation-feed.js +31 -5
  206. package/dist/web/conversation-feed.js.map +1 -1
  207. package/dist/web/feed-item.d.ts +3 -1
  208. package/dist/web/feed-item.d.ts.map +1 -1
  209. package/dist/web/feed-item.js +5 -1
  210. package/dist/web/feed-item.js.map +1 -1
  211. package/dist/web/feed-routes.d.ts.map +1 -1
  212. package/dist/web/feed-routes.js +2 -0
  213. package/dist/web/feed-routes.js.map +1 -1
  214. package/dist/web/feed-rss.d.ts.map +1 -1
  215. package/dist/web/feed-rss.js +25 -2
  216. package/dist/web/feed-rss.js.map +1 -1
  217. package/dist/web/feed-source.d.ts +10 -3
  218. package/dist/web/feed-source.d.ts.map +1 -1
  219. package/dist/web/feed-source.js.map +1 -1
  220. package/dist/web/feeds.js +1 -1
  221. package/dist/web/feeds.js.map +1 -1
  222. package/dist/web/indieauth-bearer.js +2 -2
  223. package/dist/web/indieauth-bearer.js.map +1 -1
  224. package/dist/web/indieauth-token.js +3 -3
  225. package/dist/web/indieauth-token.js.map +1 -1
  226. package/dist/web/session.d.ts +6 -1
  227. package/dist/web/session.d.ts.map +1 -1
  228. package/dist/web/session.js +21 -3
  229. package/dist/web/session.js.map +1 -1
  230. package/dist/web/signed-in.d.ts.map +1 -1
  231. package/dist/web/signed-in.js +6 -2
  232. package/dist/web/signed-in.js.map +1 -1
  233. package/dist/web/throttle.d.ts +26 -18
  234. package/dist/web/throttle.d.ts.map +1 -1
  235. package/dist/web/throttle.js +130 -24
  236. package/dist/web/throttle.js.map +1 -1
  237. package/dist/webmention/reply-context/feed.d.ts +26 -0
  238. package/dist/webmention/reply-context/feed.d.ts.map +1 -0
  239. package/dist/webmention/reply-context/feed.js +107 -0
  240. package/dist/webmention/reply-context/feed.js.map +1 -0
  241. package/dist/webmention/reply-context.d.ts +5 -1
  242. package/dist/webmention/reply-context.d.ts.map +1 -1
  243. package/dist/webmention/reply-context.js +21 -10
  244. package/dist/webmention/reply-context.js.map +1 -1
  245. package/dist/webmention/reply-contexts.js +5 -0
  246. package/dist/webmention/reply-contexts.js.map +1 -1
  247. package/package.json +6 -4
  248. package/templates/site/gitignore +4 -0
  249. package/themes/default/mail/email-changed.html.njk +17 -0
  250. package/themes/default/mail/email-changed.subject.njk +1 -0
  251. package/themes/default/mail/email-changed.txt.njk +14 -0
  252. package/themes/default/mail/password-changed.html.njk +1 -1
  253. package/themes/default/mail/password-changed.txt.njk +2 -1
  254. package/themes/default/partials/jsonld.njk +1 -1
  255. package/dist/jobs/lock-file.d.ts.map +0 -1
  256. package/dist/jobs/lock-file.js.map +0 -1
  257. /package/dist/{jobs → files}/lock-file.d.ts +0 -0
@@ -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"}
@@ -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":"AAEA;;;;;;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,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAWrD;AAED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAY7E"}
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"}
@@ -1,4 +1,6 @@
1
- import { argon2Sync, randomBytes, timingSafeEqual } from 'node:crypto';
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 tag = derive(password, parsed.salt, {
62
- memory: parsed.memory,
63
- passes: parsed.passes,
64
- parallelism: parsed.parallelism,
65
- tagLength: parsed.tag.length,
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(argon2Sync('argon2id', {
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) || !isPositiveInteger(passes) || !isPositiveInteger(parallelism)) {
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 || tag === undefined || salt.length === 0 || tag.length === 0) {
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":"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"}
1
+ {"version":3,"file":"passwords.js","sourceRoot":"","sources":["../../src/site/passwords.ts"],"names":[],"mappings":"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"}
@@ -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 {
@@ -205,6 +213,18 @@ export declare function countUsers(dataDir: string): number;
205
213
  export declare function findUser(dataDir: string, username: string): StoredUser | undefined;
206
214
  /** The user behind a session's `userId`, or `undefined`. */
207
215
  export declare function findUserById(dataDir: string, id: number): User | undefined;
216
+ /** Who a session, reset link or token was issued to. */
217
+ export interface IssuedTo {
218
+ readonly userId: number;
219
+ readonly userUid?: string | undefined;
220
+ readonly issuedAt?: string | undefined;
221
+ }
222
+ /**
223
+ * The user `issued` names, when the file still holds that same person under
224
+ * its id: the uids must match, and one issued with none matches only a user
225
+ * who has none.
226
+ */
227
+ export declare function userIssuedTo(dataDir: string, issued: IssuedTo): User | undefined;
208
228
  /**
209
229
  * The user a forgot-password form named, by either of the two things somebody
210
230
  * might type: their username or their email address.
@@ -218,22 +238,30 @@ export declare function findUserById(dataDir: string, id: number): User | undefi
218
238
  * would. The empty string matches nobody, however many users have no email.
219
239
  */
220
240
  export declare function findUserByIdentifier(dataDir: string, identifier: string): User | undefined;
241
+ /** Thrown when first-run setup is asked to add a user to a site that has one. */
242
+ export declare class SetupClosedError extends Error {
243
+ readonly name = "SetupClosedError";
244
+ constructor();
245
+ }
221
246
  /**
222
247
  * Hash the password and add the user to the file.
223
248
  *
224
- * Throws {@link DuplicateUsernameError} when the name is taken. The check is
225
- * inside the write, not before it, which is what makes it the rule the
226
- * `UNIQUE` index used to be: two requests adding the same name at the same
227
- * moment queue behind one another on the file, so the second one reads the
228
- * first one's work and is refused.
249
+ * Throws {@link DuplicateUsernameError} when the name is taken, or differs
250
+ * from a taken one only by case or punctuation: such names share a key file
251
+ * under `data/keys`, and fediverse servers treat handles that differ only by
252
+ * case as one account. Throws
253
+ * {@link SetupClosedError} when `onlyIfNoUsers` is set and the file already
254
+ * holds somebody. Both checks are inside the write, not before it, which is
255
+ * what makes the first the rule the `UNIQUE` index used to be: two requests
256
+ * adding at the same moment queue behind one another on the file, so the
257
+ * second one reads the first one's work and is refused.
229
258
  */
230
259
  export declare function createUser(input: CreateUserInput): Promise<User>;
231
- export type UserChange = Partial<Omit<StoredUser, 'id' | 'username' | 'createdAt'>>;
260
+ export type UserChange = Partial<Omit<StoredUser, 'id' | 'uid' | 'username' | 'createdAt'>>;
232
261
  export declare function updateUser(dataDir: string, userId: number, change: (user: StoredUser, everyone: readonly StoredUser[]) => UserChange): Promise<boolean>;
233
262
  /**
234
263
  * Hash a new password and put it on a user, replacing the old one. Returns
235
- * `false` when there is no such user. Sessions are left alone; deciding which
236
- * of them a password change should end is the caller's business.
264
+ * `false` when there is no such user.
237
265
  */
238
266
  export declare function setUserPassword(input: {
239
267
  /** Which site's users file to write. */
@@ -242,6 +270,7 @@ export declare function setUserPassword(input: {
242
270
  userId: number;
243
271
  /** The new plain password, hashed on the way in. */
244
272
  password: string;
273
+ now: Date;
245
274
  }): Promise<boolean>;
246
275
  /**
247
276
  * Put an email address on a user, or take the one they had off.
@@ -267,8 +296,9 @@ export declare function setUserEmail(input: {
267
296
  * what the form on the users screen submits: four boxes and a Save, and a
268
297
  * field somebody cleared is a field they no longer want. {@link cleanProfile}
269
298
  * 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 `false` when
271
- * there is no such user.
299
+ * no `profile` key rather than with an empty object. Returns whether the
300
+ * stored profile changed, so `false` both when there is no such user and when
301
+ * the save left it as it was.
272
302
  */
273
303
  export declare function setUserProfile(input: {
274
304
  /** Which site's users file to write. */
@@ -286,6 +316,7 @@ export declare function setUserProfile(input: {
286
316
  * link with no URL is not somewhere this person is.
287
317
  */
288
318
  export declare function cleanProfile(profile: UserProfile): UserProfile | undefined;
319
+ export declare function isAvatarUrl(avatar: string): boolean;
289
320
  /**
290
321
  * Turn one notice on or off for one user.
291
322
  *
@@ -365,6 +396,10 @@ export declare class ConflictingActorIdError extends Error {
365
396
  readonly username: string;
366
397
  constructor(username: string, what: string);
367
398
  }
399
+ export declare class InvalidActorIdError extends Error {
400
+ readonly name = "InvalidActorIdError";
401
+ constructor(actorId: string);
402
+ }
368
403
  /**
369
404
  * Write the actor id a user was published under elsewhere.
370
405
  *
@@ -381,6 +416,7 @@ export declare class ConflictingActorIdError extends Error {
381
416
  export declare function setUserActorId(input: {
382
417
  /** Which site's users file to write. */
383
418
  dataDir: string;
419
+ baseUrl: string;
384
420
  /** Whose record, by login name. */
385
421
  username: string;
386
422
  /** The id they were published under, query string and all. */
@@ -393,15 +429,35 @@ export declare class UnknownUserError extends Error {
393
429
  readonly username: string;
394
430
  constructor(username: string);
395
431
  }
432
+ /** Why a user could not be removed. */
433
+ export type UserRemovalRefusal = 'only-user' | 'own-account';
434
+ /** Thrown when removing a user would break a rule about who the site keeps. */
435
+ export declare class UserRemovalRefusedError extends Error {
436
+ readonly name = "UserRemovalRefusedError";
437
+ /** Which rule the removal would have broken. */
438
+ readonly reason: UserRemovalRefusal;
439
+ /** Whose removal was refused. */
440
+ readonly username: string;
441
+ constructor(reason: UserRemovalRefusal, username: string);
442
+ }
443
+ /**
444
+ * Take a user out of the file. Returns whether they were there.
445
+ *
446
+ * Throws {@link UserRemovalRefusedError} rather than leave the site with
447
+ * nobody or let `signedInAs` remove themselves.
448
+ */
396
449
  export declare function removeUserRecord(input: {
397
450
  dataDir: string;
398
451
  userId: number;
452
+ /** The user asking for the removal, when it is a person. */
453
+ signedInAs?: number | null | undefined;
454
+ beforeRemoval?: ((userId: number) => void | Promise<void>) | undefined;
399
455
  }): Promise<boolean>;
400
456
  /**
401
457
  * The user, when the password is theirs; `undefined` when it is not, or when
402
458
  * there is no such user. The two failures are deliberately indistinguishable.
403
459
  */
404
- export declare function verifyUserPassword(dataDir: string, username: string, password: string): User | undefined;
460
+ export declare function verifyUserPassword(dataDir: string, username: string, password: string): Promise<User | undefined>;
405
461
  /** The file as it is on disk: the users, and the next id to hand out. */
406
462
  export interface UsersFileContents {
407
463
  /** Everyone who may sign in, in the order the file lists them. */
@@ -1 +1 @@
1
- {"version":3,"file":"users.d.ts","sourceRoot":"","sources":["../../src/site/users.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"users.d.ts","sourceRoot":"","sources":["../../src/site/users.ts"],"names":[],"mappings":"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"}