@geekity/cms 0.43.0 → 0.45.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 (256) hide show
  1. package/admin/pages/indieauth/consent.njk +1 -1
  2. package/admin/pages/users/activity.njk +3 -1
  3. package/admin/pages/users/apps.njk +55 -19
  4. package/admin/static/admin.css +9 -1
  5. package/dist/admin/app-activity.d.ts +8 -3
  6. package/dist/admin/app-activity.d.ts.map +1 -1
  7. package/dist/admin/app-activity.js +10 -3
  8. package/dist/admin/app-activity.js.map +1 -1
  9. package/dist/admin/connected-apps.d.ts +1 -1
  10. package/dist/admin/connected-apps.d.ts.map +1 -1
  11. package/dist/admin/connected-apps.js +99 -28
  12. package/dist/admin/connected-apps.js.map +1 -1
  13. package/dist/admin/indieauth-consent.d.ts.map +1 -1
  14. package/dist/admin/indieauth-consent.js +44 -13
  15. package/dist/admin/indieauth-consent.js.map +1 -1
  16. package/dist/admin/widget-health.d.ts.map +1 -1
  17. package/dist/admin/widget-health.js +2 -0
  18. package/dist/admin/widget-health.js.map +1 -1
  19. package/dist/avatars/avatars.d.ts +1 -1
  20. package/dist/avatars/avatars.d.ts.map +1 -1
  21. package/dist/avatars/avatars.js +14 -5
  22. package/dist/avatars/avatars.js.map +1 -1
  23. package/dist/cms/app.d.ts.map +1 -1
  24. package/dist/cms/app.js +5 -4
  25. package/dist/cms/app.js.map +1 -1
  26. package/dist/cms/create.d.ts.map +1 -1
  27. package/dist/cms/create.js +7 -6
  28. package/dist/cms/create.js.map +1 -1
  29. package/dist/cms/lifecycle.d.ts +13 -1
  30. package/dist/cms/lifecycle.d.ts.map +1 -1
  31. package/dist/cms/lifecycle.js +31 -3
  32. package/dist/cms/lifecycle.js.map +1 -1
  33. package/dist/cms/services.d.ts.map +1 -1
  34. package/dist/cms/services.js +36 -15
  35. package/dist/cms/services.js.map +1 -1
  36. package/dist/{micropub/create.d.ts → content/micropub-create.d.ts} +5 -5
  37. package/dist/content/micropub-create.d.ts.map +1 -0
  38. package/dist/{micropub/create.js → content/micropub-create.js} +8 -8
  39. package/dist/content/micropub-create.js.map +1 -0
  40. package/dist/{micropub/update.d.ts → content/micropub-update.d.ts} +9 -9
  41. package/dist/content/micropub-update.d.ts.map +1 -0
  42. package/dist/{micropub/update.js → content/micropub-update.js} +8 -8
  43. package/dist/content/micropub-update.js.map +1 -0
  44. package/dist/federation/backfill.d.ts +1 -2
  45. package/dist/federation/backfill.d.ts.map +1 -1
  46. package/dist/federation/backfill.js +14 -5
  47. package/dist/federation/backfill.js.map +1 -1
  48. package/dist/federation/delivery.d.ts +20 -2
  49. package/dist/federation/delivery.d.ts.map +1 -1
  50. package/dist/federation/delivery.js +23 -20
  51. package/dist/federation/delivery.js.map +1 -1
  52. package/dist/federation/federation.d.ts.map +1 -1
  53. package/dist/federation/federation.js +2 -8
  54. package/dist/federation/federation.js.map +1 -1
  55. package/dist/federation/inbox.d.ts +5 -2
  56. package/dist/federation/inbox.d.ts.map +1 -1
  57. package/dist/federation/inbox.js +3 -3
  58. package/dist/federation/inbox.js.map +1 -1
  59. package/dist/federation/keys.d.ts +10 -0
  60. package/dist/federation/keys.d.ts.map +1 -1
  61. package/dist/federation/keys.js +13 -8
  62. package/dist/federation/keys.js.map +1 -1
  63. package/dist/federation/profiles.d.ts +1 -3
  64. package/dist/federation/profiles.d.ts.map +1 -1
  65. package/dist/federation/profiles.js +17 -7
  66. package/dist/federation/profiles.js.map +1 -1
  67. package/dist/federation/resend-job.d.ts +2 -1
  68. package/dist/federation/resend-job.d.ts.map +1 -1
  69. package/dist/federation/resend-job.js +11 -10
  70. package/dist/federation/resend-job.js.map +1 -1
  71. package/dist/federation/retry-job.d.ts +44 -0
  72. package/dist/federation/retry-job.d.ts.map +1 -0
  73. package/dist/federation/retry-job.js +102 -0
  74. package/dist/federation/retry-job.js.map +1 -0
  75. package/dist/files/data-files.d.ts +1 -0
  76. package/dist/files/data-files.d.ts.map +1 -1
  77. package/dist/files/data-files.js +6 -0
  78. package/dist/files/data-files.js.map +1 -1
  79. package/dist/indieauth/registration.d.ts +16 -0
  80. package/dist/indieauth/registration.d.ts.map +1 -0
  81. package/dist/indieauth/registration.js +107 -0
  82. package/dist/indieauth/registration.js.map +1 -0
  83. package/dist/indieauth/request.d.ts +4 -3
  84. package/dist/indieauth/request.d.ts.map +1 -1
  85. package/dist/indieauth/request.js +21 -3
  86. package/dist/indieauth/request.js.map +1 -1
  87. package/dist/mcp/audit.d.ts +3 -0
  88. package/dist/mcp/audit.d.ts.map +1 -0
  89. package/dist/mcp/audit.js +35 -0
  90. package/dist/mcp/audit.js.map +1 -0
  91. package/dist/mcp/authoring/create.d.ts +2 -0
  92. package/dist/mcp/authoring/create.d.ts.map +1 -0
  93. package/dist/mcp/authoring/create.js +79 -0
  94. package/dist/mcp/authoring/create.js.map +1 -0
  95. package/dist/mcp/authoring/publish.d.ts +2 -0
  96. package/dist/mcp/authoring/publish.d.ts.map +1 -0
  97. package/dist/mcp/authoring/publish.js +75 -0
  98. package/dist/mcp/authoring/publish.js.map +1 -0
  99. package/dist/mcp/authoring/shared.d.ts +23 -0
  100. package/dist/mcp/authoring/shared.d.ts.map +1 -0
  101. package/dist/mcp/authoring/shared.js +35 -0
  102. package/dist/mcp/authoring/shared.js.map +1 -0
  103. package/dist/mcp/authoring/source.d.ts +2 -0
  104. package/dist/mcp/authoring/source.d.ts.map +1 -0
  105. package/dist/mcp/authoring/source.js +48 -0
  106. package/dist/mcp/authoring/source.js.map +1 -0
  107. package/dist/mcp/authoring/update.d.ts +2 -0
  108. package/dist/mcp/authoring/update.d.ts.map +1 -0
  109. package/dist/mcp/authoring/update.js +97 -0
  110. package/dist/mcp/authoring/update.js.map +1 -0
  111. package/dist/mcp/authoring/upload.d.ts +3 -0
  112. package/dist/mcp/authoring/upload.d.ts.map +1 -0
  113. package/dist/mcp/authoring/upload.js +71 -0
  114. package/dist/mcp/authoring/upload.js.map +1 -0
  115. package/dist/mcp/call-limit.d.ts +18 -0
  116. package/dist/mcp/call-limit.d.ts.map +1 -0
  117. package/dist/mcp/call-limit.js +24 -0
  118. package/dist/mcp/call-limit.js.map +1 -0
  119. package/dist/mcp/endpoint.d.ts +7 -0
  120. package/dist/mcp/endpoint.d.ts.map +1 -0
  121. package/dist/mcp/endpoint.js +161 -0
  122. package/dist/mcp/endpoint.js.map +1 -0
  123. package/dist/mcp/inspect/inbox.d.ts +2 -0
  124. package/dist/mcp/inspect/inbox.d.ts.map +1 -0
  125. package/dist/mcp/inspect/inbox.js +123 -0
  126. package/dist/mcp/inspect/inbox.js.map +1 -0
  127. package/dist/mcp/inspect/paging.d.ts +71 -0
  128. package/dist/mcp/inspect/paging.d.ts.map +1 -0
  129. package/dist/mcp/inspect/paging.js +59 -0
  130. package/dist/mcp/inspect/paging.js.map +1 -0
  131. package/dist/mcp/inspect/post.d.ts +9 -0
  132. package/dist/mcp/inspect/post.d.ts.map +1 -0
  133. package/dist/mcp/inspect/post.js +161 -0
  134. package/dist/mcp/inspect/post.js.map +1 -0
  135. package/dist/mcp/inspect/records.d.ts +4 -0
  136. package/dist/mcp/inspect/records.d.ts.map +1 -0
  137. package/dist/mcp/inspect/records.js +213 -0
  138. package/dist/mcp/inspect/records.js.map +1 -0
  139. package/dist/mcp/inspect/remote.d.ts +85 -0
  140. package/dist/mcp/inspect/remote.d.ts.map +1 -0
  141. package/dist/mcp/inspect/remote.js +274 -0
  142. package/dist/mcp/inspect/remote.js.map +1 -0
  143. package/dist/mcp/inspect/schemas.d.ts +70 -0
  144. package/dist/mcp/inspect/schemas.d.ts.map +1 -0
  145. package/dist/mcp/inspect/schemas.js +46 -0
  146. package/dist/mcp/inspect/schemas.js.map +1 -0
  147. package/dist/mcp/inspect/status.d.ts +2 -0
  148. package/dist/mcp/inspect/status.d.ts.map +1 -0
  149. package/dist/mcp/inspect/status.js +194 -0
  150. package/dist/mcp/inspect/status.js.map +1 -0
  151. package/dist/mcp/inspect/webmentions.d.ts +2 -0
  152. package/dist/mcp/inspect/webmentions.d.ts.map +1 -0
  153. package/dist/mcp/inspect/webmentions.js +130 -0
  154. package/dist/mcp/inspect/webmentions.js.map +1 -0
  155. package/dist/mcp/plugin-tools.d.ts +4 -0
  156. package/dist/mcp/plugin-tools.d.ts.map +1 -0
  157. package/dist/mcp/plugin-tools.js +29 -0
  158. package/dist/mcp/plugin-tools.js.map +1 -0
  159. package/dist/mcp/protocol.d.ts +67 -0
  160. package/dist/mcp/protocol.d.ts.map +1 -0
  161. package/dist/mcp/protocol.js +130 -0
  162. package/dist/mcp/protocol.js.map +1 -0
  163. package/dist/mcp/repair/refresh.d.ts +2 -0
  164. package/dist/mcp/repair/refresh.d.ts.map +1 -0
  165. package/dist/mcp/repair/refresh.js +111 -0
  166. package/dist/mcp/repair/refresh.js.map +1 -0
  167. package/dist/mcp/repair/resend.d.ts +2 -0
  168. package/dist/mcp/repair/resend.d.ts.map +1 -0
  169. package/dist/mcp/repair/resend.js +46 -0
  170. package/dist/mcp/repair/resend.js.map +1 -0
  171. package/dist/mcp/repair/retry.d.ts +2 -0
  172. package/dist/mcp/repair/retry.d.ts.map +1 -0
  173. package/dist/mcp/repair/retry.js +91 -0
  174. package/dist/mcp/repair/retry.js.map +1 -0
  175. package/dist/mcp/repair/schemas.d.ts +30 -0
  176. package/dist/mcp/repair/schemas.d.ts.map +1 -0
  177. package/dist/mcp/repair/schemas.js +26 -0
  178. package/dist/mcp/repair/schemas.js.map +1 -0
  179. package/dist/mcp/tools.d.ts +84 -0
  180. package/dist/mcp/tools.d.ts.map +1 -0
  181. package/dist/mcp/tools.js +102 -0
  182. package/dist/mcp/tools.js.map +1 -0
  183. package/dist/mcp/whoami.d.ts +2 -0
  184. package/dist/mcp/whoami.d.ts.map +1 -0
  185. package/dist/mcp/whoami.js +40 -0
  186. package/dist/mcp/whoami.js.map +1 -0
  187. package/dist/micropub/endpoint.d.ts.map +1 -1
  188. package/dist/micropub/endpoint.js +2 -2
  189. package/dist/micropub/endpoint.js.map +1 -1
  190. package/dist/plugin.d.ts +77 -1
  191. package/dist/plugin.d.ts.map +1 -1
  192. package/dist/plugin.js +16 -1
  193. package/dist/plugin.js.map +1 -1
  194. package/dist/plugins/registry.d.ts +7 -1
  195. package/dist/plugins/registry.d.ts.map +1 -1
  196. package/dist/plugins/registry.js +23 -5
  197. package/dist/plugins/registry.js.map +1 -1
  198. package/dist/store/admin-store.d.ts +3 -3
  199. package/dist/store/admin-store.d.ts.map +1 -1
  200. package/dist/store/admin-store.js.map +1 -1
  201. package/dist/store/deliveries.d.ts +23 -0
  202. package/dist/store/deliveries.d.ts.map +1 -1
  203. package/dist/store/deliveries.js +56 -1
  204. package/dist/store/deliveries.js.map +1 -1
  205. package/dist/store/inbox.d.ts +17 -1
  206. package/dist/store/inbox.d.ts.map +1 -1
  207. package/dist/store/inbox.js +35 -0
  208. package/dist/store/inbox.js.map +1 -1
  209. package/dist/store/rows.d.ts +5 -0
  210. package/dist/store/rows.d.ts.map +1 -1
  211. package/dist/store/rows.js.map +1 -1
  212. package/dist/util/json-schema.d.ts +68 -0
  213. package/dist/util/json-schema.d.ts.map +1 -0
  214. package/dist/util/json-schema.js +60 -0
  215. package/dist/util/json-schema.js.map +1 -0
  216. package/dist/util/package-version.d.ts +2 -0
  217. package/dist/util/package-version.d.ts.map +1 -0
  218. package/dist/util/package-version.js +3 -0
  219. package/dist/util/package-version.js.map +1 -0
  220. package/dist/web/env.d.ts +2 -0
  221. package/dist/web/env.d.ts.map +1 -1
  222. package/dist/web/federation-routes.d.ts +1 -0
  223. package/dist/web/federation-routes.d.ts.map +1 -1
  224. package/dist/web/federation-routes.js +10 -7
  225. package/dist/web/federation-routes.js.map +1 -1
  226. package/dist/web/indieauth-activity-log.d.ts +23 -5
  227. package/dist/web/indieauth-activity-log.d.ts.map +1 -1
  228. package/dist/web/indieauth-activity-log.js +62 -23
  229. package/dist/web/indieauth-activity-log.js.map +1 -1
  230. package/dist/web/indieauth-bearer.d.ts +8 -1
  231. package/dist/web/indieauth-bearer.d.ts.map +1 -1
  232. package/dist/web/indieauth-bearer.js +24 -18
  233. package/dist/web/indieauth-bearer.js.map +1 -1
  234. package/dist/web/indieauth-discovery.d.ts +14 -2
  235. package/dist/web/indieauth-discovery.d.ts.map +1 -1
  236. package/dist/web/indieauth-discovery.js +25 -4
  237. package/dist/web/indieauth-discovery.js.map +1 -1
  238. package/dist/web/indieauth-registration.d.ts +5 -0
  239. package/dist/web/indieauth-registration.d.ts.map +1 -0
  240. package/dist/web/indieauth-registration.js +51 -0
  241. package/dist/web/indieauth-registration.js.map +1 -0
  242. package/dist/web/llms.d.ts.map +1 -1
  243. package/dist/web/llms.js +2 -0
  244. package/dist/web/llms.js.map +1 -1
  245. package/dist/web/routes.d.ts.map +1 -1
  246. package/dist/web/routes.js +4 -3
  247. package/dist/web/routes.js.map +1 -1
  248. package/dist/webmention/fetch-public.d.ts +9 -0
  249. package/dist/webmention/fetch-public.d.ts.map +1 -1
  250. package/dist/webmention/fetch-public.js +6 -4
  251. package/dist/webmention/fetch-public.js.map +1 -1
  252. package/package.json +1 -1
  253. package/dist/micropub/create.d.ts.map +0 -1
  254. package/dist/micropub/create.js.map +0 -1
  255. package/dist/micropub/update.d.ts.map +0 -1
  256. package/dist/micropub/update.js.map +0 -1
@@ -0,0 +1 @@
1
+ {"version":3,"file":"json-schema.d.ts","sourceRoot":"","sources":["../../src/util/json-schema.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,60 @@
1
+ import { isRecord } from './guards.js';
2
+ /** `schema`, or `null`. */
3
+ export function nullable(schema) {
4
+ return { anyOf: [schema, { type: 'null' }] };
5
+ }
6
+ export function problemsWith(schema, value, name) {
7
+ const label = name ?? 'the arguments';
8
+ if ('anyOf' in schema)
9
+ return value === null ? [] : problemsWith(schema.anyOf[0], value, name);
10
+ switch (schema.type) {
11
+ case 'string':
12
+ if (typeof value !== 'string')
13
+ return [`${label} must be a string.`];
14
+ if (schema.enum !== undefined && !schema.enum.includes(value)) {
15
+ return [`${label} must be one of ${schema.enum.join(', ')}.`];
16
+ }
17
+ return [];
18
+ case 'number':
19
+ case 'integer':
20
+ return numberProblems(schema, value, label);
21
+ case 'boolean':
22
+ return typeof value === 'boolean' ? [] : [`${label} must be true or false.`];
23
+ case 'array':
24
+ if (!Array.isArray(value))
25
+ return [`${label} must be a list.`];
26
+ return value.flatMap((item, index) => problemsWith(schema.items, item, `${label}[${index}]`));
27
+ case 'object':
28
+ return objectProblems(schema, value, name);
29
+ }
30
+ }
31
+ function numberProblems(schema, value, name) {
32
+ if (typeof value !== 'number' || !Number.isFinite(value))
33
+ return [`${name} must be a number.`];
34
+ if (schema.type === 'integer' && !Number.isInteger(value)) {
35
+ return [`${name} must be a whole number.`];
36
+ }
37
+ if (schema.minimum !== undefined && value < schema.minimum) {
38
+ return [`${name} must be at least ${schema.minimum}.`];
39
+ }
40
+ if (schema.maximum !== undefined && value > schema.maximum) {
41
+ return [`${name} must be at most ${schema.maximum}.`];
42
+ }
43
+ return [];
44
+ }
45
+ function objectProblems(schema, value, name) {
46
+ if (!isRecord(value))
47
+ return [`${name ?? 'the arguments'} must be an object.`];
48
+ const labelOf = (key) => (name === undefined ? key : `${name}.${key}`);
49
+ const missing = (schema.required ?? [])
50
+ .filter((key) => value[key] === undefined)
51
+ .map((key) => `${labelOf(key)} is required.`);
52
+ const present = Object.entries(value).flatMap(([key, field]) => {
53
+ if (Object.hasOwn(schema.properties, key)) {
54
+ return problemsWith(schema.properties[key], field, labelOf(key));
55
+ }
56
+ return schema.additionalProperties === false ? [`${labelOf(key)} is not an argument.`] : [];
57
+ });
58
+ return [...missing, ...present];
59
+ }
60
+ //# sourceMappingURL=json-schema.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"json-schema.js","sourceRoot":"","sources":["../../src/util/json-schema.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,2 @@
1
+ export declare const PACKAGE_VERSION: string;
2
+ //# sourceMappingURL=package-version.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"package-version.d.ts","sourceRoot":"","sources":["../../src/util/package-version.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,eAAe,QAEnB,CAAC"}
@@ -0,0 +1,3 @@
1
+ import { createRequire } from 'node:module';
2
+ export const PACKAGE_VERSION = createRequire(import.meta.url)('../../package.json').version;
3
+ //# sourceMappingURL=package-version.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"package-version.js","sourceRoot":"","sources":["../../src/util/package-version.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,MAAM,CAAC,MAAM,eAAe,GAC1B,aAAa,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,oBAAoB,CACpD,CAAC,OAAO,CAAC"}
package/dist/web/env.d.ts CHANGED
@@ -8,6 +8,7 @@ import type { ArchiveReader, BacklinkReader, CatalogReader, DocumentLookup, Inde
8
8
  import type { SiteRecords } from '../content/write.ts';
9
9
  import type { DocumentChange, SyncResult } from '../content/sync.ts';
10
10
  import type { DeliveryService } from '../federation/delivery.ts';
11
+ import type { SiteFederation } from '../federation/federation.ts';
11
12
  import type { JobQueue } from '../jobs/types.ts';
12
13
  import type { ActivityNote } from './indieauth-activity-log.ts';
13
14
  import type { IndieAuthState } from '../indieauth/grants.ts';
@@ -102,6 +103,7 @@ export interface GeekityEnv {
102
103
  * away from any request.
103
104
  */
104
105
  delivery: DeliveryService;
106
+ federation: SiteFederation;
105
107
  jobs: JobQueue;
106
108
  /**
107
109
  * The site's relay subscriptions (FEP-ae0c), so a save of the settings can
@@ -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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"}
@@ -30,4 +30,5 @@ export interface MountFederationOptions {
30
30
  export declare function webFingerSubject(c: Context<GeekityEnv>, resource: string): User | undefined;
31
31
  /** What the dispatchers are handed, off the Hono context. */
32
32
  export declare function contextData(c: Context<GeekityEnv>): FederationContextData;
33
+ export declare function federationContextData(vars: Pick<GeekityEnv['Variables'], 'admin' | 'store' | 'config' | 'settings' | 'actorProfiles' | 'siteAtRequestStart' | 'replyContexts'>): FederationContextData;
33
34
  //# sourceMappingURL=federation-routes.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"federation-routes.d.ts","sourceRoot":"","sources":["../../src/web/federation-routes.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAC;AAM7D,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAM7C,OAAO,KAAK,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAGzF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAK3C;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,eAAe,CAC7B,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,EACrB,UAAU,EAAE,cAAc,EAC1B,OAAO,GAAE,sBAA2B,GACnC,IAAI,CAuGN;AAED,2EAA2E;AAC3E,MAAM,WAAW,sBAAsB;IACrC,uDAAuD;IACvD,OAAO,CAAC,EAAE,iBAAiB,CAAC,UAAU,CAAC,GAAG,SAAS,CAAC;CACrD;AAkKD,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAE3F;AAED,6DAA6D;AAC7D,wBAAgB,WAAW,CAAC,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,GAAG,qBAAqB,CAUzE"}
1
+ {"version":3,"file":"federation-routes.d.ts","sourceRoot":"","sources":["../../src/web/federation-routes.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAC;AAM7D,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAM7C,OAAO,KAAK,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAGzF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAK3C;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,eAAe,CAC7B,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,EACrB,UAAU,EAAE,cAAc,EAC1B,OAAO,GAAE,sBAA2B,GACnC,IAAI,CAuGN;AAED,2EAA2E;AAC3E,MAAM,WAAW,sBAAsB;IACrC,uDAAuD;IACvD,OAAO,CAAC,EAAE,iBAAiB,CAAC,UAAU,CAAC,GAAG,SAAS,CAAC;CACrD;AAkKD,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAE3F;AAED,6DAA6D;AAC7D,wBAAgB,WAAW,CAAC,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,GAAG,qBAAqB,CAEzE;AAED,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,IAAI,CACR,UAAU,CAAC,WAAW,CAAC,EACrB,OAAO,GACP,OAAO,GACP,QAAQ,GACR,UAAU,GACV,eAAe,GACf,oBAAoB,GACpB,eAAe,CAClB,GACA,qBAAqB,CAUvB"}
@@ -272,14 +272,17 @@ export function webFingerSubject(c, resource) {
272
272
  }
273
273
  /** What the dispatchers are handed, off the Hono context. */
274
274
  export function contextData(c) {
275
+ return federationContextData(c.var);
276
+ }
277
+ export function federationContextData(vars) {
275
278
  return {
276
- admin: c.var.admin,
277
- store: c.var.store,
278
- config: c.var.config,
279
- settings: c.var.settings,
280
- actorProfiles: c.var.actorProfiles,
281
- site: c.var.siteAtRequestStart,
282
- cited: (url) => c.var.replyContexts.read(url, c.var.siteAtRequestStart),
279
+ admin: vars.admin,
280
+ store: vars.store,
281
+ config: vars.config,
282
+ settings: vars.settings,
283
+ actorProfiles: vars.actorProfiles,
284
+ site: vars.siteAtRequestStart,
285
+ cited: (url) => vars.replyContexts.read(url, vars.siteAtRequestStart),
283
286
  };
284
287
  }
285
288
  //# sourceMappingURL=federation-routes.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"federation-routes.js","sourceRoot":"","sources":["../../src/web/federation-routes.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"federation-routes.js","sourceRoot":"","sources":["../../src/web/federation-routes.ts"],"names":[],"mappings":"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"}
@@ -1,10 +1,12 @@
1
1
  import type { Context, MiddlewareHandler } from 'hono';
2
2
  import type { GeekityEnv } from './env.ts';
3
3
  import type { Bearer } from './indieauth-bearer.ts';
4
+ import type { StoredToken } from '../indieauth/tokens.ts';
4
5
  /** Readable and writable by the site's own user only, like the tokens beside it. */
5
6
  export declare const ACTIVITY_LOG_MODE = 384;
6
- /** How many entries are kept, newest first. */
7
+ /** How many IndieAuth and Micropub entries are kept, newest first. */
7
8
  export declare const ACTIVITY_LOG_LIMIT = 100;
9
+ export declare const MCP_ACTIVITY_LIMIT = 500;
8
10
  /** How long an entry is kept: fourteen days. */
9
11
  export declare const ACTIVITY_LOG_MAX_AGE_MS: number;
10
12
  /** One field a request carried, as the log keeps it. */
@@ -23,13 +25,15 @@ export type CarriedField = {
23
25
  readonly redacted: true;
24
26
  };
25
27
  /** Which endpoint a request went to. */
26
- export type ActivityEndpoint = 'authorization' | 'token' | 'micropub' | 'media';
28
+ export type ActivityEndpoint = 'authorization' | 'token' | 'micropub' | 'media' | 'mcp';
27
29
  /** What a request's own route knows about it. */
28
30
  interface Facts {
29
31
  /** The client's URL, when the request named one or its token did. */
30
32
  readonly clientId?: string | undefined;
31
33
  /** The username the request acted as, when that is known. */
32
34
  readonly user?: string | undefined;
35
+ readonly connectionId?: string | undefined;
36
+ readonly tokenName?: string | undefined;
33
37
  readonly carried: readonly CarriedField[];
34
38
  }
35
39
  /** An entry's endpoint-specific part, one variant per endpoint and action. */
@@ -54,6 +58,9 @@ export type EndpointFacts = Facts & ({
54
58
  readonly endpoint: 'micropub' | 'media';
55
59
  /** The POST's action (`create` when none), `upload`, or the GET's `q=…`. */
56
60
  readonly action: string;
61
+ } | {
62
+ readonly endpoint: 'mcp';
63
+ readonly action: string;
57
64
  });
58
65
  /** One request, as the log keeps it. */
59
66
  export type ActivityEntry = EndpointFacts & {
@@ -86,11 +93,12 @@ export declare function isFailure(entry: ActivityEntry): boolean;
86
93
  /** Whether an entry is still inside the age limit at `now`. */
87
94
  export declare function isFresh(entry: ActivityEntry, now: Date): boolean;
88
95
  /**
89
- * Every entry, newest first. Read in the file's queue, so a read follows the
90
- * writes queued before it and a screen shows the request that just finished.
96
+ * Every entry from both files, newest first. Each is read in its file's
97
+ * queue, so a read follows the writes queued before it and a screen shows the
98
+ * request that just finished.
91
99
  */
92
100
  export declare function readActivityLog(dataDir: string): Promise<ActivityEntry[]>;
93
- /** Settles once every entry already on its way to the file has landed, so closing never leaves one half written. */
101
+ /** Settles once every entry already on its way to a file has landed, so closing never leaves one half written. */
94
102
  export declare function activityLogSettled(dataDir: string): Promise<void>;
95
103
  /** What a recording middleware may find on the context: a bearer, once the guard let it in. */
96
104
  interface ActivityEnv {
@@ -98,6 +106,16 @@ interface ActivityEnv {
98
106
  bearer?: Bearer;
99
107
  };
100
108
  }
109
+ export interface McpCallFacts {
110
+ readonly tool: string;
111
+ readonly args: unknown;
112
+ readonly token: StoredToken;
113
+ readonly username: string;
114
+ readonly status: number;
115
+ readonly error?: string;
116
+ readonly errorDescription?: string;
117
+ }
118
+ export declare function recordMcpCall(dataDir: string, call: McpCallFacts, at: Date): void;
101
119
  /** The authorization request, as the consent screen received it. */
102
120
  export declare const logAuthorizationRequest: MiddlewareHandler<ActivityEnv>;
103
121
  /** A client redeeming its code at the authorization endpoint for the profile. */
@@ -1 +1 @@
1
- {"version":3,"file":"indieauth-activity-log.d.ts","sourceRoot":"","sources":["../../src/web/indieauth-activity-log.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"indieauth-activity-log.d.ts","sourceRoot":"","sources":["../../src/web/indieauth-activity-log.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,8 @@
1
1
  /**
2
- * A short log of what apps sent to the IndieAuth and Micropub endpoints, and
3
- * what they were answered, so a site owner can see why a client
4
- * failed to sign in or to post without reading the client's source.
2
+ * A short log of what apps sent to the IndieAuth and Micropub endpoints and
3
+ * the MCP server's tools, and what they were answered, so a site owner can
4
+ * see why a client failed to sign in or to post, and what an agent did,
5
+ * without reading the client's source.
5
6
  *
6
7
  * One entry per request to the authorization endpoint (the request as it
7
8
  * reaches the consent screen, and the profile redemption), the token
@@ -25,11 +26,12 @@ import { readFileIfPresentSync, updateFileAtomically, withFileLock } from '../fi
25
26
  import { findUserById } from '../site/users.js';
26
27
  import { messageOf } from '../util/errors.js';
27
28
  import { isRecord } from '../util/guards.js';
28
- import { INDIEAUTH_ACTIVITY, dataPath } from '../files/data-files.js';
29
+ import { INDIEAUTH_ACTIVITY, MCP_ACTIVITY, dataPath } from '../files/data-files.js';
29
30
  /** Readable and writable by the site's own user only, like the tokens beside it. */
30
31
  export const ACTIVITY_LOG_MODE = 0o600;
31
- /** How many entries are kept, newest first. */
32
+ /** How many IndieAuth and Micropub entries are kept, newest first. */
32
33
  export const ACTIVITY_LOG_LIMIT = 100;
34
+ export const MCP_ACTIVITY_LIMIT = 500;
33
35
  /** How long an entry is kept: fourteen days. */
34
36
  export const ACTIVITY_LOG_MAX_AGE_MS = 14 * 24 * 60 * 60 * 1000;
35
37
  /** The longest value kept, in characters, before it is cut and marked with an ellipsis. */
@@ -58,8 +60,11 @@ export function isFailure(entry) {
58
60
  export function isFresh(entry, now) {
59
61
  return now.getTime() - Date.parse(entry.at) <= ACTIVITY_LOG_MAX_AGE_MS;
60
62
  }
61
- function logFile(dataDir) {
62
- return dataPath(dataDir, INDIEAUTH_ACTIVITY);
63
+ const HTTP_LOG = { declaration: INDIEAUTH_ACTIVITY, limit: ACTIVITY_LOG_LIMIT };
64
+ const MCP_LOG = { declaration: MCP_ACTIVITY, limit: MCP_ACTIVITY_LIMIT };
65
+ const ACTIVITY_FILES = [HTTP_LOG, MCP_LOG];
66
+ function logFile(dataDir, log) {
67
+ return dataPath(dataDir, log.declaration);
63
68
  }
64
69
  function parseLog(text) {
65
70
  if (text === undefined)
@@ -73,21 +78,25 @@ function parseLog(text) {
73
78
  }
74
79
  }
75
80
  /**
76
- * Every entry, newest first. Read in the file's queue, so a read follows the
77
- * writes queued before it and a screen shows the request that just finished.
81
+ * Every entry from both files, newest first. Each is read in its file's
82
+ * queue, so a read follows the writes queued before it and a screen shows the
83
+ * request that just finished.
78
84
  */
79
85
  export async function readActivityLog(dataDir) {
80
- const file = logFile(dataDir);
81
- return await withFileLock(file, () => parseLog(readFileIfPresentSync(file)));
86
+ const logs = await Promise.all(ACTIVITY_FILES.map(async (log) => {
87
+ const file = logFile(dataDir, log);
88
+ return await withFileLock(file, () => parseLog(readFileIfPresentSync(file)));
89
+ }));
90
+ return logs.flat().sort((a, b) => b.at.localeCompare(a.at));
82
91
  }
83
- /** Settles once every entry already on its way to the file has landed, so closing never leaves one half written. */
92
+ /** Settles once every entry already on its way to a file has landed, so closing never leaves one half written. */
84
93
  export async function activityLogSettled(dataDir) {
85
- await withFileLock(logFile(dataDir), () => undefined);
94
+ await Promise.all(ACTIVITY_FILES.map((log) => withFileLock(logFile(dataDir, log), () => undefined)));
86
95
  }
87
- async function appendEntry(dataDir, entry, now) {
88
- await updateFileAtomically(logFile(dataDir), (current) => {
96
+ async function appendEntry(dataDir, log, entry, now) {
97
+ await updateFileAtomically(logFile(dataDir, log), (current) => {
89
98
  const kept = parseLog(current).filter((old) => isFresh(old, now));
90
- const entries = [entry, ...kept].slice(0, ACTIVITY_LOG_LIMIT);
99
+ const entries = [entry, ...kept].slice(0, log.limit);
91
100
  return `${JSON.stringify({ entries }, null, 2)}\n`;
92
101
  }, { mode: ACTIVITY_LOG_MODE });
93
102
  }
@@ -113,7 +122,7 @@ function recordActivity(describe) {
113
122
  error: refusal?.error,
114
123
  errorDescription: refusal?.description,
115
124
  };
116
- appendEntry(dataDir, entry, at).catch((error) => {
125
+ appendEntry(dataDir, HTTP_LOG, entry, at).catch((error) => {
117
126
  warn(error);
118
127
  });
119
128
  }
@@ -124,7 +133,39 @@ function recordActivity(describe) {
124
133
  }
125
134
  function warn(error) {
126
135
  const reason = messageOf(error);
127
- console.warn(`Could not write the IndieAuth and Micropub activity log: ${reason}`);
136
+ console.warn(`Could not write the app activity log: ${reason}`);
137
+ }
138
+ export function recordMcpCall(dataDir, call, at) {
139
+ try {
140
+ const entry = {
141
+ id: randomUUID(),
142
+ at: at.toISOString(),
143
+ method: 'tools/call',
144
+ endpoint: 'mcp',
145
+ action: short(call.tool),
146
+ ...connectionFacts(call.token),
147
+ user: call.username,
148
+ carried: isRecord(call.args)
149
+ ? Object.entries(call.args)
150
+ .map(([name, value]) => field(name, value))
151
+ .slice(0, CARRIED_LIMIT)
152
+ : [],
153
+ status: call.status,
154
+ error: call.error,
155
+ errorDescription: call.errorDescription === undefined ? undefined : short(call.errorDescription),
156
+ };
157
+ appendEntry(dataDir, MCP_LOG, entry, at).catch((error) => {
158
+ warn(error);
159
+ });
160
+ }
161
+ catch (error) {
162
+ warn(error);
163
+ }
164
+ }
165
+ function connectionFacts(token) {
166
+ return token.kind === 'created'
167
+ ? { connectionId: token.id, tokenName: short(token.name) }
168
+ : { connectionId: token.id, clientId: short(token.clientId) };
128
169
  }
129
170
  /**
130
171
  * The OAuth or Micropub error a response carries: in a JSON error body, or in
@@ -279,11 +320,9 @@ export const logTokenRequest = recordActivity(async (c) => {
279
320
  /** Who a Micropub request acted as, once the bearer guard let it in. */
280
321
  function bearerFacts(c) {
281
322
  const { bearer } = c.var;
282
- const token = bearer?.token;
283
- return {
284
- clientId: token?.kind === 'created' ? undefined : token?.clientId,
285
- user: bearer?.user.username,
286
- };
323
+ if (bearer === undefined)
324
+ return {};
325
+ return { ...connectionFacts(bearer.token), user: bearer.user.username };
287
326
  }
288
327
  /** A query, or a create, update, delete or undelete, at the Micropub endpoint. */
289
328
  export const logMicropubRequest = recordActivity(async (c) => {
@@ -1 +1 @@
1
- {"version":3,"file":"indieauth-activity-log.js","sourceRoot":"","sources":["../../src/web/indieauth-activity-log.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"indieauth-activity-log.js","sourceRoot":"","sources":["../../src/web/indieauth-activity-log.ts"],"names":[],"mappings":"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"}
@@ -15,6 +15,7 @@ export interface Guard {
15
15
  readonly audience: Audience | 'authorization-server';
16
16
  readonly scopes?: Scopes;
17
17
  readonly insufficientScopeStatus?: InsufficientScopeStatus;
18
+ readonly resourceMetadataPath?: string;
18
19
  }
19
20
  export type InsufficientScopeStatus = 401 | 403;
20
21
  export type Scopes = readonly [Scope, ...Scope[]];
@@ -44,5 +45,11 @@ export declare function requireBearer(guard: Guard): MiddlewareHandler<BearerEnv
44
45
  * only learns which scope it needs from the request, as a Micropub POST does
45
46
  * from its action.
46
47
  */
47
- export declare function insufficientScope(c: Context<BearerEnv>, scopes: Scopes, status: InsufficientScopeStatus): Response;
48
+ export declare function insufficientScope(c: Context<BearerEnv>, scopes: Scopes, status: InsufficientScopeStatus, resourceMetadataPath?: string): Response;
49
+ /**
50
+ * A `WWW-Authenticate: Bearer` challenge with `params`, naming the protected
51
+ * resource metadata at `resourceMetadataPath` (RFC 9728), the site's own by
52
+ * default.
53
+ */
54
+ export declare function bearerChallenge(baseUrl: string, params: Readonly<Record<string, string>>, resourceMetadataPath?: string): string;
48
55
  //# sourceMappingURL=indieauth-bearer.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"indieauth-bearer.d.ts","sourceRoot":"","sources":["../../src/web/indieauth-bearer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAC;AAEvD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAE3C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAE7C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAErD,OAAO,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAEpE;;;;;;;GAOG;AACH,MAAM,WAAW,KAAK;IACpB,QAAQ,CAAC,QAAQ,EAAE,QAAQ,GAAG,sBAAsB,CAAC;IACrD,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,uBAAuB,CAAC,EAAE,uBAAuB,CAAC;CAC5D;AAED,MAAM,MAAM,uBAAuB,GAAG,GAAG,GAAG,GAAG,CAAC;AAEhD,MAAM,MAAM,MAAM,GAAG,SAAS,CAAC,KAAK,EAAE,GAAG,KAAK,EAAE,CAAC,CAAC;AAElD,+EAA+E;AAC/E,MAAM,WAAW,MAAM;IACrB,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC;IAC5B,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC;CACrB;AAED,MAAM,WAAW,SAAS;IACxB,SAAS,EAAE,UAAU,CAAC,WAAW,CAAC,GAAG;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;CACzD;AAED;;;;;;;;;GASG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,KAAK,GAAG,iBAAiB,CAAC,SAAS,CAAC,CAoCxE;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC/B,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,EACrB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,uBAAuB,GAC9B,QAAQ,CAMV"}
1
+ {"version":3,"file":"indieauth-bearer.d.ts","sourceRoot":"","sources":["../../src/web/indieauth-bearer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAC;AAEvD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAE3C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAE7C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAErD,OAAO,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAEpE;;;;;;;GAOG;AACH,MAAM,WAAW,KAAK;IACpB,QAAQ,CAAC,QAAQ,EAAE,QAAQ,GAAG,sBAAsB,CAAC;IACrD,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,uBAAuB,CAAC,EAAE,uBAAuB,CAAC;IAC3D,QAAQ,CAAC,oBAAoB,CAAC,EAAE,MAAM,CAAC;CACxC;AAED,MAAM,MAAM,uBAAuB,GAAG,GAAG,GAAG,GAAG,CAAC;AAEhD,MAAM,MAAM,MAAM,GAAG,SAAS,CAAC,KAAK,EAAE,GAAG,KAAK,EAAE,CAAC,CAAC;AAElD,+EAA+E;AAC/E,MAAM,WAAW,MAAM;IACrB,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC;IAC5B,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC;CACrB;AAED,MAAM,WAAW,SAAS;IACxB,SAAS,EAAE,UAAU,CAAC,WAAW,CAAC,GAAG;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;CACzD;AAED;;;;;;;;;GASG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,KAAK,GAAG,iBAAiB,CAAC,SAAS,CAAC,CA+CxE;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAC/B,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,EACrB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,uBAAuB,EAC/B,oBAAoB,CAAC,EAAE,MAAM,GAC5B,QAAQ,CAUV;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EACxC,oBAAoB,SAAmC,GACtD,MAAM,CAQR"}
@@ -14,18 +14,19 @@ import { findAccessToken, recordUse, verifyAccessToken } from '../indieauth/toke
14
14
  export function requireBearer(guard) {
15
15
  return async (c, next) => {
16
16
  const { config } = c.var;
17
+ const refuse = (status, error, description, params) => refusal(c, status, error, description, params, guard.resourceMetadataPath);
17
18
  const { tokens, unreadableBody } = await presentedTokens(c);
18
19
  if (tokens.size > 1) {
19
20
  const description = 'The header and the body carry different access tokens.';
20
- return refuse(c, 400, 'invalid_request', description, { error: 'invalid_request' });
21
+ return refuse(400, 'invalid_request', description, { error: 'invalid_request' });
21
22
  }
22
23
  const [presented] = tokens;
23
24
  if (presented === undefined && unreadableBody) {
24
25
  const description = 'The form body could not be read, so no access token was found.';
25
- return refuse(c, 400, 'invalid_request', description, { error: 'invalid_request' });
26
+ return refuse(400, 'invalid_request', description, { error: 'invalid_request' });
26
27
  }
27
28
  if (presented === undefined) {
28
- return refuse(c, 401, 'unauthorized', 'An access token is required.', {});
29
+ return refuse(401, 'unauthorized', 'An access token is required.', {});
29
30
  }
30
31
  const now = config.now();
31
32
  const token = guard.audience === 'authorization-server'
@@ -34,10 +35,10 @@ export function requireBearer(guard) {
34
35
  const user = token === undefined ? undefined : findUserById(config.dataDir, token.userId);
35
36
  if (token === undefined || user === undefined) {
36
37
  const description = 'The access token is unknown, expired, revoked or not for this resource.';
37
- return refuse(c, 401, 'invalid_token', description, { error: 'invalid_token' });
38
+ return refuse(401, 'invalid_token', description, { error: 'invalid_token' });
38
39
  }
39
40
  if (guard.scopes !== undefined && !guard.scopes.some((scope) => token.scopes.includes(scope))) {
40
- return insufficientScope(c, guard.scopes, guard.insufficientScopeStatus ?? 403);
41
+ return insufficientScope(c, guard.scopes, guard.insufficientScopeStatus ?? 403, guard.resourceMetadataPath);
41
42
  }
42
43
  await recordUse(config.dataDir, token, now);
43
44
  c.set('bearer', { token, user });
@@ -49,12 +50,23 @@ export function requireBearer(guard) {
49
50
  * only learns which scope it needs from the request, as a Micropub POST does
50
51
  * from its action.
51
52
  */
52
- export function insufficientScope(c, scopes, status) {
53
+ export function insufficientScope(c, scopes, status, resourceMetadataPath) {
53
54
  const description = `The access token was not granted the ${scopes.join(' or ')} scope.`;
54
- return refuse(c, status, 'insufficient_scope', description, {
55
- error: 'insufficient_scope',
56
- scope: scopes.join(' '),
57
- });
55
+ return refusal(c, status, 'insufficient_scope', description, { error: 'insufficient_scope', scope: scopes.join(' ') }, resourceMetadataPath);
56
+ }
57
+ /**
58
+ * A `WWW-Authenticate: Bearer` challenge with `params`, naming the protected
59
+ * resource metadata at `resourceMetadataPath` (RFC 9728), the site's own by
60
+ * default.
61
+ */
62
+ export function bearerChallenge(baseUrl, params, resourceMetadataPath = PROTECTED_RESOURCE_METADATA_PATH) {
63
+ const challenge = Object.entries({
64
+ ...params,
65
+ resource_metadata: `${baseUrl}${resourceMetadataPath}`,
66
+ })
67
+ .map(([name, value]) => `${name}="${value}"`)
68
+ .join(', ');
69
+ return `Bearer ${challenge}`;
58
70
  }
59
71
  /**
60
72
  * RFC 6750 section 3.1 says a client sends one token, but Quill sends the same
@@ -80,14 +92,8 @@ async function presentedTokens(c) {
80
92
  return { tokens, unreadableBody: true };
81
93
  }
82
94
  }
83
- function refuse(c, status, error, description, params) {
84
- const challenge = Object.entries({
85
- ...params,
86
- resource_metadata: `${c.var.config.baseUrl}${PROTECTED_RESOURCE_METADATA_PATH}`,
87
- })
88
- .map(([name, value]) => `${name}="${value}"`)
89
- .join(', ');
90
- c.header('www-authenticate', `Bearer ${challenge}`);
95
+ function refusal(c, status, error, description, params, resourceMetadataPath) {
96
+ c.header('www-authenticate', bearerChallenge(c.var.config.baseUrl, params, resourceMetadataPath));
91
97
  c.header('cache-control', 'no-store');
92
98
  return c.json({ error, error_description: description }, status);
93
99
  }