@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
@@ -1,11 +1,13 @@
1
- import { findUserById, findUserByIdentifier, setUserPassword } from '../site/users.js';
1
+ import { revokeTokensForUser } from '../indieauth/tokens.js';
2
+ import { findUserByIdentifier, setUserPassword, userIssuedTo } from '../site/users.js';
3
+ import { messageOf } from '../util/errors.js';
2
4
  import { stringOrEmpty } from '../util/forms.js';
3
5
  import { absoluteUrl } from '../util/url.js';
4
6
  import { passwordProblem } from './credentials.js';
5
7
  import { flash } from './flash.js';
6
8
  import { ADMIN_PREFIX } from '../site/admin-paths.js';
7
9
  import { ADMIN_TEMPLATES } from './templates.js';
8
- import { clientAddress, describeWait, loginKeys } from '../web/throttle.js';
10
+ import { clientAddress, describeWait } from '../web/throttle.js';
9
11
  /**
10
12
  * Forgetting a password, and getting back in without a shell.
11
13
  *
@@ -22,8 +24,9 @@ import { clientAddress, describeWait, loginKeys } from '../web/throttle.js';
22
24
  * not a stack of working links, and the token is never rendered into the
23
25
  * page of the browser that asked for it — only into the message.
24
26
  * - **It is spent when it is used.** Setting a password deletes every reset
25
- * that user had outstanding and ends every session they had, because the
26
- * ordinary reason to reset a password is that somebody else may have had it.
27
+ * that user had outstanding, ends every session they had and disconnects
28
+ * every app they had connected, because the ordinary reason to reset a
29
+ * password is that somebody else may have had it.
27
30
  * - **It cannot be a lever.** Requests are rate limited exactly as sign-ins
28
31
  * are, on a throttle of their own, so a flood of recovery requests
29
32
  * for one username cannot lock that person out of logging in.
@@ -63,7 +66,7 @@ export const RECOVERY_ANSWER = 'If that matches an account with an email address
63
66
  'its way. The link lasts an hour and works once. Check the spam folder if it does not arrive.';
64
67
  /** Register the forgot-password and reset screens. */
65
68
  export function mountRecovery(app, options) {
66
- const { render, anonymousSession, throttle } = options;
69
+ const { render, anonymousSession, recoveryThrottle, loginThrottle } = options;
67
70
  app.get(FORGOT_PATH, (c) => {
68
71
  anonymousSession(c);
69
72
  return render(c, ADMIN_TEMPLATES.forgot, forgotScreen(c));
@@ -73,8 +76,8 @@ export function mountRecovery(app, options) {
73
76
  const body = await c.req.parseBody();
74
77
  const identifier = stringOrEmpty(body[RECOVERY_FIELDS.identifier]).trim();
75
78
  const address = clientAddress(c, config);
76
- const keys = loginKeys(identifier, address);
77
- const throttled = throttle(config);
79
+ const keys = { identifier, address };
80
+ const throttled = recoveryThrottle(config);
78
81
  const wait = throttled.retryAfter(keys);
79
82
  if (wait !== undefined) {
80
83
  anonymousSession(c);
@@ -90,28 +93,13 @@ export function mountRecovery(app, options) {
90
93
  // this handler refuses to give.
91
94
  throttled.fail(keys);
92
95
  const user = identifier === '' ? undefined : findUserByIdentifier(config.dataDir, identifier);
93
- if (user?.email !== undefined && c.var.mailConfigured) {
94
- // A good moment to sweep: resets are rare, and this is the one handler
95
- // that writes a row to the table.
96
- c.var.admin.prunePasswordResets();
97
- const reset = c.var.admin.createPasswordReset({
98
- userId: user.id,
99
- lifetimeSeconds: RESET_TOKEN_LIFETIME_SECONDS,
100
- });
101
- // Dropped rather than awaited, for two reasons: the answer is the same
102
- // whatever the provider says, and waiting for a provider on one path and
103
- // not the other is how the page's timing would start telling people
104
- // which usernames exist.
105
- void c.var.mail.send({
106
- to: user.email,
107
- template: RESET_TEMPLATE,
108
- data: {
109
- username: user.username,
110
- resetUrl: resetLink(config.baseUrl, reset.token),
111
- expiresAt: reset.expiresAt,
112
- expiresInHours: RESET_TOKEN_LIFETIME_SECONDS / 3600,
113
- },
114
- });
96
+ if (user?.email !== undefined && canSendRecovery(c)) {
97
+ try {
98
+ sendResetLink(c, user.email, user);
99
+ }
100
+ catch (error) {
101
+ console.warn(`Could not create a password reset link: ${messageOf(error)}`);
102
+ }
115
103
  }
116
104
  anonymousSession(c);
117
105
  return render(c, ADMIN_TEMPLATES.forgot, forgotScreen(c, { sent: true }));
@@ -141,20 +129,21 @@ export function mountRecovery(app, options) {
141
129
  // Nothing typed is echoed back: both fields are passwords.
142
130
  return render(c, ADMIN_TEMPLATES.reset, resetScreen(token, { problem }));
143
131
  }
144
- const user = findUserById(dataDir, reset.userId);
145
- if (user === undefined) {
146
- // The account went while the link was in flight. The token is worthless
147
- // now, and saying so beats a 500 from a write against nobody.
148
- c.var.admin.deletePasswordResetsForUser(reset.userId);
132
+ const spent = c.var.admin.spendPasswordReset(token);
133
+ const user = spent === undefined
134
+ ? undefined
135
+ : userIssuedTo(dataDir, { ...spent, issuedAt: spent.createdAt });
136
+ if (user === undefined)
149
137
  return refuseToken(c);
150
- }
151
- await setUserPassword({ dataDir, userId: user.id, password });
152
- // Everything that was a way into this account is now closed: the link that
153
- // was just used, every other link asked for while it was in flight, and
154
- // every browser that was signed in. Nobody is spared, because the person
155
- // doing this is not signed in — they are about to be.
156
138
  c.var.admin.deletePasswordResetsForUser(user.id);
157
139
  const ended = c.var.admin.deleteSessionsForUser(user.id);
140
+ const disconnected = await revokeTokensForUser(dataDir, user.id, c.var.config.now());
141
+ await setUserPassword({ dataDir, userId: user.id, password, now: c.var.config.now() });
142
+ loginThrottle(c.var.config).forget(user.username);
143
+ const recovery = recoveryThrottle(c.var.config);
144
+ recovery.forget(user.username);
145
+ if (user.email !== undefined)
146
+ recovery.forget(user.email);
158
147
  if (user.email !== undefined) {
159
148
  // The other half of the OWASP guidance: whoever owns the address hears
160
149
  // that the password changed, so a reset they did not ask for is
@@ -162,12 +151,39 @@ export function mountRecovery(app, options) {
162
151
  void c.var.mail.send({
163
152
  to: user.email,
164
153
  template: PASSWORD_CHANGED_TEMPLATE,
165
- data: { username: user.username, signedOut: ended },
154
+ data: { username: user.username, signedOut: ended, appsDisconnected: disconnected },
166
155
  });
167
156
  }
168
- flash(c, 'notice', 'Your password was changed. Sign in with the new one.');
157
+ flash(c, 'notice', disconnected === 0
158
+ ? 'Your password was changed. Sign in with the new one.'
159
+ : `Your password was changed, and ${appsDisconnectedPhrase(disconnected)}. Sign in with the new one.`);
169
160
  return c.redirect(LOGIN_REDIRECT, 303);
170
161
  });
162
+ function sendResetLink(c, email, user) {
163
+ // A good moment to sweep: resets are rare, and this is the one handler
164
+ // that writes a row to the table.
165
+ c.var.admin.prunePasswordResets();
166
+ c.var.admin.deletePasswordResetsForUser(user.id);
167
+ const reset = c.var.admin.createPasswordReset({
168
+ userId: user.id,
169
+ userUid: user.uid,
170
+ lifetimeSeconds: RESET_TOKEN_LIFETIME_SECONDS,
171
+ });
172
+ // Dropped rather than awaited, for two reasons: the answer is the same
173
+ // whatever the provider says, and waiting for a provider on one path and
174
+ // not the other is how the page's timing would start telling people
175
+ // which usernames exist.
176
+ void c.var.mail.send({
177
+ to: email,
178
+ template: RESET_TEMPLATE,
179
+ data: {
180
+ username: user.username,
181
+ resetUrl: resetLink(c.var.config.baseUrl, reset.token),
182
+ expiresAt: reset.expiresAt,
183
+ expiresInHours: RESET_TOKEN_LIFETIME_SECONDS / 3600,
184
+ },
185
+ });
186
+ }
171
187
  /** What both handlers say to a token that buys nothing. */
172
188
  function refuseToken(c) {
173
189
  anonymousSession(c);
@@ -188,13 +204,17 @@ export function mountRecovery(app, options) {
188
204
  // Read per request, exactly as the mail service reads it: a credential
189
205
  // pasted into the settings screen turns recovery on for the next visitor
190
206
  // without a restart.
191
- configured: c.var.mailConfigured,
207
+ configured: canSendRecovery(c),
208
+ devMode: c.var.devMode,
192
209
  answer: RECOVERY_ANSWER,
193
210
  sent: false,
194
211
  ...extra,
195
212
  };
196
213
  }
197
214
  }
215
+ function canSendRecovery(c) {
216
+ return c.var.mailConfigured && !c.var.devMode;
217
+ }
198
218
  /** Where a finished reset sends the browser. Spelled here to avoid a cycle. */
199
219
  const LOGIN_REDIRECT = `${ADMIN_PREFIX}/login`;
200
220
  /** Everything the reset template renders for a link that is still good. */
@@ -208,6 +228,11 @@ function resetScreen(token, extra = {}) {
208
228
  ...extra,
209
229
  };
210
230
  }
231
+ export function appsDisconnectedPhrase(count) {
232
+ return count === 1
233
+ ? '1 connected app was disconnected'
234
+ : `${String(count)} connected apps were disconnected`;
235
+ }
211
236
  /**
212
237
  * What is wrong with the password somebody typed into the reset form.
213
238
  *
@@ -1 +1 @@
1
- {"version":3,"file":"recovery.js","sourceRoot":"","sources":["../../src/admin/recovery.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"recovery.js","sourceRoot":"","sources":["../../src/admin/recovery.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../../src/admin/routes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAW,IAAI,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAC;AAI7D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAoEhD,sCAAsC;AACtC,eAAO,MAAM,UAAU,iBAA0B,CAAC;AAClD,mCAAmC;AACnC,eAAO,MAAM,WAAW,kBAA2B,CAAC;AAEpD,yCAAyC;AACzC,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEnD;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG,IAAI,CAkWtD;AA8CD;;;;;GAKG;AACH,eAAO,MAAM,KAAK,EAAE,iBAAiB,CAAC,UAAU,CAsD/C,CAAC"}
1
+ {"version":3,"file":"routes.d.ts","sourceRoot":"","sources":["../../src/admin/routes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAW,IAAI,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAC;AAI7D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AA8EhD,sCAAsC;AACtC,eAAO,MAAM,UAAU,iBAA0B,CAAC;AAClD,mCAAmC;AACnC,eAAO,MAAM,WAAW,kBAA2B,CAAC;AAEpD,yCAAyC;AACzC,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEnD;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG,IAAI,CA8UtD;AAiCD;;;;;GAKG;AACH,eAAO,MAAM,KAAK,EAAE,iBAAiB,CAAC,UAAU,CA6D/C,CAAC"}
@@ -2,13 +2,13 @@ import { mountAppActivity } from './app-activity.js';
2
2
  import { mountAutosave } from './autosave.js';
3
3
  import { mountConnectedApps } from './connected-apps.js';
4
4
  import { CONSENT_PATH, mountConsentScreen } from './indieauth-consent.js';
5
- import { countUsers, createUser, DuplicateUsernameError, findUserById, verifyUserPassword, } from '../site/users.js';
5
+ import { countUsers, createUser, DuplicateUsernameError, findUserById, SetupClosedError, userIssuedTo, verifyUserPassword, } from '../site/users.js';
6
6
  import { adminColorScheme } from '../site/admin-theme.js';
7
7
  import { mountAppearanceScreen } from './appearance.js';
8
8
  import { mountLookScreen } from './look.js';
9
9
  import { adminAssetResponse } from './assets.js';
10
- import { ADMIN_ASSET_PREFIX, ADMIN_PREFIX, editUserPath, LOGIN_PATH } from '../site/admin-paths.js';
11
- import { credentialProblem } from './credentials.js';
10
+ import { ADMIN_ASSET_PREFIX, ADMIN_PREFIX, editUserPath, LOGIN_PATH, returnPath, } from '../site/admin-paths.js';
11
+ import { credentialProblem, MAXIMUM_USERNAME_LENGTH } from './credentials.js';
12
12
  import { editorPath, mountDocumentScreens, newEditorPath, PAGE_SCREENS, POST_SCREENS, WIKI_SCREENS, } from './documents.js';
13
13
  import { mountFederationScreen } from './federation.js';
14
14
  import { takeClearedAutosaves, takeFlash } from './flash.js';
@@ -19,14 +19,14 @@ import { adminMenu } from './menu.js';
19
19
  import { mountMessagesScreen } from './messages.js';
20
20
  import { mountNavigationScreen } from './navigation.js';
21
21
  import { mountPreview } from './preview.js';
22
- import { FORGOT_PATH, mountRecovery, RESET_PATH } from './recovery.js';
22
+ import { FORGOT_PATH, mountRecovery, RECOVERY_FIELDS, RESET_PATH } from './recovery.js';
23
23
  import { mountSettings } from './settings-pages.js';
24
24
  import { mountSyndicationTargetsScreen } from './syndication-targets.js';
25
- import { clearSessionCookie, CROSS_SITE_REFUSAL, crossSiteWrite, csrfTokenMatches, retireOldSessionCookie, sessionIdFrom, setSessionCookie, } from '../web/session.js';
25
+ import { clearSessionCookie, CROSS_SITE_REFUSAL, crossSiteWrite, csrfTokenMatches, retireOldSessionCookie, sessionIdFrom, startSession, } from '../web/session.js';
26
26
  import { CSRF_FIELD } from '../forms/protection.js';
27
27
  import { mountTaxonomyScreens, TAXONOMY_KINDS } from './taxonomy.js';
28
28
  import { ADMIN_TEMPLATES, createAdminTemplateEnvironment } from './templates.js';
29
- import { clientAddress, createLoginThrottle, describeWait, loginKeys } from '../web/throttle.js';
29
+ import { clientAddress, createSignInThrottle, describeWait } from '../web/throttle.js';
30
30
  import { mountToolsScreen } from './tools.js';
31
31
  import { stringOrEmpty } from '../util/forms.js';
32
32
  import { DEV_MODE_PATH, mountDevModeScreen } from './dev-mode.js';
@@ -36,8 +36,10 @@ import { mountPersonalDataScreen } from './personal-data.js';
36
36
  import { mountEditorActions } from './editor-actions.js';
37
37
  import { mountItemLookup, mountItemSearch } from './item-lookup.js';
38
38
  import { mountPluginsScreen, pluginScreens } from './plugins.js';
39
- import { mountUploads, refuseOversizedUpload, UPLOADS_PATH } from './uploads.js';
39
+ import { mountUploads, uploadBodyLimit, uploadTooLarge, UPLOADS_PATH } from './uploads.js';
40
+ import { readWithin } from '../webmention/fetch-public.js';
40
41
  import { mountUsers } from './users.js';
42
+ import { createConfirmPassword } from './confirm-password.js';
41
43
  import { mountWritingGoals } from './writing-goals.js';
42
44
  import { mountDashboard } from './dashboard.js';
43
45
  /** Where the first-run form lives. */
@@ -76,13 +78,14 @@ export function mountAdmin(app) {
76
78
  // anonymous caller can create.
77
79
  let throttled;
78
80
  function loginThrottle(config) {
79
- throttled ??= createLoginThrottle({
81
+ throttled ??= createSignInThrottle({
80
82
  attempts: config.loginAttempts,
81
83
  lockoutSeconds: config.loginLockout,
82
84
  now: config.now,
83
85
  });
84
86
  return throttled;
85
87
  }
88
+ const confirmPassword = createConfirmPassword(loginThrottle);
86
89
  // A second throttle, on the same machinery and the same limits, for the
87
90
  // forgot-password form. Deliberately not the login one: sharing it
88
91
  // would let a stranger lock somebody out of signing in by asking for their
@@ -90,7 +93,7 @@ export function mountAdmin(app) {
90
93
  // into a weapon against the person it exists for.
91
94
  let recoveryThrottled;
92
95
  function recoveryThrottle(config) {
93
- recoveryThrottled ??= createLoginThrottle({
96
+ recoveryThrottled ??= createSignInThrottle({
94
97
  attempts: config.loginAttempts,
95
98
  lockoutSeconds: config.loginLockout,
96
99
  now: config.now,
@@ -146,13 +149,6 @@ export function mountAdmin(app) {
146
149
  const response = adminAssetResponse(decodePath(pathname), c.req.raw.headers);
147
150
  return response ?? c.notFound();
148
151
  });
149
- // In front of the guard, because the guard parses the form to find the CSRF
150
- // token and parsing a multipart form reads the whole file into memory. Every
151
- // multipart endpoint needs it: the editor's uploads and the media screen's
152
- // own form.
153
- app.use(UPLOADS_PATH, refuseOversizedUpload);
154
- app.use(MEDIA_UPLOAD_PATH, refuseOversizedUpload);
155
- app.use(ADMIN_PREFIX, guard);
156
152
  app.use(`${ADMIN_PREFIX}/*`, guard);
157
153
  app.get(SETUP_PATH, (c) => {
158
154
  anonymousSession(c);
@@ -173,12 +169,15 @@ export function mountAdmin(app) {
173
169
  username,
174
170
  password,
175
171
  now: c.var.config.now(),
172
+ onlyIfNoUsers: true,
176
173
  });
177
174
  }
178
175
  catch (error) {
179
176
  if (error instanceof DuplicateUsernameError) {
180
177
  return refuseSetup(c, username, error.message);
181
178
  }
179
+ if (error instanceof SetupClosedError)
180
+ return c.redirect(LOGIN_PATH, 303);
182
181
  throw error;
183
182
  }
184
183
  // The first admin is logged straight in; making an account and then being
@@ -197,7 +196,7 @@ export function mountAdmin(app) {
197
196
  // Forgetting a password. Registered beside the login form, and named in the
198
197
  // guard below, because both of its screens are reached by somebody who by
199
198
  // definition cannot sign in.
200
- mountRecovery(app, { render, anonymousSession, throttle: recoveryThrottle });
199
+ mountRecovery(app, { render, anonymousSession, recoveryThrottle, loginThrottle });
201
200
  app.post(LOGIN_PATH, async (c) => {
202
201
  const config = c.var.config;
203
202
  const body = await c.req.parseBody();
@@ -205,31 +204,33 @@ export function mountAdmin(app) {
205
204
  const password = stringOrEmpty(body[PASSWORD_FIELD]);
206
205
  const returnTo = returnPath(body[RETURN_TO_FIELD]);
207
206
  const address = clientAddress(c, config);
208
- const keys = loginKeys(username, address);
207
+ const keys = { identifier: username, address };
208
+ const attempted = `${shortened(username)} from ${address === undefined ? 'an unknown address' : shortened(address)}`;
209
+ const shown = username.length > MAXIMUM_USERNAME_LENGTH ? '' : username;
209
210
  // Checked before the password is verified, so a lockout refuses the right
210
211
  // password too. An attacker who found the password on the last allowed
211
212
  // guess would otherwise be let straight in.
212
213
  const throttle = loginThrottle(config);
213
214
  const wait = throttle.retryAfter(keys);
214
215
  if (wait !== undefined) {
215
- console.warn(`Refused a sign-in for ${JSON.stringify(username)} from ${address ?? 'an unknown address'}: locked out for another ${wait}s`);
216
+ console.warn(`Refused a sign-in for ${attempted}: locked out for another ${wait}s`);
216
217
  anonymousSession(c);
217
218
  c.status(429);
218
219
  c.header('Retry-After', String(wait));
219
220
  return render(c, ADMIN_TEMPLATES.login, {
220
221
  loginUrl: LOGIN_PATH,
221
222
  forgotUrl: FORGOT_PATH,
222
- username,
223
+ username: shown,
223
224
  returnTo,
224
225
  // Says nothing about whether that username exists: an unknown one is
225
226
  // counted and locked out exactly as a real one is.
226
227
  error: `Too many sign-in attempts. Try again in ${describeWait(wait)}.`,
227
228
  });
228
229
  }
229
- const user = verifyUserPassword(c.var.config.dataDir, username, password);
230
+ throttle.fail(keys);
231
+ const user = await verifyUserPassword(c.var.config.dataDir, username, password);
230
232
  if (user === undefined) {
231
- throttle.fail(keys);
232
- console.warn(`Failed sign-in for ${JSON.stringify(username)} from ${address ?? 'an unknown address'}`);
233
+ console.warn(`Failed sign-in for ${attempted}`);
233
234
  // One message for both failures, so the form cannot be used to find out
234
235
  // which usernames exist.
235
236
  anonymousSession(c);
@@ -237,7 +238,7 @@ export function mountAdmin(app) {
237
238
  return render(c, ADMIN_TEMPLATES.login, {
238
239
  loginUrl: LOGIN_PATH,
239
240
  forgotUrl: FORGOT_PATH,
240
- username,
241
+ username: shown,
241
242
  returnTo,
242
243
  error: 'That username and password do not match.',
243
244
  });
@@ -250,8 +251,8 @@ export function mountAdmin(app) {
250
251
  if (session !== undefined)
251
252
  c.var.admin.deleteSession(session.id);
252
253
  clearSessionCookie(c, c.var.config);
253
- // A shared computer keeps what the admin cached and stored after the
254
- // cookie is gone. This asks the browser to forget all of it for the site.
254
+ // Only the cache: the `cookies` directive clears the whole registrable
255
+ // domain, sibling sites included.
255
256
  c.header('Clear-Site-Data', CLEAR_ON_LOGOUT);
256
257
  return c.redirect(LOGIN_PATH, 303);
257
258
  });
@@ -292,14 +293,14 @@ export function mountAdmin(app) {
292
293
  mountEditorActions(app);
293
294
  mountItemLookup(app);
294
295
  mountItemSearch(app);
295
- mountPluginsScreen(app, { render });
296
+ mountPluginsScreen(app, { render, confirmPassword });
296
297
  // The jobs a site runs rather than the things it sets: reading every file
297
298
  // back into the index, on a site that is serving.
298
299
  mountToolsScreen(app, { render });
299
300
  mountPersonalDataScreen(app, { render });
300
301
  mountMaintenanceScreen(app, { render });
301
302
  mountDevModeScreen(app, { render });
302
- mountExportScreen(app, { render });
303
+ mountExportScreen(app, { render, confirmPassword });
303
304
  // The site's own settings, which are content/_data/site.json itself: the
304
305
  // screen reads that file and writes it back.
305
306
  mountSettings(app, { render });
@@ -312,7 +313,7 @@ export function mountAdmin(app) {
312
313
  mountWritingGoals(app, { render });
313
314
  // Who may sign in: the list, the add form, and the change-password form for
314
315
  // whoever is looking at it.
315
- mountUsers(app, { render });
316
+ mountUsers(app, { render, confirmPassword });
316
317
  // The fediverse side: the actor, the followers, the inbox log, and what the
317
318
  // site sent to whom.
318
319
  mountFederationScreen(app, { render });
@@ -322,16 +323,7 @@ export function mountAdmin(app) {
322
323
  app.get(`${ADMIN_PREFIX}/`, (c) => c.redirect(ADMIN_PREFIX, 301));
323
324
  /** The session to hang a CSRF token on, made on the spot if there is none. */
324
325
  function anonymousSession(c) {
325
- const existing = c.var.session;
326
- if (existing !== undefined)
327
- return existing;
328
- const session = c.var.admin.createSession({
329
- userId: null,
330
- lifetimeSeconds: c.var.config.sessionLifetime,
331
- });
332
- setSessionCookie(c, session.id, { config: c.var.config, expiresAt: session.expiresAt });
333
- c.set('session', session);
334
- return session;
326
+ return c.var.session ?? startSession(c, undefined);
335
327
  }
336
328
  /** Re-render the setup form with a message, and the status a bad form gets. */
337
329
  function refuseSetup(c, username, error) {
@@ -354,12 +346,7 @@ export function mountAdmin(app) {
354
346
  admin.deleteSession(previous.id);
355
347
  // Logging in is rare and cheap; it is a good moment to sweep the table.
356
348
  admin.pruneSessions();
357
- const session = admin.createSession({
358
- userId: user.id,
359
- lifetimeSeconds: c.var.config.sessionLifetime,
360
- });
361
- setSessionCookie(c, session.id, { config: c.var.config, expiresAt: session.expiresAt });
362
- c.set('session', session);
349
+ startSession(c, user);
363
350
  return c.redirect(returnTo ?? ADMIN_PREFIX, 303);
364
351
  }
365
352
  }
@@ -380,27 +367,11 @@ const RETURN_TO_FIELD = 'return_to';
380
367
  * with the request intact.
381
368
  */
382
369
  const RETURNABLE_PATHS = new Set([CONSENT_PATH]);
383
- /**
384
- * A return address that stays in the admin, or `undefined`.
385
- *
386
- * Only a path under `/admin`, in printable ASCII with no backslash, which a
387
- * browser could read as a different host, and no space or control character,
388
- * which a header would refuse: the login form can never be used to send
389
- * somebody off the site.
390
- */
391
- function returnPath(value) {
392
- if (typeof value !== 'string' || !/^[!-[\]-~]+$/.test(value))
393
- return undefined;
394
- const url = URL.parse(value, 'http://admin.invalid');
395
- if (url === null || url.origin !== 'http://admin.invalid')
396
- return undefined;
397
- const { pathname } = url;
398
- if (pathname !== ADMIN_PREFIX && !pathname.startsWith(`${ADMIN_PREFIX}/`))
399
- return undefined;
400
- return value.startsWith('/') ? value : undefined;
370
+ function shortened(text) {
371
+ const cut = text.slice(0, MAXIMUM_USERNAME_LENGTH);
372
+ return JSON.stringify(cut) + (cut.length < text.length ? '…' : '');
401
373
  }
402
- /** `Clear-Site-Data` on logout: every kind of data a browser keeps for the site. */
403
- const CLEAR_ON_LOGOUT = '"cache", "cookies", "storage"';
374
+ const CLEAR_ON_LOGOUT = '"cache"';
404
375
  /** What somebody signed in under the pre-`__Host-` cookie reads on the login form. */
405
376
  const RENAMED_COOKIE_NOTICE = 'The sign-in cookie was renamed to make it harder to tamper with, so you have been signed out. Please sign in again.';
406
377
  /**
@@ -414,14 +385,15 @@ export const guard = async (c, next) => {
414
385
  return c.text(CROSS_SITE_REFUSAL, 403);
415
386
  const admin = c.var.admin;
416
387
  const dataDir = c.var.config.dataDir;
417
- const pathname = new URL(c.req.url).pathname;
388
+ // The decoded path the router dispatches on, so every decision below is made
389
+ // about the handler that will actually run.
390
+ const pathname = c.req.path;
418
391
  // Reading a session prunes it when it has expired, so an expired session is
419
392
  // gone from here on, not merely ignored.
420
393
  const sessionId = sessionIdFrom(c);
421
394
  let session = liveSession(admin, dataDir, sessionId === undefined ? undefined : admin.getSession(sessionId));
422
395
  if (retireOldSessionCookie(c) && session === undefined) {
423
- session = admin.createSession({ userId: null, lifetimeSeconds: c.var.config.sessionLifetime });
424
- setSessionCookie(c, session.id, { config: c.var.config, expiresAt: session.expiresAt });
396
+ session = startSession(c, undefined);
425
397
  admin.pushFlash(session.id, { kind: 'notice', message: RENAMED_COOKIE_NOTICE });
426
398
  }
427
399
  c.set('session', session);
@@ -448,7 +420,14 @@ export const guard = async (c, next) => {
448
420
  }
449
421
  }
450
422
  if (c.req.method !== 'GET' && c.req.method !== 'HEAD') {
451
- if (session === undefined || !csrfTokenMatches(session.csrfToken, await submittedToken(c))) {
423
+ const form = await boundedForm(c, pathname, session?.userId != null);
424
+ if (form instanceof Response)
425
+ return form;
426
+ const token = await form.field(CSRF_FIELD);
427
+ if (session === undefined && (isSetup || isAnonymous) && typeof token === 'string') {
428
+ return expiredForm(c, pathname, form);
429
+ }
430
+ if (session === undefined || !csrfTokenMatches(session.csrfToken, token)) {
452
431
  return c.text('That form was stale or came from somewhere else. Reload and try again.', 403);
453
432
  }
454
433
  }
@@ -462,20 +441,46 @@ export const guard = async (c, next) => {
462
441
  * somebody who was not there. The accounts are a file now and the sessions are
463
442
  * a cache in a database that may be deleted, restored or rebuilt on its own,
464
443
  * so the join is made here instead: a session naming a user the file does not
465
- * hold is deleted, and the request is anonymous. That is exactly what makes a
466
- * login survive a rebuilt database only as far as the file still holds the
467
- * person it was made for.
444
+ * hold, or holds under another uid, is deleted, and the request is anonymous.
445
+ * That is exactly what makes a login survive a rebuilt database only as far as
446
+ * the file still holds the person it was made for.
468
447
  */
469
448
  function liveSession(admin, dataDir, session) {
470
449
  if (session === undefined || session.userId === null)
471
450
  return session;
472
- if (findUserById(dataDir, session.userId) !== undefined)
451
+ const issued = {
452
+ userId: session.userId,
453
+ userUid: session.userUid,
454
+ issuedAt: session.createdAt,
455
+ };
456
+ if (userIssuedTo(dataDir, issued) !== undefined)
473
457
  return session;
474
458
  admin.deleteSession(session.id);
475
459
  return undefined;
476
460
  }
477
- /** The CSRF token in the request body, if the body is a form at all. */
478
- async function submittedToken(c) {
461
+ const ANONYMOUS_FORM_MAX_BYTES = 64 * 1024;
462
+ const SIGNED_IN_FORM_MAX_BYTES = 8 * 1024 * 1024;
463
+ const UPLOAD_PATHS = new Set([UPLOADS_PATH, MEDIA_UPLOAD_PATH]);
464
+ async function boundedForm(c, pathname, signedIn) {
465
+ const form = { field: (name) => submittedField(c, name) };
466
+ if (c.req.raw.body === null)
467
+ return form;
468
+ const upload = signedIn && UPLOAD_PATHS.has(pathname);
469
+ const limit = upload
470
+ ? uploadBodyLimit(c.var.config)
471
+ : signedIn
472
+ ? SIGNED_IN_FORM_MAX_BYTES
473
+ : ANONYMOUS_FORM_MAX_BYTES;
474
+ const read = await readWithin(c.req.raw, limit, 'refuse');
475
+ if (read !== undefined) {
476
+ c.req.raw = new Request(c.req.raw, { body: read.body });
477
+ return form;
478
+ }
479
+ if (upload)
480
+ return uploadTooLarge(c);
481
+ return c.text(`That form is larger than the ${String(limit)} bytes the admin accepts.`, 413);
482
+ }
483
+ async function submittedField(c, name) {
479
484
  const contentType = c.req.header('content-type') ?? '';
480
485
  if (!contentType.includes('application/x-www-form-urlencoded') &&
481
486
  !contentType.includes('multipart/form-data')) {
@@ -483,7 +488,25 @@ async function submittedToken(c) {
483
488
  }
484
489
  // Hono caches the parsed form, so the handler behind this parses nothing twice.
485
490
  const body = await c.req.parseBody();
486
- return body[CSRF_FIELD];
491
+ return body[name];
492
+ }
493
+ const EXPIRED_FORM_NOTICE = 'That form expired before it was sent. Please try again.';
494
+ async function expiredForm(c, pathname, form) {
495
+ const session = startSession(c, undefined);
496
+ c.var.admin.pushFlash(session.id, { kind: 'warning', message: EXPIRED_FORM_NOTICE });
497
+ const query = new URLSearchParams();
498
+ if (pathname === RESET_PATH) {
499
+ const token = await form.field(RECOVERY_FIELDS.token);
500
+ if (typeof token === 'string' && token !== '')
501
+ query.set(RECOVERY_FIELDS.token, token);
502
+ }
503
+ else if (pathname === LOGIN_PATH) {
504
+ const returnTo = returnPath(await form.field(RETURN_TO_FIELD));
505
+ if (returnTo !== undefined)
506
+ query.set(RETURN_TO_FIELD, returnTo);
507
+ }
508
+ const search = query.size === 0 ? '' : `?${query.toString()}`;
509
+ return c.redirect(`${pathname}${search}`, 303);
487
510
  }
488
511
  /**
489
512
  * A percent-decoded request path. A path that will not decode is handed on as