@geekity/cms 0.44.0 → 0.46.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 (155) hide show
  1. package/admin/pages/federation/followers.njk +1 -1
  2. package/admin/pages/indieauth/consent.njk +1 -1
  3. package/admin/pages/settings/discussion.njk +78 -0
  4. package/admin/static/editor.js +24 -24
  5. package/dist/admin/index.d.ts +1 -1
  6. package/dist/admin/index.d.ts.map +1 -1
  7. package/dist/admin/index.js +1 -1
  8. package/dist/admin/index.js.map +1 -1
  9. package/dist/admin/indieauth-consent.d.ts.map +1 -1
  10. package/dist/admin/indieauth-consent.js +29 -16
  11. package/dist/admin/indieauth-consent.js.map +1 -1
  12. package/dist/admin/settings-discussion.d.ts +9 -0
  13. package/dist/admin/settings-discussion.d.ts.map +1 -1
  14. package/dist/admin/settings-discussion.js +147 -2
  15. package/dist/admin/settings-discussion.js.map +1 -1
  16. package/dist/avatars/avatars.d.ts +1 -1
  17. package/dist/avatars/avatars.d.ts.map +1 -1
  18. package/dist/avatars/avatars.js +14 -5
  19. package/dist/avatars/avatars.js.map +1 -1
  20. package/dist/cli/help.js +2 -2
  21. package/dist/cms/app.d.ts.map +1 -1
  22. package/dist/cms/app.js +6 -5
  23. package/dist/cms/app.js.map +1 -1
  24. package/dist/cms/boot.d.ts.map +1 -1
  25. package/dist/cms/boot.js +4 -3
  26. package/dist/cms/boot.js.map +1 -1
  27. package/dist/cms/create.d.ts.map +1 -1
  28. package/dist/cms/create.js +7 -6
  29. package/dist/cms/create.js.map +1 -1
  30. package/dist/cms/lifecycle.d.ts +13 -1
  31. package/dist/cms/lifecycle.d.ts.map +1 -1
  32. package/dist/cms/lifecycle.js +31 -3
  33. package/dist/cms/lifecycle.js.map +1 -1
  34. package/dist/cms/services.d.ts.map +1 -1
  35. package/dist/cms/services.js +45 -15
  36. package/dist/cms/services.js.map +1 -1
  37. package/dist/comments/form.d.ts +10 -0
  38. package/dist/comments/form.d.ts.map +1 -1
  39. package/dist/comments/form.js +2 -1
  40. package/dist/comments/form.js.map +1 -1
  41. package/dist/comments/hcaptcha.d.ts +26 -0
  42. package/dist/comments/hcaptcha.d.ts.map +1 -0
  43. package/dist/comments/hcaptcha.js +118 -0
  44. package/dist/comments/hcaptcha.js.map +1 -0
  45. package/dist/comments/index.d.ts +3 -0
  46. package/dist/comments/index.d.ts.map +1 -1
  47. package/dist/comments/index.js +1 -0
  48. package/dist/comments/index.js.map +1 -1
  49. package/dist/comments/intake.d.ts +2 -0
  50. package/dist/comments/intake.d.ts.map +1 -1
  51. package/dist/comments/intake.js +1 -1
  52. package/dist/comments/intake.js.map +1 -1
  53. package/dist/comments/page-form.d.ts +3 -1
  54. package/dist/comments/page-form.d.ts.map +1 -1
  55. package/dist/comments/page-form.js +4 -3
  56. package/dist/comments/page-form.js.map +1 -1
  57. package/dist/comments/submission.d.ts +3 -0
  58. package/dist/comments/submission.d.ts.map +1 -1
  59. package/dist/comments/submission.js +7 -0
  60. package/dist/comments/submission.js.map +1 -1
  61. package/dist/config.d.ts +20 -0
  62. package/dist/config.d.ts.map +1 -1
  63. package/dist/config.js +1 -0
  64. package/dist/config.js.map +1 -1
  65. package/dist/contact/form.d.ts +8 -0
  66. package/dist/contact/form.d.ts.map +1 -1
  67. package/dist/contact/form.js +2 -1
  68. package/dist/contact/form.js.map +1 -1
  69. package/dist/contact/submission.d.ts +3 -0
  70. package/dist/contact/submission.d.ts.map +1 -1
  71. package/dist/contact/submission.js +16 -2
  72. package/dist/contact/submission.js.map +1 -1
  73. package/dist/exports.d.ts +1 -1
  74. package/dist/exports.d.ts.map +1 -1
  75. package/dist/exports.js.map +1 -1
  76. package/dist/federation/backfill.d.ts +1 -2
  77. package/dist/federation/backfill.d.ts.map +1 -1
  78. package/dist/federation/backfill.js +14 -5
  79. package/dist/federation/backfill.js.map +1 -1
  80. package/dist/federation/forgotten-deliveries.d.ts +15 -0
  81. package/dist/federation/forgotten-deliveries.d.ts.map +1 -0
  82. package/dist/federation/forgotten-deliveries.js +16 -0
  83. package/dist/federation/forgotten-deliveries.js.map +1 -0
  84. package/dist/federation/profiles.d.ts +1 -3
  85. package/dist/federation/profiles.d.ts.map +1 -1
  86. package/dist/federation/profiles.js +17 -7
  87. package/dist/federation/profiles.js.map +1 -1
  88. package/dist/federation/retry-job.d.ts.map +1 -1
  89. package/dist/federation/retry-job.js +4 -2
  90. package/dist/federation/retry-job.js.map +1 -1
  91. package/dist/forms/challenge.d.ts +86 -0
  92. package/dist/forms/challenge.d.ts.map +1 -0
  93. package/dist/forms/challenge.js +44 -0
  94. package/dist/forms/challenge.js.map +1 -0
  95. package/dist/indieauth/registration.d.ts +16 -0
  96. package/dist/indieauth/registration.d.ts.map +1 -0
  97. package/dist/indieauth/registration.js +107 -0
  98. package/dist/indieauth/registration.js.map +1 -0
  99. package/dist/mcp/inspect/schemas.d.ts +3 -3
  100. package/dist/mcp/repair/retry.js +2 -2
  101. package/dist/mcp/repair/retry.js.map +1 -1
  102. package/dist/settings/hcaptcha.d.ts +10 -0
  103. package/dist/settings/hcaptcha.d.ts.map +1 -0
  104. package/dist/settings/hcaptcha.js +38 -0
  105. package/dist/settings/hcaptcha.js.map +1 -0
  106. package/dist/settings/names.d.ts +1 -1
  107. package/dist/settings/names.d.ts.map +1 -1
  108. package/dist/settings/names.js +1 -0
  109. package/dist/settings/names.js.map +1 -1
  110. package/dist/settings/registry.d.ts.map +1 -1
  111. package/dist/settings/registry.js +2 -1
  112. package/dist/settings/registry.js.map +1 -1
  113. package/dist/store/deliveries.d.ts +18 -2
  114. package/dist/store/deliveries.d.ts.map +1 -1
  115. package/dist/store/deliveries.js +35 -4
  116. package/dist/store/deliveries.js.map +1 -1
  117. package/dist/store/queue-database.d.ts +6 -0
  118. package/dist/store/queue-database.d.ts.map +1 -1
  119. package/dist/store/queue-database.js +34 -7
  120. package/dist/store/queue-database.js.map +1 -1
  121. package/dist/web/comment-routes.d.ts.map +1 -1
  122. package/dist/web/comment-routes.js +6 -3
  123. package/dist/web/comment-routes.js.map +1 -1
  124. package/dist/web/contact-routes.d.ts.map +1 -1
  125. package/dist/web/contact-routes.js +5 -1
  126. package/dist/web/contact-routes.js.map +1 -1
  127. package/dist/web/document-render.d.ts.map +1 -1
  128. package/dist/web/document-render.js +12 -1
  129. package/dist/web/document-render.js.map +1 -1
  130. package/dist/web/env.d.ts +6 -0
  131. package/dist/web/env.d.ts.map +1 -1
  132. package/dist/web/indieauth-discovery.d.ts +3 -0
  133. package/dist/web/indieauth-discovery.d.ts.map +1 -1
  134. package/dist/web/indieauth-discovery.js +3 -0
  135. package/dist/web/indieauth-discovery.js.map +1 -1
  136. package/dist/web/indieauth-registration.d.ts +5 -0
  137. package/dist/web/indieauth-registration.d.ts.map +1 -0
  138. package/dist/web/indieauth-registration.js +51 -0
  139. package/dist/web/indieauth-registration.js.map +1 -0
  140. package/dist/web/page-sources.d.ts.map +1 -1
  141. package/dist/web/page-sources.js +3 -1
  142. package/dist/web/page-sources.js.map +1 -1
  143. package/dist/web/render-scope.d.ts +3 -0
  144. package/dist/web/render-scope.d.ts.map +1 -1
  145. package/dist/web/render-scope.js +3 -0
  146. package/dist/web/render-scope.js.map +1 -1
  147. package/package.json +10 -10
  148. package/templates/site/content/pages/privacy.md +13 -0
  149. package/themes/default/layouts/base.njk +3 -0
  150. package/themes/default/partials/comment-form.njk +4 -1
  151. package/themes/default/partials/contact-form.njk +4 -1
  152. package/themes/default/partials/form-challenge.njk +9 -0
  153. package/themes/default/src/style.css +9 -0
  154. package/themes/default/static/hcaptcha.js +31 -0
  155. package/themes/default/static/style.css +12 -0
@@ -1,6 +1,7 @@
1
+ import { decodeEntities } from '../util/html.js';
1
2
  import { allRows, countByStatus, getRow, NO_LIMIT, nullableText, oneOf, readCount, } from './rows.js';
2
3
  /** How one delivery of one activity to one follower ended. */
3
- export const DELIVERY_STATUSES = ['sent', 'queued', 'retrying', 'failed'];
4
+ export const DELIVERY_STATUSES = ['sent', 'queued', 'retrying', 'failed', 'unknown'];
4
5
  const DELIVERY_SEARCH = `
5
6
  WHERE (:objectIds IS NULL OR object_id IN (SELECT value FROM json_each(:objectIds)))
6
7
  AND (:activityId IS NULL OR activity_id = :activityId)
@@ -28,6 +29,16 @@ export function openDeliveryStore(db, clock) {
28
29
  settleDeliveries: db.prepare(`
29
30
  UPDATE ap_deliveries SET status = ?, error = ?, attempted_at = ?
30
31
  WHERE activity_id = ? AND inbox_id = ?
32
+ `),
33
+ markUnsettledDeliveriesUnknown: db.prepare(`
34
+ UPDATE ap_deliveries SET status = 'unknown'
35
+ WHERE status IN ('queued', 'retrying')
36
+ AND attempted_at < :before
37
+ AND NOT EXISTS (
38
+ SELECT 1 FROM json_each(:waiting) AS waiting
39
+ WHERE json_extract(waiting.value, '$.activityId') = ap_deliveries.activity_id
40
+ AND json_extract(waiting.value, '$.inbox') = ap_deliveries.inbox_id
41
+ )
31
42
  `),
32
43
  listDeliveries: db.prepare(`
33
44
  SELECT * FROM ap_deliveries WHERE activity_id = ? ORDER BY actor_id
@@ -74,14 +85,17 @@ export function openDeliveryStore(db, clock) {
74
85
  };
75
86
  return {
76
87
  recordDelivery(delivery) {
77
- const recorded = getRow(statements.recordDelivery, toDelivery, delivery.activityId, delivery.activityType, delivery.objectId, delivery.slug, delivery.actorId, delivery.inboxId, delivery.status, delivery.error, delivery.attemptedAt ?? clock().toISOString());
88
+ const recorded = getRow(statements.recordDelivery, toDelivery, delivery.activityId, delivery.activityType, delivery.objectId, delivery.slug, delivery.actorId, delivery.inboxId, delivery.status, withHtmlPageAsTitle(delivery.error), delivery.attemptedAt ?? clock().toISOString());
78
89
  if (recorded === undefined) {
79
90
  throw new Error(`The delivery of "${delivery.activityId}" to "${delivery.actorId}" was not recorded.`);
80
91
  }
81
92
  return recorded;
82
93
  },
83
94
  settleDeliveries(outcome) {
84
- statements.settleDeliveries.run(outcome.status, outcome.error, clock().toISOString(), outcome.activityId, outcome.inbox);
95
+ statements.settleDeliveries.run(outcome.status, withHtmlPageAsTitle(outcome.error), clock().toISOString(), outcome.activityId, outcome.inbox);
96
+ },
97
+ markUnsettledDeliveriesUnknown({ before, waiting }) {
98
+ statements.markUnsettledDeliveriesUnknown.run({ before, waiting: JSON.stringify(waiting) });
85
99
  },
86
100
  listDeliveries(activityId) {
87
101
  return allRows(statements.listDeliveries, toDelivery, activityId);
@@ -141,10 +155,27 @@ function toDelivery(row) {
141
155
  actorId: String(row['actor_id']),
142
156
  inboxId: String(row['inbox_id']),
143
157
  status: deliveryStatus(row['status']),
144
- error: nullableText(row['error']),
158
+ error: withHtmlPageAsTitle(nullableText(row['error'])),
145
159
  attemptedAt: String(row['attempted_at']),
146
160
  };
147
161
  }
162
+ const HTML_PAGE = /^\s*<(?:!doctype\s+html|html)\b/i;
163
+ const PAGE_TITLE = /<title[^>]*>([\s\S]*?)<\/title>/i;
164
+ function withHtmlPageAsTitle(error) {
165
+ if (error === null)
166
+ return null;
167
+ const lineEnd = error.indexOf('\n');
168
+ if (lineEnd === -1)
169
+ return error;
170
+ const body = error.slice(lineEnd + 1);
171
+ if (!HTML_PAGE.test(body))
172
+ return error;
173
+ const title = decodeEntities(PAGE_TITLE.exec(body)?.[1] ?? '')
174
+ .replace(/\s+/g, ' ')
175
+ .trim();
176
+ const page = title === '' ? 'An HTML page.' : `An HTML page titled "${title}".`;
177
+ return `${error.slice(0, lineEnd)}\n${page}`;
178
+ }
148
179
  /**
149
180
  * A stored status, or `failed` for one this version does not know.
150
181
  *
@@ -1 +1 @@
1
- {"version":3,"file":"deliveries.js","sourceRoot":"","sources":["../../src/store/deliveries.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"deliveries.js","sourceRoot":"","sources":["../../src/store/deliveries.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,5 @@
1
1
  import { DatabaseSync } from 'node:sqlite';
2
+ import type { WaitingDelivery } from './deliveries.ts';
2
3
  export declare const FEDERATION_QUEUE_TABLE = "federation_messages";
3
4
  export declare function queueFile(dataDir: string): string;
4
5
  /**
@@ -14,4 +15,9 @@ export declare function countWaitingMessages(dataDir: string): number;
14
15
  * failure, and takes it out for good once the inbox accepts it.
15
16
  */
16
17
  export declare function countRetryingDeliveries(dataDir: string, since: string): number;
18
+ /**
19
+ * Each delivery a message in the queue still carries: an outbox message's
20
+ * inbox, and every inbox a fanout has yet to split into outbox messages.
21
+ */
22
+ export declare function listWaitingDeliveries(dataDir: string): WaitingDelivery[];
17
23
  //# sourceMappingURL=queue-database.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"queue-database.d.ts","sourceRoot":"","sources":["../../src/store/queue-database.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAI3C,eAAO,MAAM,sBAAsB,wBAAwB,CAAC;AAI5D,wBAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEjD;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,CAM/D;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAE5D;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAQ9E"}
1
+ {"version":3,"file":"queue-database.d.ts","sourceRoot":"","sources":["../../src/store/queue-database.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAG3C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAEvD,eAAO,MAAM,sBAAsB,wBAAwB,CAAC;AAI5D,wBAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEjD;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,CAM/D;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAE5D;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAQ9E;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,eAAe,EAAE,CAuBxE"}
@@ -31,21 +31,48 @@ export function countRetryingDeliveries(dataDir, since) {
31
31
  AND json_extract(message, '$.attempt') >= 1
32
32
  AND json_extract(message, '$.started') >= ?`, [since]);
33
33
  }
34
+ /**
35
+ * Each delivery a message in the queue still carries: an outbox message's
36
+ * inbox, and every inbox a fanout has yet to split into outbox messages.
37
+ */
38
+ export function listWaitingDeliveries(dataDir) {
39
+ return readQueue(dataDir, [], (db) => db
40
+ .prepare(`SELECT json_extract(message, '$.activityId') AS activity_id,
41
+ json_extract(message, '$.inbox') AS inbox
42
+ FROM ${FEDERATION_QUEUE_TABLE}
43
+ WHERE json_extract(message, '$.type') = 'outbox'
44
+ UNION ALL
45
+ SELECT json_extract(queued.message, '$.activityId'), inboxes.key
46
+ FROM ${FEDERATION_QUEUE_TABLE} AS queued,
47
+ json_each(queued.message, '$.inboxes') AS inboxes
48
+ WHERE json_extract(queued.message, '$.type') = 'fanout'`)
49
+ .all()
50
+ .flatMap((row) => {
51
+ const activityId = row['activity_id'];
52
+ const inbox = row['inbox'];
53
+ return typeof activityId === 'string' && typeof inbox === 'string'
54
+ ? [{ activityId, inbox }]
55
+ : [];
56
+ }));
57
+ }
34
58
  function countMessages(dataDir, where, values) {
59
+ return readQueue(dataDir, 0, (db) => {
60
+ const row = db
61
+ .prepare(`SELECT count(*) AS waiting FROM ${FEDERATION_QUEUE_TABLE} ${where}`)
62
+ .get(...values);
63
+ return Number(row?.['waiting'] ?? 0);
64
+ });
65
+ }
66
+ function readQueue(dataDir, empty, read) {
35
67
  const file = queueFile(dataDir);
36
68
  if (!existsSync(file))
37
- return 0;
69
+ return empty;
38
70
  const db = new DatabaseSync(file, { readOnly: true, timeout: BUSY_TIMEOUT_MS });
39
71
  try {
40
72
  const table = db
41
73
  .prepare("SELECT name FROM sqlite_master WHERE type = 'table' AND name = ?")
42
74
  .get(FEDERATION_QUEUE_TABLE);
43
- if (table === undefined)
44
- return 0;
45
- const row = db
46
- .prepare(`SELECT count(*) AS waiting FROM ${FEDERATION_QUEUE_TABLE} ${where}`)
47
- .get(...values);
48
- return Number(row?.['waiting'] ?? 0);
75
+ return table === undefined ? empty : read(db);
49
76
  }
50
77
  finally {
51
78
  db.close();
@@ -1 +1 @@
1
- {"version":3,"file":"queue-database.js","sourceRoot":"","sources":["../../src/store/queue-database.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAChF,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAEzD,MAAM,CAAC,MAAM,sBAAsB,GAAG,qBAAqB,CAAC;AAE5D,MAAM,eAAe,GAAG,IAAI,CAAC;AAE7B,MAAM,UAAU,SAAS,CAAC,OAAe;IACvC,OAAO,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;AAClC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAAC,OAAe;IAC/C,SAAS,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACxC,MAAM,IAAI,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;IAChC,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;IACtC,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACvB,OAAO,IAAI,YAAY,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC,CAAC;AAC9D,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,OAAe;IAClD,OAAO,aAAa,CAAC,OAAO,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;AACxC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,uBAAuB,CAAC,OAAe,EAAE,KAAa;IACpE,OAAO,aAAa,CAClB,OAAO,EACP;;mDAE+C,EAC/C,CAAC,KAAK,CAAC,CACR,CAAC;AACJ,CAAC;AAED,SAAS,aAAa,CAAC,OAAe,EAAE,KAAa,EAAE,MAAyB;IAC9E,MAAM,IAAI,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;IAChC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;QAAE,OAAO,CAAC,CAAC;IAChC,MAAM,EAAE,GAAG,IAAI,YAAY,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC,CAAC;IAChF,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,EAAE;aACb,OAAO,CAAC,kEAAkE,CAAC;aAC3E,GAAG,CAAC,sBAAsB,CAAC,CAAC;QAC/B,IAAI,KAAK,KAAK,SAAS;YAAE,OAAO,CAAC,CAAC;QAClC,MAAM,GAAG,GAAG,EAAE;aACX,OAAO,CAAC,mCAAmC,sBAAsB,IAAI,KAAK,EAAE,CAAC;aAC7E,GAAG,CAAC,GAAG,MAAM,CAAC,CAAC;QAClB,OAAO,MAAM,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;IACvC,CAAC;YAAS,CAAC;QACT,EAAE,CAAC,KAAK,EAAE,CAAC;IACb,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"queue-database.js","sourceRoot":"","sources":["../../src/store/queue-database.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAChF,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAGzD,MAAM,CAAC,MAAM,sBAAsB,GAAG,qBAAqB,CAAC;AAE5D,MAAM,eAAe,GAAG,IAAI,CAAC;AAE7B,MAAM,UAAU,SAAS,CAAC,OAAe;IACvC,OAAO,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;AAClC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAAC,OAAe;IAC/C,SAAS,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACxC,MAAM,IAAI,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;IAChC,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;IACtC,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACvB,OAAO,IAAI,YAAY,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC,CAAC;AAC9D,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,OAAe;IAClD,OAAO,aAAa,CAAC,OAAO,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;AACxC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,uBAAuB,CAAC,OAAe,EAAE,KAAa;IACpE,OAAO,aAAa,CAClB,OAAO,EACP;;mDAE+C,EAC/C,CAAC,KAAK,CAAC,CACR,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,qBAAqB,CAAC,OAAe;IACnD,OAAO,SAAS,CAAC,OAAO,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CACnC,EAAE;SACC,OAAO,CACN;;kBAEU,sBAAsB;;;;kBAItB,sBAAsB;;kEAE0B,CAC3D;SACA,GAAG,EAAE;SACL,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QACf,MAAM,UAAU,GAAG,GAAG,CAAC,aAAa,CAAC,CAAC;QACtC,MAAM,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,CAAC;QAC3B,OAAO,OAAO,UAAU,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,QAAQ;YAChE,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;YACzB,CAAC,CAAC,EAAE,CAAC;IACT,CAAC,CAAC,CACL,CAAC;AACJ,CAAC;AAED,SAAS,aAAa,CAAC,OAAe,EAAE,KAAa,EAAE,MAAyB;IAC9E,OAAO,SAAS,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE;QAClC,MAAM,GAAG,GAAG,EAAE;aACX,OAAO,CAAC,mCAAmC,sBAAsB,IAAI,KAAK,EAAE,CAAC;aAC7E,GAAG,CAAC,GAAG,MAAM,CAAC,CAAC;QAClB,OAAO,MAAM,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,SAAS,CAAI,OAAe,EAAE,KAAQ,EAAE,IAA6B;IAC5E,MAAM,IAAI,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;IAChC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;QAAE,OAAO,KAAK,CAAC;IACpC,MAAM,EAAE,GAAG,IAAI,YAAY,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC,CAAC;IAChF,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,EAAE;aACb,OAAO,CAAC,kEAAkE,CAAC;aAC3E,GAAG,CAAC,sBAAsB,CAAC,CAAC;QAC/B,OAAO,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAChD,CAAC;YAAS,CAAC;QACT,EAAE,CAAC,KAAK,EAAE,CAAC;IACb,CAAC;AACH,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"comment-routes.d.ts","sourceRoot":"","sources":["../../src/web/comment-routes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAW,IAAI,EAAE,MAAM,MAAM,CAAC;AA0B1C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAI3C;;;;;;;;;;;;GAYG;AAEH,iEAAiE;AACjE,wBAAgB,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG,IAAI,CAsHzD"}
1
+ {"version":3,"file":"comment-routes.d.ts","sourceRoot":"","sources":["../../src/web/comment-routes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAW,IAAI,EAAE,MAAM,MAAM,CAAC;AA2B1C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAI3C;;;;;;;;;;;;GAYG;AAEH,iEAAiE;AACjE,wBAAgB,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG,IAAI,CA4HzD"}
@@ -7,6 +7,7 @@ import { submitReplyPost } from '../comments/reply-post.js';
7
7
  import { COMMENT_FIELDS, COMMENT_RATE_LIMIT, COMMENT_RATE_WINDOW_SECONDS, submitComment, } from '../comments/submission.js';
8
8
  import { commenterOf } from '../comments/viewer.js';
9
9
  import { stringOrEmpty } from '../util/forms.js';
10
+ import { challengeTokenOf } from '../forms/challenge.js';
10
11
  import { documentSite } from './document-site.js';
11
12
  import { CROSS_SITE_REFUSAL, crossSiteWrite, csrfTokenMatches } from './session.js';
12
13
  import { clientAddress, createLoginThrottle } from './throttle.js';
@@ -70,7 +71,7 @@ export function mountComments(app) {
70
71
  // themselves that it is. Saying so is more honest than pretending the
71
72
  // URL is wrong, and a closed post is a state rather than a mistake.
72
73
  return page(c, document, 403, viewer, {
73
- ...drawnFor(refilledCommentForm(document, valuesOf(form), {}, now), viewer),
74
+ ...drawnFor(refilledCommentForm(document, valuesOf(form), {}, now), viewer, c.var.challengeWidget),
74
75
  error: 'This post is not taking comments any more.',
75
76
  });
76
77
  }
@@ -98,6 +99,8 @@ export function mountComments(app) {
98
99
  dataDir: config.dataDir,
99
100
  baseUrl: config.baseUrl,
100
101
  checker: config.commentChecker,
102
+ challenge: config.formChallenge,
103
+ challengeToken: challengeTokenOf(body, config.formChallenge),
101
104
  // Who hears about what lands is the intake's to decide, and neither
102
105
  // message is awaited: the reader is redirected now and they go out
103
106
  // behind them.
@@ -136,7 +139,7 @@ function refusedPage(c, document, viewer, form, refusal, now) {
136
139
  if (refusal.kind === 'rate-limited') {
137
140
  c.header('Retry-After', String(refusal.retryAfter));
138
141
  return page(c, document, 429, viewer, {
139
- ...drawnFor(refilledCommentForm(document, valuesOf(form), {}, now), viewer),
142
+ ...drawnFor(refilledCommentForm(document, valuesOf(form), {}, now), viewer, c.var.challengeWidget),
140
143
  error: 'That is a lot of comments in a short time. Try again in a few minutes.',
141
144
  });
142
145
  }
@@ -146,7 +149,7 @@ function refusedPage(c, document, viewer, form, refusal, now) {
146
149
  ? 'That form had been open a long time. Here it is again — the words are still there.'
147
150
  : undefined;
148
151
  return page(c, document, 400, viewer, {
149
- ...drawnFor(refilledCommentForm(document, valuesOf(form), problemsOf(refusal), now), viewer),
152
+ ...drawnFor(refilledCommentForm(document, valuesOf(form), problemsOf(refusal), now), viewer, c.var.challengeWidget),
150
153
  ...(message === undefined ? {} : { error: message }),
151
154
  });
152
155
  }
@@ -1 +1 @@
1
- {"version":3,"file":"comment-routes.js","sourceRoot":"","sources":["../../src/web/comment-routes.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EACL,oBAAoB,EACpB,iBAAiB,EACjB,mBAAmB,EACnB,QAAQ,GACT,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EACL,cAAc,EACd,kBAAkB,EAClB,2BAA2B,EAC3B,aAAa,GACd,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,OAAO,EAAE,kBAAkB,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACpF,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAEnE;;;;;;;;;;;;GAYG;AAEH,iEAAiE;AACjE,MAAM,UAAU,aAAa,CAAC,GAAqB;IACjD,6EAA6E;IAC7E,0EAA0E;IAC1E,wEAAwE;IACxE,qEAAqE;IACrE,IAAI,OAAoC,CAAC;IAEzC,SAAS,QAAQ,CAAC,MAAsB;QACtC,OAAO,KAAK,mBAAmB,CAAC;YAC9B,QAAQ,EAAE,kBAAkB;YAC5B,cAAc,EAAE,2BAA2B;YAC3C,GAAG,EAAE,MAAM,CAAC,GAAG;SAChB,CAAC,CAAC;QACH,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,GAAG,CAAC,IAAI,CAAC,iBAAiB,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;QACtC,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC;QACjD,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;QACrC,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;QAC1B,yEAAyE;QACzE,kEAAkE;QAClE,MAAM,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC;QAC/B,MAAM,MAAM,GAAG,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAExE,yEAAyE;QACzE,yEAAyE;QACzE,2EAA2E;QAC3E,wEAAwE;QACxE,wDAAwD;QACxD,EAAE;QACF,0EAA0E;QAC1E,0EAA0E;QAC1E,qDAAqD;QACrD,IAAI,MAAM,KAAK,SAAS,IAAI,cAAc,CAAC,CAAC,CAAC;YAAE,OAAO,CAAC,CAAC,IAAI,CAAC,kBAAkB,EAAE,GAAG,CAAC,CAAC;QACtF,IAAI,MAAM,KAAK,SAAS,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;YAC3E,OAAO,CAAC,CAAC,IAAI,CAAC,wEAAwE,EAAE,GAAG,CAAC,CAAC;QAC/F,CAAC;QAED,MAAM,QAAQ,GAAG,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5C,IAAI,QAAQ,KAAK,SAAS,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC;YAC/D,OAAO,CAAC,CAAC,IAAI,CAAC,sCAAsC,EAAE,GAAG,CAAC,CAAC;QAC7D,CAAC;QAED,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC;QACzB,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,eAAe,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC;YACnE,qEAAqE;YACrE,sEAAsE;YACtE,oEAAoE;YACpE,OAAO,IAAI,CAAC,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE;gBACpC,GAAG,QAAQ,CAAC,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC;gBAC3E,KAAK,EAAE,4CAA4C;aACpD,CAAC,CAAC;QACL,CAAC;QAED,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,MAAM,QAAQ,GAAG,MAAM,eAAe,CAAC;gBACrC,IAAI,EAAE,YAAY,CAAC,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC;gBACtC,QAAQ;gBACR,YAAY,EAAE,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,GAAG,CAAC,kBAAkB,CAAC;gBAC3E,IAAI;gBACJ,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC;gBAC1B,OAAO,EAAE,aAAa,CAAC,CAAC,EAAE,MAAM,CAAC;aAClC,CAAC,CAAC;YACH,IAAI,QAAQ,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;gBAC9B,MAAM,KAAK,GAAG,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,UAAU,CACzC,QAAQ,EACR,QAAQ,CAAC,KAAK,CAAC,SAAS,EACxB,CAAC,CAAC,GAAG,CAAC,kBAAkB,CACzB,CAAC;gBACF,MAAM,MAAM,GAAG,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAC3E,OAAO,CAAC,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC,SAAS,IAAI,oBAAoB,WAAW,MAAM,EAAE,EAAE,GAAG,CAAC,CAAC;YAC3F,CAAC;YACD,OAAO,WAAW,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;QACvE,CAAC;QAED,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC;YAClC,OAAO,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE;YAC1E,QAAQ;YACR,KAAK,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,kBAAkB,CAAC;YACvE,IAAI;YACJ,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,OAAO,EAAE,MAAM,CAAC,cAAc;YAC9B,oEAAoE;YACpE,mEAAmE;YACnE,eAAe;YACf,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,aAAa;YAC5B,OAAO,EAAE,aAAa,CAAC,CAAC,EAAE,MAAM,CAAC;YACjC,SAAS,EAAE,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,YAAY,CAAC;YACrC,QAAQ,EAAE,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC;YACjC,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC;YAC1B,uEAAuE;YACvE,iDAAiD;YACjD,UAAU,EAAE,CAAC,CAAC,GAAG,CAAC,cAAc;YAChC,GAAG;SACJ,CAAC,CAAC;QAEH,IAAI,OAAO,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC9B,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;YAC/B,yEAAyE;YACzE,wEAAwE;YACxE,uEAAuE;YACvE,8DAA8D;YAC9D,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,KAAK,UAAU,CAAC,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YACnF,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,KAAK,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;YACnE,OAAO,CAAC,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC,SAAS,IAAI,oBAAoB,IAAI,MAAM,IAAI,MAAM,EAAE,EAAE,GAAG,CAAC,CAAC;QAC9F,CAAC;QAED,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;QAChC,IAAI,OAAO,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;YACjC,yEAAyE;YACzE,iEAAiE;YACjE,yDAAyD;YACzD,OAAO,CAAC,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC,SAAS,IAAI,oBAAoB,kBAAkB,EAAE,GAAG,CAAC,CAAC;QAC1F,CAAC;QACD,OAAO,WAAW,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;IAC9D,CAAC,CAAC,CAAC;AACL,CAAC;AAED,+EAA+E;AAC/E,SAAS,WAAW,CAClB,CAAsB,EACtB,QAAkB,EAClB,MAAiC,EACjC,IAAiB,EACjB,OAAuB,EACvB,GAAS;IAET,IAAI,OAAO,CAAC,IAAI,KAAK,cAAc,EAAE,CAAC;QACpC,CAAC,CAAC,MAAM,CAAC,aAAa,EAAE,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;QACpD,OAAO,IAAI,CAAC,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE;YACpC,GAAG,QAAQ,CAAC,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC;YAC3E,KAAK,EAAE,wEAAwE;SAChF,CAAC,CAAC;IACL,CAAC;IAED,MAAM,OAAO,GACX,OAAO,CAAC,IAAI,KAAK,WAAW;QAC1B,CAAC,CAAC,uDAAuD;QACzD,CAAC,CAAC,OAAO,CAAC,IAAI,KAAK,OAAO;YACxB,CAAC,CAAC,oFAAoF;YACtF,CAAC,CAAC,SAAS,CAAC;IAElB,OAAO,IAAI,CAAC,CAAC,EAAE,QAAQ,EAAE,GAAG,EAAE,MAAM,EAAE;QACpC,GAAG,QAAQ,CAAC,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,UAAU,CAAC,OAAO,CAAC,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC;QAC5F,GAAG,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;KACrD,CAAC,CAAC;AACL,CAAC;AAKD,SAAS,IAAI,CACX,CAAsB,EACtB,QAAkB,EAClB,MAAqB,EACrB,MAAiC,EACjC,IAAwB;IAExB,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACjB,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,cAAc,CAAC,QAAQ,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC;AACxF,CAAC;AAED,mEAAmE;AACnE,SAAS,UAAU,CAAC,OAA6C;IAC/D,OAAO,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAE,CAAC,OAAO,CAAC,QAAQ,IAAI,EAAE,CAA4B,CAAC,CAAC,CAAC,EAAE,CAAC;AAChG,CAAC;AAED,gEAAgE;AAChE,SAAS,MAAM,CAAC,IAA6B;IAC3C,OAAO;QACL,IAAI,EAAE,aAAa,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QAC9C,IAAI,EAAE,aAAa,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QAC9C,KAAK,EAAE,aAAa,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QAChD,GAAG,EAAE,aAAa,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;QAC5C,IAAI,EAAE,aAAa,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QAC9C,SAAS,EAAE,aAAa,CAAC,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QACxD,IAAI,EAAE,aAAa,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QAC9C,MAAM,EAAE,aAAa,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QAClD,MAAM,EAAE,aAAa,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;QAClD,IAAI,EAAE,aAAa,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QAC9C,MAAM,EAAE,aAAa,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;KACnD,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"comment-routes.js","sourceRoot":"","sources":["../../src/web/comment-routes.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"contact-routes.d.ts","sourceRoot":"","sources":["../../src/web/contact-routes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAW,IAAI,EAAE,MAAM,MAAM,CAAC;AAM1C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAoB3C;;;;;;;;;;;GAWG;AAEH,iEAAiE;AACjE,wBAAgB,YAAY,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG,IAAI,CA0FxD"}
1
+ {"version":3,"file":"contact-routes.d.ts","sourceRoot":"","sources":["../../src/web/contact-routes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAW,IAAI,EAAE,MAAM,MAAM,CAAC;AAM1C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAqB3C;;;;;;;;;;;GAWG;AAEH,iEAAiE;AACjE,wBAAgB,YAAY,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG,IAAI,CA4FxD"}
@@ -1,6 +1,7 @@
1
1
  import { clientAddress, createLoginThrottle } from './throttle.js';
2
2
  import { isServed } from '../content/served.js';
3
3
  import { stringOrEmpty } from '../util/forms.js';
4
+ import { challengeTokenOf, withChallenge } from '../forms/challenge.js';
4
5
  import { sendContactMessage } from '../contact/delivery.js';
5
6
  import { CONTACT_ANCHOR, CONTACT_FIELDS, CONTACT_NOTICE_PARAM, CONTACT_POST_PATH, contactOpen, contactValuesOf, refilledContactForm, } from '../contact/form.js';
6
7
  import { CONTACT_RATE_LIMIT, CONTACT_RATE_WINDOW_SECONDS, submitContactMessage, } from '../contact/submission.js';
@@ -52,6 +53,8 @@ export function mountContact(app) {
52
53
  baseUrl: config.baseUrl,
53
54
  // The same checker comments go through, told this is a contact form.
54
55
  checker: config.commentChecker,
56
+ challenge: config.formChallenge,
57
+ challengeToken: challengeTokenOf(body, config.formChallenge),
55
58
  address: clientAddress(c, config),
56
59
  userAgent: c.req.header('user-agent'),
57
60
  referrer: c.req.header('referer'),
@@ -103,7 +106,8 @@ function sentUrl(document) {
103
106
  /** The page itself, rendered again with this form on it. */
104
107
  function page(c, document, status, form) {
105
108
  c.status(status);
106
- return c.html(c.var.renderer.renderDocument(document, { contactForm: form }));
109
+ const challenged = withChallenge(form, c.var.challengeWidget);
110
+ return c.html(c.var.renderer.renderDocument(document, { contactForm: challenged }));
107
111
  }
108
112
  /** The per-field messages a refusal carries, if it carries any. */
109
113
  function problemsOf(refusal) {
@@ -1 +1 @@
1
- {"version":3,"file":"contact-routes.js","sourceRoot":"","sources":["../../src/web/contact-routes.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"contact-routes.js","sourceRoot":"","sources":["../../src/web/contact-routes.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"document-render.d.ts","sourceRoot":"","sources":["../../src/web/document-render.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAcvD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAE/E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAY1D,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,UAAU,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,iBAAiB,KAAK,YAAY,CAAC;CACvF;AAED,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,WAAW,EACnB,QAAQ,EAAE,YAAY,GACrB,aAAa,CAiCf"}
1
+ {"version":3,"file":"document-render.d.ts","sourceRoot":"","sources":["../../src/web/document-render.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAgBvD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAE/E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAY1D,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,UAAU,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,iBAAiB,KAAK,YAAY,CAAC;CACvF;AAED,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,WAAW,EACnB,QAAQ,EAAE,YAAY,GACrB,aAAa,CAiCf"}
@@ -5,6 +5,7 @@ import { visibilityOf } from '../content/visibility.js';
5
5
  import { currentObjectId, readObjectIds } from '../federation/object-ids.js';
6
6
  import { MAXIMUM_FORM_AGE_SECONDS } from '../forms/protection.js';
7
7
  import { authorContext } from '../site/authors.js';
8
+ import { isRecord } from '../util/guards.js';
8
9
  import { pingbackEndpointFor } from '../webmention/pingback.js';
9
10
  import { webmentionEndpointFor } from '../webmention/endpoint.js';
10
11
  import { handSyndicationOf } from '../webmention/syndication.js';
@@ -48,7 +49,7 @@ function documentPageContext(deps, contexts, document, { url: servedAt, extra, v
48
49
  const settings = requestSite();
49
50
  const either = options.neighbours?.(document) ?? {};
50
51
  const shared = options.location?.(document, settings);
51
- return {
52
+ const drawn = {
52
53
  ...context,
53
54
  ...(writer === undefined ? {} : { siteAuthor: writer }),
54
55
  ...neighbourContext('previous', either.previous, citedPage),
@@ -67,6 +68,16 @@ function documentPageContext(deps, contexts, document, { url: servedAt, extra, v
67
68
  ...(visibilityOf(document) === 'unlisted' ? { noindex: true } : {}),
68
69
  ...extra,
69
70
  };
71
+ const challenge = pageChallengeOf(drawn);
72
+ return challenge === undefined ? drawn : { ...drawn, pageChallenge: challenge };
73
+ }
74
+ function pageChallengeOf(context) {
75
+ const contactFormShown = context['contactNotice'] === undefined;
76
+ return (challengeOf(context['commentForm']) ??
77
+ (contactFormShown ? challengeOf(context['contactForm']) : undefined));
78
+ }
79
+ function challengeOf(form) {
80
+ return isRecord(form) ? form['challenge'] : undefined;
70
81
  }
71
82
  function objectIdOf({ config }, document, now) {
72
83
  const naturalId = activityStreamsId(document, config.baseUrl, now);
@@ -1 +1 @@
1
- {"version":3,"file":"document-render.js","sourceRoot":"","sources":["../../src/web/document-render.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAIzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC7E,OAAO,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AACnG,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAGrD,OAAO,EAAE,qBAAqB,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEvE,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAEpF,MAAM,eAAe,GAAG,CAAC,wBAAwB,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;AAa9D,MAAM,UAAU,mBAAmB,CACjC,IAAgB,EAChB,MAAmB,EACnB,QAAsB;IAEtB,MAAM,SAAS,GAAG,iBAAiB,UAAU,EAAE,EAAE,CAAC;IAElD,SAAS,YAAY,CAAC,QAAkB,EAAE,IAAyB;QACjE,MAAM,MAAM,GAAG,YAAY,CAAC,SAAS,CAAC,CAAC;QACvC,MAAM,OAAO,GAAG,mBAAmB,CAAC,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;QAC5E,OAAO,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC;IAC9D,CAAC;IAED,SAAS,UAAU,CACjB,QAAkB,EAClB,EAAE,SAAS,GAAG,KAAK,EAAE,KAAK,GAAG,EAAE,EAAE,MAAM,EAAqB;QAE5D,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,OAAO,YAAY,CAAC,QAAQ,EAAE;gBAC5B,QAAQ,EAAE,QAAQ,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI;gBACpE,KAAK;gBACL,MAAM;aACP,CAAC,CAAC;QACL,CAAC;QACD,OAAO,YAAY,CAAC,QAAQ,EAAE;YAC5B,QAAQ,EAAE,aAAa,CACrB,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,IAAI,EAC1B,kBAAkB,CAAC,SAAS,EAC5B,SAAS,CAAC,IAAI,CACf;YACD,GAAG,EAAE,GAAG;YACR,KAAK,EAAE,EAAE,GAAG,QAAQ,CAAC,kBAAkB,CAAC,QAAQ,CAAC,EAAE,GAAG,QAAQ,CAAC,gBAAgB,EAAE,EAAE,GAAG,KAAK,EAAE;YAC7F,MAAM;SACP,CAAC,CAAC;IACL,CAAC;IAED,OAAO,EAAE,UAAU,EAAE,CAAC;AACxB,CAAC;AAED,SAAS,mBAAmB,CAC1B,IAAgB,EAChB,QAAsB,EACtB,QAAkB,EAClB,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAuB,EACrD,MAAc;IAEd,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;IACnD,MAAM,MAAM,GAAG,aAAa,CAAC,KAAK,EAAE,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IACvD,MAAM,OAAO,GAAG,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,SAAS,CAAC,CAAC;IACrF,MAAM,GAAG,GAAG,QAAQ,IAAI,OAAO,CAAC,GAAG,CAAC;IACpC,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC;IACzB,MAAM,QAAQ,GAAG,UAAU,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC;IACjD,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,MAAM,MAAM,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;IACpD,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAEtD,OAAO;QACL,GAAG,OAAO;QACV,GAAG,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC;QACvD,GAAG,gBAAgB,CAAC,UAAU,EAAE,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC;QAC3D,GAAG,gBAAgB,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC;QACnD,SAAS,EAAE,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAC/D,eAAe,CAAC,OAAO,EAAE,SAAS,CAAC,CACpC;QACD,GAAG;QACH,IAAI,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,GAAG,EAAE;QAC9B,GAAG,QAAQ,CAAC,cAAc,CAAC,GAAG,CAAC;QAC/B,GAAG,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,QAAQ,EAAE,CAAC;QAChE,GAAG,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,gBAAgB,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1F,GAAG,QAAQ,CAAC,cAAc,CAAC,QAAQ,CAAC;QACpC,GAAG,eAAe,CAAC,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC;QAC5D,GAAG,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC;QAC7B,GAAG,kBAAkB,CAAC,IAAI,EAAE,QAAQ,EAAE,QAAQ,CAAC;QAC/C,GAAG,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,eAAe,CAAC,MAAM,CAAC,EAAE,CAAC;QACtE,GAAG,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,UAAU,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACnE,GAAG,KAAK;KACT,CAAC;AACJ,CAAC;AAED,SAAS,UAAU,CAAC,EAAE,MAAM,EAAc,EAAE,QAAkB,EAAE,GAAS;IACvE,MAAM,SAAS,GAAG,iBAAiB,CAAC,QAAQ,EAAE,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IACnE,OAAO,SAAS,KAAK,SAAS;QAC5B,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,eAAe,CAAC,aAAa,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,SAAS,CAAC,CAAC;AACnE,CAAC;AAED,SAAS,eAAe,CACtB,EAAE,OAAO,EAAE,QAAQ,EAAc,EACjC,QAAkB,EAClB,QAAsB,EACtB,MAAiC,EACjC,MAAc;IAEd,MAAM,IAAI,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IACxD,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CACtB,OAAO,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,qBAAqB,EAAE,CAAC,EAChE,SAAS,CACV,CAAC;IACF,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,EAAE,SAAS,CAAC,CAAC;IACxE,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC;IAC7B,MAAM,UAAU,GAAG,qBAAqB,CAAC,IAAI,CAAC,CAAC;IAC/C,MAAM,QAAQ,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAC3C,OAAO;QACL,GAAG,CAAC,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,MAAM,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;QAChF,GAAG,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;QACpD,GAAG,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC;QAC1D,GAAG,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC;QACnD,GAAG,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC;KAChD,CAAC;AACJ,CAAC;AAED,SAAS,kBAAkB,CACzB,EAAE,OAAO,EAAc,EACvB,QAAkB,EAClB,QAAsB;IAEtB,MAAM,UAAU,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAC7D,OAAO;QACL,WAAW,EAAE,UAAU,EAAE,OAAO,IAAI,EAAE;QACtC,WAAW,EAAE,gBAAgB,CAAC;YAC5B,GAAG,iBAAiB,CAAC,QAAQ,CAAC,KAAK,CAAC;YACpC,GAAG,CAAC,UAAU,EAAE,MAAM,IAAI,EAAE,CAAC;SAC9B,CAAC;KACH,CAAC;AACJ,CAAC;AAOD,SAAS,YAAY,CAAC,SAAiB;IACrC,MAAM,IAAI,GAAqC,EAAE,CAAC;IAClD,OAAO;QACL,IAAI,CAAC,IAAI,EAAE,GAAG;YACZ,IAAI,IAAI,KAAK,SAAS;gBAAE,OAAO,SAAS,CAAC;YACzC,MAAM,IAAI,GAAG,GAAG,SAAS,IAAI,GAAG,EAAE,CAAC;YACnC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;YAC/B,OAAO,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;QACnC,CAAC;QACD,aAAa,CAAC,KAAK;YACjB,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;YAC9D,OAAO;gBACL,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,KAAK,CAAC;gBACpF,WAAW,EAAE;oBACX,qBAAqB,CAAC,KAAK,EAAE,SAAS,CAAC;oBACvC,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;iBACtD,CAAC,IAAI,CAAC,IAAI,CAAC;aACb,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC;AAED,SAAS,qBAAqB,CAAC,KAAa,EAAE,SAAiB;IAC7D,OAAO,KAAK,CAAC,UAAU,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;AACtD,CAAC;AAED,SAAS,aAAa,CAAC,MAAc;IACnC,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,eAAe,CAAC,CAAC,CAAC;AAC9D,CAAC"}
1
+ {"version":3,"file":"document-render.js","sourceRoot":"","sources":["../../src/web/document-render.ts"],"names":[],"mappings":"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"}
package/dist/web/env.d.ts CHANGED
@@ -4,6 +4,7 @@ import type { FontStore } from '../fonts/index.ts';
4
4
  import type { SignedInAccount } from '../comments/viewer.ts';
5
5
  import type { ResolvedConfig } from '../config.ts';
6
6
  import type { Document } from '../content/document.ts';
7
+ import type { ChallengeWidget } from '../forms/challenge.ts';
7
8
  import type { ArchiveReader, BacklinkReader, CatalogReader, DocumentLookup, IndexClock, IndexWriter, ReplyReader, SearchReader, TaxonomyReader } from '../content/store.ts';
8
9
  import type { SiteRecords } from '../content/write.ts';
9
10
  import type { DocumentChange, SyncResult } from '../content/sync.ts';
@@ -44,6 +45,11 @@ export interface GeekityEnv {
44
45
  devMode: boolean;
45
46
  /** Whether the site can send mail, read once per request (see `MailService.configured`). */
46
47
  mailConfigured: boolean;
48
+ /**
49
+ * What the site's form challenge draws on this request's forms, or
50
+ * `undefined` while none is on. Read once per request.
51
+ */
52
+ challengeWidget: ChallengeWidget | undefined;
47
53
  siteAtRequestStart: SiteSettings;
48
54
  store: RequestIndex;
49
55
  /** Users and sessions, the part of the database that is not derived. */
@@ -1 +1 @@
1
- {"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../../src/web/env.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../../src/web/env.ts"],"names":[],"mappings":"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"}
@@ -10,6 +10,8 @@ export declare const AUTHORIZATION_PATH = "/_geekity/indieauth/auth";
10
10
  export declare const TOKEN_PATH = "/_geekity/indieauth/token";
11
11
  /** Where a resource server asks what a token is good for. */
12
12
  export declare const INTROSPECTION_PATH = "/_geekity/indieauth/introspect";
13
+ export declare const REGISTRATION_PATH = "/_geekity/indieauth/register";
14
+ export declare const REGISTERED_CLIENTS_PATH = "/_geekity/indieauth/clients/";
13
15
  /** Where a client hands a token back to end it. */
14
16
  export declare const REVOCATION_PATH = "/_geekity/indieauth/revoke";
15
17
  /** Where a client asks for the profile a token was approved to see. */
@@ -38,6 +40,7 @@ export interface AuthorizationServerMetadata {
38
40
  introspection_endpoint: string;
39
41
  revocation_endpoint: string;
40
42
  userinfo_endpoint: string;
43
+ registration_endpoint: string;
41
44
  response_types_supported: readonly string[];
42
45
  grant_types_supported: readonly string[];
43
46
  code_challenge_methods_supported: readonly string[];
@@ -1 +1 @@
1
- {"version":3,"file":"indieauth-discovery.d.ts","sourceRoot":"","sources":["../../src/web/indieauth-discovery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAC;AAEpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAM3C,qEAAqE;AACrE,eAAO,MAAM,uBAAuB,iCAAiC,CAAC;AAEtE,4DAA4D;AAC5D,eAAO,MAAM,8BAA8B,4CAA4C,CAAC;AAExF,4DAA4D;AAC5D,eAAO,MAAM,kBAAkB,6BAA6B,CAAC;AAE7D,yDAAyD;AACzD,eAAO,MAAM,UAAU,8BAA8B,CAAC;AAEtD,6DAA6D;AAC7D,eAAO,MAAM,kBAAkB,mCAAmC,CAAC;AAEnE,mDAAmD;AACnD,eAAO,MAAM,eAAe,+BAA+B,CAAC;AAE5D,uEAAuE;AACvE,eAAO,MAAM,aAAa,iCAAiC,CAAC;AAE5D,6EAA6E;AAC7E,eAAO,MAAM,aAAa,uBAAuB,CAAC;AAElD,2EAA2E;AAC3E,eAAO,MAAM,mBAAmB,6BAA6B,CAAC;AAE9D,eAAO,MAAM,QAAQ,kBAAkB,CAAC;AAExC,eAAO,MAAM,oBAAoB,sCAAsC,CAAC;AAExE;;;GAGG;AACH,eAAO,MAAM,gCAAgC,0CAA0C,CAAC;AAExF;;;GAGG;AACH,eAAO,MAAM,0BAA0B,uDAAmD,CAAC;AAE3F,iFAAiF;AACjF,MAAM,WAAW,2BAA2B;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,sBAAsB,EAAE,MAAM,CAAC;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB,sBAAsB,EAAE,MAAM,CAAC;IAC/B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,wBAAwB,EAAE,SAAS,MAAM,EAAE,CAAC;IAC5C,qBAAqB,EAAE,SAAS,MAAM,EAAE,CAAC;IACzC,gCAAgC,EAAE,SAAS,MAAM,EAAE,CAAC;IACpD,gBAAgB,EAAE,SAAS,MAAM,EAAE,CAAC;IACpC,8CAA8C,EAAE,OAAO,CAAC;IACxD;;;OAGG;IACH,qCAAqC,EAAE,OAAO,CAAC;CAChD;AAED;;;;;;;;GAQG;AACH,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,MAAM,GAAG,2BAA2B,CAexF;AAED,4CAA4C;AAC5C,MAAM,WAAW,yBAAyB;IACxC,QAAQ,EAAE,MAAM,CAAC;IACjB,qBAAqB,EAAE,SAAS,MAAM,EAAE,CAAC;IACzC,gBAAgB,EAAE,SAAS,MAAM,EAAE,CAAC;IACpC,wBAAwB,EAAE,SAAS,MAAM,EAAE,CAAC;CAC7C;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,MAAM,GAAG,yBAAyB,CAOpF;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,yBAAyB,CAO9E;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG,IAAI,CAQnE;AAeD;;;;;;;;;GASG;AACH,eAAO,MAAM,0BAA0B,EAAE,iBAAiB,CAAC,UAAU,CAyBpE,CAAC"}
1
+ {"version":3,"file":"indieauth-discovery.d.ts","sourceRoot":"","sources":["../../src/web/indieauth-discovery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAC;AAEpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAM3C,qEAAqE;AACrE,eAAO,MAAM,uBAAuB,iCAAiC,CAAC;AAEtE,4DAA4D;AAC5D,eAAO,MAAM,8BAA8B,4CAA4C,CAAC;AAExF,4DAA4D;AAC5D,eAAO,MAAM,kBAAkB,6BAA6B,CAAC;AAE7D,yDAAyD;AACzD,eAAO,MAAM,UAAU,8BAA8B,CAAC;AAEtD,6DAA6D;AAC7D,eAAO,MAAM,kBAAkB,mCAAmC,CAAC;AAEnE,eAAO,MAAM,iBAAiB,iCAAiC,CAAC;AAEhE,eAAO,MAAM,uBAAuB,iCAAiC,CAAC;AAEtE,mDAAmD;AACnD,eAAO,MAAM,eAAe,+BAA+B,CAAC;AAE5D,uEAAuE;AACvE,eAAO,MAAM,aAAa,iCAAiC,CAAC;AAE5D,6EAA6E;AAC7E,eAAO,MAAM,aAAa,uBAAuB,CAAC;AAElD,2EAA2E;AAC3E,eAAO,MAAM,mBAAmB,6BAA6B,CAAC;AAE9D,eAAO,MAAM,QAAQ,kBAAkB,CAAC;AAExC,eAAO,MAAM,oBAAoB,sCAAsC,CAAC;AAExE;;;GAGG;AACH,eAAO,MAAM,gCAAgC,0CAA0C,CAAC;AAExF;;;GAGG;AACH,eAAO,MAAM,0BAA0B,uDAAmD,CAAC;AAE3F,iFAAiF;AACjF,MAAM,WAAW,2BAA2B;IAC1C,MAAM,EAAE,MAAM,CAAC;IACf,sBAAsB,EAAE,MAAM,CAAC;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB,sBAAsB,EAAE,MAAM,CAAC;IAC/B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,wBAAwB,EAAE,SAAS,MAAM,EAAE,CAAC;IAC5C,qBAAqB,EAAE,SAAS,MAAM,EAAE,CAAC;IACzC,gCAAgC,EAAE,SAAS,MAAM,EAAE,CAAC;IACpD,gBAAgB,EAAE,SAAS,MAAM,EAAE,CAAC;IACpC,8CAA8C,EAAE,OAAO,CAAC;IACxD;;;OAGG;IACH,qCAAqC,EAAE,OAAO,CAAC;CAChD;AAED;;;;;;;;GAQG;AACH,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,MAAM,GAAG,2BAA2B,CAgBxF;AAED,4CAA4C;AAC5C,MAAM,WAAW,yBAAyB;IACxC,QAAQ,EAAE,MAAM,CAAC;IACjB,qBAAqB,EAAE,SAAS,MAAM,EAAE,CAAC;IACzC,gBAAgB,EAAE,SAAS,MAAM,EAAE,CAAC;IACpC,wBAAwB,EAAE,SAAS,MAAM,EAAE,CAAC;CAC7C;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,MAAM,GAAG,yBAAyB,CAOpF;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,yBAAyB,CAO9E;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG,IAAI,CAQnE;AAeD;;;;;;;;;GASG;AACH,eAAO,MAAM,0BAA0B,EAAE,iBAAiB,CAAC,UAAU,CAyBpE,CAAC"}
@@ -12,6 +12,8 @@ export const AUTHORIZATION_PATH = '/_geekity/indieauth/auth';
12
12
  export const TOKEN_PATH = '/_geekity/indieauth/token';
13
13
  /** Where a resource server asks what a token is good for. */
14
14
  export const INTROSPECTION_PATH = '/_geekity/indieauth/introspect';
15
+ export const REGISTRATION_PATH = '/_geekity/indieauth/register';
16
+ export const REGISTERED_CLIENTS_PATH = '/_geekity/indieauth/clients/';
15
17
  /** Where a client hands a token back to end it. */
16
18
  export const REVOCATION_PATH = '/_geekity/indieauth/revoke';
17
19
  /** Where a client asks for the profile a token was approved to see. */
@@ -49,6 +51,7 @@ export function authorizationServerMetadata(baseUrl) {
49
51
  introspection_endpoint: `${baseUrl}${INTROSPECTION_PATH}`,
50
52
  revocation_endpoint: `${baseUrl}${REVOCATION_PATH}`,
51
53
  userinfo_endpoint: `${baseUrl}${USERINFO_PATH}`,
54
+ registration_endpoint: `${baseUrl}${REGISTRATION_PATH}`,
52
55
  response_types_supported: ['code'],
53
56
  grant_types_supported: ['authorization_code', 'refresh_token'],
54
57
  code_challenge_methods_supported: ['S256'],
@@ -1 +1 @@
1
- {"version":3,"file":"indieauth-discovery.js","sourceRoot":"","sources":["../../src/web/indieauth-discovery.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"indieauth-discovery.js","sourceRoot":"","sources":["../../src/web/indieauth-discovery.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,qEAAqE;AACrE,MAAM,CAAC,MAAM,uBAAuB,GAAG,8BAA8B,CAAC;AAEtE,4DAA4D;AAC5D,MAAM,CAAC,MAAM,8BAA8B,GAAG,yCAAyC,CAAC;AAExF,4DAA4D;AAC5D,MAAM,CAAC,MAAM,kBAAkB,GAAG,0BAA0B,CAAC;AAE7D,yDAAyD;AACzD,MAAM,CAAC,MAAM,UAAU,GAAG,2BAA2B,CAAC;AAEtD,6DAA6D;AAC7D,MAAM,CAAC,MAAM,kBAAkB,GAAG,gCAAgC,CAAC;AAEnE,MAAM,CAAC,MAAM,iBAAiB,GAAG,8BAA8B,CAAC;AAEhE,MAAM,CAAC,MAAM,uBAAuB,GAAG,8BAA8B,CAAC;AAEtE,mDAAmD;AACnD,MAAM,CAAC,MAAM,eAAe,GAAG,4BAA4B,CAAC;AAE5D,uEAAuE;AACvE,MAAM,CAAC,MAAM,aAAa,GAAG,8BAA8B,CAAC;AAE5D,6EAA6E;AAC7E,MAAM,CAAC,MAAM,aAAa,GAAG,oBAAoB,CAAC;AAElD,2EAA2E;AAC3E,MAAM,CAAC,MAAM,mBAAmB,GAAG,0BAA0B,CAAC;AAE9D,MAAM,CAAC,MAAM,QAAQ,GAAG,eAAe,CAAC;AAExC,MAAM,CAAC,MAAM,oBAAoB,GAAG,mCAAmC,CAAC;AAExE;;;GAGG;AACH,MAAM,CAAC,MAAM,gCAAgC,GAAG,uCAAuC,CAAC;AAExF;;;GAGG;AACH,MAAM,CAAC,MAAM,0BAA0B,GAAG,GAAG,gCAAgC,GAAG,QAAQ,EAAE,CAAC;AAuB3F;;;;;;;;GAQG;AACH,MAAM,UAAU,2BAA2B,CAAC,OAAe;IACzD,OAAO;QACL,MAAM,EAAE,OAAO;QACf,sBAAsB,EAAE,GAAG,OAAO,GAAG,kBAAkB,EAAE;QACzD,cAAc,EAAE,GAAG,OAAO,GAAG,UAAU,EAAE;QACzC,sBAAsB,EAAE,GAAG,OAAO,GAAG,kBAAkB,EAAE;QACzD,mBAAmB,EAAE,GAAG,OAAO,GAAG,eAAe,EAAE;QACnD,iBAAiB,EAAE,GAAG,OAAO,GAAG,aAAa,EAAE;QAC/C,qBAAqB,EAAE,GAAG,OAAO,GAAG,iBAAiB,EAAE;QACvD,wBAAwB,EAAE,CAAC,MAAM,CAAC;QAClC,qBAAqB,EAAE,CAAC,oBAAoB,EAAE,eAAe,CAAC;QAC9D,gCAAgC,EAAE,CAAC,MAAM,CAAC;QAC1C,gBAAgB,EAAE,MAAM;QACxB,8CAA8C,EAAE,IAAI;QACpD,qCAAqC,EAAE,IAAI;KAC5C,CAAC;AACJ,CAAC;AAUD;;;;GAIG;AACH,MAAM,UAAU,yBAAyB,CAAC,OAAe;IACvD,OAAO;QACL,QAAQ,EAAE,OAAO;QACjB,qBAAqB,EAAE,CAAC,2BAA2B,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC;QACpE,gBAAgB,EAAE,eAAe;QACjC,wBAAwB,EAAE,CAAC,QAAQ,EAAE,MAAM,CAAC;KAC7C,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,OAAe;IACjD,OAAO;QACL,QAAQ,EAAE,GAAG,OAAO,GAAG,QAAQ,EAAE;QACjC,qBAAqB,EAAE,CAAC,2BAA2B,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC;QACpE,gBAAgB,EAAE,UAAU;QAC5B,wBAAwB,EAAE,CAAC,QAAQ,CAAC;KACrC,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,uBAAuB,CAAC,GAAqB;IAC3D,KAAK,MAAM,QAAQ,IAAI,CAAC,uBAAuB,EAAE,8BAA8B,CAAC,EAAE,CAAC;QACjF,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IACtF,CAAC;IACD,GAAG,CAAC,GAAG,CAAC,gCAAgC,EAAE,CAAC,CAAC,EAAE,EAAE,CAC9C,CAAC,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CACxD,CAAC;IACF,GAAG,CAAC,GAAG,CAAC,0BAA0B,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;AAChG,CAAC;AAED;;;;;;;;GAQG;AACH,SAAS,cAAc,CAAC,QAAgB;IACtC,OAAO,QAAQ,KAAK,GAAG,IAAI,eAAe,CAAC,QAAQ,CAAC,EAAE,UAAU,KAAK,CAAC,CAAC;AACzE,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,0BAA0B,GAAkC,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE;IACzF,MAAM,IAAI,EAAE,CAAC;IACb,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;QAAE,OAAO;IAC5C,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC;IACzB,IAAI,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,GAAG,GAAG,IAAI,MAAM,IAAI,GAAG,CAAC;QAAE,OAAO;IAE9D,MAAM,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC;IACrC,MAAM,QAAQ,GAAG,2BAA2B,CAAC,OAAO,CAAC,CAAC;IACtD,MAAM,KAAK,GAAG;QACZ,EAAE,GAAG,EAAE,oBAAoB,EAAE,IAAI,EAAE,GAAG,OAAO,GAAG,uBAAuB,EAAE,EAAE;QAC3E,EAAE,GAAG,EAAE,wBAAwB,EAAE,IAAI,EAAE,QAAQ,CAAC,sBAAsB,EAAE;QACxE,EAAE,GAAG,EAAE,gBAAgB,EAAE,IAAI,EAAE,QAAQ,CAAC,cAAc,EAAE;QACxD,EAAE,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,OAAO,GAAG,aAAa,EAAE,EAAE;KACxD,CAAC;IACF,KAAK,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,KAAK;QAAE,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,IAAI,WAAW,GAAG,GAAG,CAAC,CAAC;IAC3F,IAAI,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC,CAAC,UAAU,CAAC,WAAW,CAAC;QAAE,OAAO;IAEjG,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IAC3C,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;IACjC,MAAM,SAAS,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,cAAc,GAAG,WAAW,IAAI,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC9F,MAAM,IAAI,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,SAAS,CAAC,CAAC;IACzD,2EAA2E;IAC3E,eAAe;IACf,CAAC,CAAC,GAAG,GAAG,SAAS,CAAC;IAClB,CAAC,CAAC,GAAG,GAAG,IAAI,QAAQ,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;AAClD,CAAC,CAAC;AAEF,mFAAmF;AACnF,SAAS,YAAY,CAAC,IAAY,EAAE,IAAY;IAC9C,MAAM,IAAI,GAAG,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACvC,IAAI,IAAI,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IAC/B,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;AACxE,CAAC"}
@@ -0,0 +1,5 @@
1
+ import type { Hono } from 'hono';
2
+ import type { GeekityEnv } from './env.ts';
3
+ export declare function registeredClientsUrl(baseUrl: string): string;
4
+ export declare function mountClientRegistration(app: Hono<GeekityEnv>): void;
5
+ //# sourceMappingURL=indieauth-registration.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"indieauth-registration.d.ts","sourceRoot":"","sources":["../../src/web/indieauth-registration.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAEjC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAkB3C,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAE5D;AAED,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG,IAAI,CA8CnE"}
@@ -0,0 +1,51 @@
1
+ import { REGISTERED_CLIENTS_PATH, REGISTRATION_PATH } from './indieauth-discovery.js';
2
+ import { clientMetadata, decodeClient, parseRegistration, encodeClientId, } from '../indieauth/registration.js';
3
+ import { readWithin } from '../webmention/fetch-public.js';
4
+ const REGISTRATION_MAX_BYTES = 16 * 1024;
5
+ const PKCE_ONLY_CLIENT = {
6
+ grant_types: ['authorization_code', 'refresh_token'],
7
+ response_types: ['code'],
8
+ token_endpoint_auth_method: 'none',
9
+ };
10
+ export function registeredClientsUrl(baseUrl) {
11
+ return `${baseUrl}${REGISTERED_CLIENTS_PATH}`;
12
+ }
13
+ export function mountClientRegistration(app) {
14
+ app.post(REGISTRATION_PATH, async (c) => {
15
+ c.header('cache-control', 'no-store');
16
+ const read = await readWithin(c.req.raw, REGISTRATION_MAX_BYTES, 'refuse');
17
+ let metadata;
18
+ try {
19
+ metadata = read === undefined ? undefined : JSON.parse(new TextDecoder().decode(read.body));
20
+ }
21
+ catch {
22
+ metadata = undefined;
23
+ }
24
+ if (metadata === undefined) {
25
+ return c.json({ error: 'invalid_client_metadata', error_description: 'The body must be a JSON object.' }, 400);
26
+ }
27
+ const registration = parseRegistration(metadata);
28
+ if (!registration.ok) {
29
+ return c.json({ error: registration.error, error_description: registration.description }, 400);
30
+ }
31
+ const { client } = registration;
32
+ return c.json({
33
+ client_id: encodeClientId(registeredClientsUrl(c.var.config.baseUrl), client),
34
+ client_id_issued_at: Math.floor(c.var.config.now().getTime() / 1000),
35
+ ...clientMetadata(client),
36
+ ...PKCE_ONLY_CLIENT,
37
+ }, 201);
38
+ });
39
+ app.get(`${REGISTERED_CLIENTS_PATH}:payload`, (c) => {
40
+ const payload = c.req.param('payload');
41
+ const client = decodeClient(payload);
42
+ if (client === undefined)
43
+ return c.notFound();
44
+ return c.json({
45
+ client_id: `${registeredClientsUrl(c.var.config.baseUrl)}${payload}`,
46
+ ...clientMetadata(client),
47
+ ...PKCE_ONLY_CLIENT,
48
+ });
49
+ });
50
+ }
51
+ //# sourceMappingURL=indieauth-registration.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"indieauth-registration.js","sourceRoot":"","sources":["../../src/web/indieauth-registration.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"page-sources.d.ts","sourceRoot":"","sources":["../../src/web/page-sources.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAKnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,KAAK,EACV,aAAa,EACb,cAAc,EACd,aAAa,EACb,cAAc,EACf,MAAM,qBAAqB,CAAC;AAQ7B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAEzD,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC;IAChC,QAAQ,CAAC,KAAK,EAAE,cAAc,GAAG,aAAa,GAAG,cAAc,GAAG,aAAa,CAAC;IAChF,QAAQ,CAAC,SAAS,EAAE,cAAc,CAAC;IACnC,QAAQ,CAAC,QAAQ,EAAE,cAAc,CAAC;CACnC;AAED,MAAM,MAAM,WAAW,GAAG,QAAQ,CAChC,IAAI,CACF,qBAAqB,EACnB,aAAa,GACb,UAAU,GACV,OAAO,GACP,OAAO,GACP,aAAa,GACb,aAAa,GACb,YAAY,GACZ,WAAW,GACX,aAAa,GACb,cAAc,CACjB,CACF,CAAC;AAEF,wBAAgB,WAAW,CAAC,EAC1B,MAAM,EACN,KAAK,EACL,SAAS,EACT,QAAQ,GACT,EAAE,kBAAkB,GAAG,WAAW,CAgClC"}
1
+ {"version":3,"file":"page-sources.d.ts","sourceRoot":"","sources":["../../src/web/page-sources.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAKnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,KAAK,EACV,aAAa,EACb,cAAc,EACd,aAAa,EACb,cAAc,EACf,MAAM,qBAAqB,CAAC;AAQ7B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAGzD,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC;IAChC,QAAQ,CAAC,KAAK,EAAE,cAAc,GAAG,aAAa,GAAG,cAAc,GAAG,aAAa,CAAC;IAChF,QAAQ,CAAC,SAAS,EAAE,cAAc,CAAC;IACnC,QAAQ,CAAC,QAAQ,EAAE,cAAc,CAAC;CACnC;AAED,MAAM,MAAM,WAAW,GAAG,QAAQ,CAChC,IAAI,CACF,qBAAqB,EACnB,aAAa,GACb,UAAU,GACV,OAAO,GACP,OAAO,GACP,aAAa,GACb,aAAa,GACb,YAAY,GACZ,WAAW,GACX,aAAa,GACb,cAAc,CACjB,CACF,CAAC;AAEF,wBAAgB,WAAW,CAAC,EAC1B,MAAM,EACN,KAAK,EACL,SAAS,EACT,QAAQ,GACT,EAAE,kBAAkB,GAAG,WAAW,CAkClC"}