@geekity/cms 0.15.0 → 0.17.0

package/dist/indieauth/activity-log.js

@@ -0,0 +1,325 @@
+/**
+ * A short log of what apps sent to the IndieAuth and Micropub endpoints, and
+ * what they were answered (TASK-221), so a site owner can see why a client
+ * failed to sign in or to post without reading the client's source.
+ *
+ * One entry per request to the authorization endpoint (the request as it
+ * reaches the consent screen, and the profile redemption), the token
+ * endpoint, Micropub and its media endpoint. Each route records through one
+ * middleware placed in front of it, which sees the final status and reads the
+ * refusal out of the response itself: Micropub's and OAuth's JSON error
+ * bodies, or the `error` on an authorization redirect. A handler adds only
+ * what its response does not show, through {@link noteActivity}.
+ *
+ * Nothing secret is kept. No header is read, so no `Authorization` and no
+ * cookie; a field named in {@link SECRET_FIELDS} is kept as its name alone,
+ * at any depth of a JSON body; a file part is its name, type and size; and
+ * every value is cut short. No client address is stored.
+ *
+ * The file is bounded by count and by age, private to the site's user, and
+ * written after the response is decided without the response waiting on it:
+ * a write that fails is a warning on the console, never a different answer.
+ */
+import { randomUUID } from 'node:crypto';
+import path from 'node:path';
+import { findUserById } from '../admin/accounts.js';
+import { readFileIfPresentSync, updateFileAtomically, withFileLock } from '../files/atomic.js';
+/** The log, relative to `dataDir`. */
+export const ACTIVITY_LOG_FILE = 'indieauth-activity.json';
+/** Readable and writable by the site's own user only, like the tokens beside it. */
+export const ACTIVITY_LOG_MODE = 0o600;
+/** How many entries are kept, newest first. */
+export const ACTIVITY_LOG_LIMIT = 100;
+/** How long an entry is kept: fourteen days. */
+export const ACTIVITY_LOG_MAX_AGE_MS = 14 * 24 * 60 * 60 * 1000;
+/** The longest value kept, in characters, before it is cut and marked with an ellipsis. */
+const VALUE_LIMIT = 100;
+/** The most fields one entry lists. */
+const CARRIED_LIMIT = 40;
+/** Fields whose value is never kept, only that they were sent. */
+const SECRET_FIELDS = new Set([
+    'access_token',
+    'refresh_token',
+    'code',
+    'code_verifier',
+    'client_secret',
+    'password',
+    'cookie',
+]);
+/** Add to what this request's entry will say. */
+export function noteActivity(c, note) {
+    c.set('activityNote', { ...c.var.activityNote, ...note });
+}
+/** Whether an entry is a failure: refused with an error, or answered with an error status. */
+export function isFailure(entry) {
+    return entry.error !== undefined || entry.status >= 400;
+}
+/** Whether an entry is still inside the age limit at `now`. */
+export function isFresh(entry, now) {
+    return now.getTime() - Date.parse(entry.at) <= ACTIVITY_LOG_MAX_AGE_MS;
+}
+function logFile(dataDir) {
+    return path.join(dataDir, ACTIVITY_LOG_FILE);
+}
+function parseLog(text) {
+    if (text === undefined)
+        return [];
+    try {
+        const parsed = JSON.parse(text);
+        return Array.isArray(parsed.entries) ? parsed.entries : [];
+    }
+    catch {
+        return [];
+    }
+}
+/**
+ * Every entry, newest first. Read in the file's queue, so a read follows the
+ * writes queued before it and a screen shows the request that just finished.
+ */
+export async function readActivityLog(dataDir) {
+    const file = logFile(dataDir);
+    return await withFileLock(file, () => parseLog(readFileIfPresentSync(file)));
+}
+/** Settles once every entry already on its way to the file has landed, so closing never leaves one half written. */
+export async function activityLogSettled(dataDir) {
+    await withFileLock(logFile(dataDir), () => undefined);
+}
+async function appendEntry(dataDir, entry, now) {
+    await updateFileAtomically(logFile(dataDir), (current) => {
+        const kept = parseLog(current).filter((old) => isFresh(old, now));
+        const entries = [entry, ...kept].slice(0, ACTIVITY_LOG_LIMIT);
+        return `${JSON.stringify({ entries }, null, 2)}\n`;
+    }, { mode: ACTIVITY_LOG_MODE });
+}
+/**
+ * The middleware that records one entry per request to a route, after the
+ * route has answered. A failure to describe or to write is a warning; the
+ * write is not awaited, so the response never waits on the disk.
+ */
+function recordActivity(describe) {
+    return async (c, next) => {
+        await next();
+        const { dataDir, now } = c.var.config;
+        try {
+            const facts = await describe(c);
+            const refusal = c.var.activityNote?.refusal ?? (await refusalIn(c.res));
+            const at = now();
+            const entry = {
+                id: randomUUID(),
+                at: at.toISOString(),
+                method: c.req.method,
+                status: c.res.status,
+                ...facts,
+                error: refusal?.error,
+                errorDescription: refusal?.description,
+            };
+            appendEntry(dataDir, entry, at).catch((error) => {
+                warn(error);
+            });
+        }
+        catch (error) {
+            warn(error);
+        }
+    };
+}
+function warn(error) {
+    const reason = error instanceof Error ? error.message : String(error);
+    console.warn(`Could not write the IndieAuth and Micropub activity log: ${reason}`);
+}
+/**
+ * The OAuth or Micropub error a response carries: in a JSON error body, or in
+ * the query of a redirect back to the client. Only those two fields are read.
+ */
+async function refusalIn(response) {
+    const location = response.headers.get('location');
+    if (location !== null) {
+        const query = URL.parse(location, 'http://localhost/')?.searchParams;
+        const error = query?.get('error');
+        if (error != null)
+            return { error, description: query?.get('error_description') ?? undefined };
+    }
+    const type = response.headers.get('content-type') ?? '';
+    if (response.status < 400 || !/^application\/json\b/i.test(type))
+        return undefined;
+    const body = (await response.clone().json());
+    const error = body['error'];
+    const description = body['error_description'];
+    if (typeof error !== 'string')
+        return undefined;
+    return { error, description: typeof description === 'string' ? description : undefined };
+}
+/** `value`, cut to {@link VALUE_LIMIT} characters with an ellipsis when it was longer. */
+function short(value) {
+    return value.length > VALUE_LIMIT ? `${value.slice(0, VALUE_LIMIT)}…` : value;
+}
+/** A JSON value as one line of text, every secret field inside it replaced. */
+function summary(value) {
+    if (typeof value === 'string')
+        return value;
+    if (Array.isArray(value) && value.every((item) => typeof item === 'string')) {
+        return value.join(', ');
+    }
+    return (JSON.stringify(value, (key, inner) => SECRET_FIELDS.has(key) ? '[not recorded]' : inner) ?? '');
+}
+function field(name, value) {
+    if (SECRET_FIELDS.has(name))
+        return { name: short(name), redacted: true };
+    return { name: short(name), value: short(summary(value)) };
+}
+function fromParams(params, skip = []) {
+    return [...params]
+        .filter(([name]) => !skip.includes(name))
+        .map(([name, value]) => field(name, value))
+        .slice(0, CARRIED_LIMIT);
+}
+function fromForm(form) {
+    const fields = [];
+    for (const [name, value] of form) {
+        fields.push(typeof value === 'string' || SECRET_FIELDS.has(name)
+            ? field(name, value)
+            : {
+                name: short(name),
+                file: { filename: short(value.name), type: short(value.type), size: value.size },
+            });
+    }
+    return fields.slice(0, CARRIED_LIMIT);
+}
+function isRecord(value) {
+    return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+/** A Micropub JSON body's fields: its `properties` one by one, then everything else. */
+function fromJson(body) {
+    if (!isRecord(body))
+        return [];
+    const fields = [];
+    for (const [name, value] of Object.entries(body)) {
+        if (name === 'properties' && isRecord(value)) {
+            for (const [property, values] of Object.entries(value))
+                fields.push(field(property, values));
+        }
+        else {
+            fields.push(field(name, value));
+        }
+    }
+    return fields.slice(0, CARRIED_LIMIT);
+}
+/**
+ * The body the route already read, never one it left unread: an upload
+ * refused for its size before anything touched it stays untouched.
+ */
+async function readBody(c) {
+    if (Object.keys(c.req.bodyCache).length === 0)
+        return { kind: 'none' };
+    const type = c.req.header('content-type') ?? '';
+    if (/^(application\/x-www-form-urlencoded|multipart\/form-data)\b/i.test(type)) {
+        return { kind: 'form', form: await c.req.formData() };
+    }
+    if (/^application\/json\b/i.test(type)) {
+        try {
+            return { kind: 'json', value: await c.req.json() };
+        }
+        catch {
+            return { kind: 'none' };
+        }
+    }
+    return { kind: 'none' };
+}
+/** What the route's form body said `name` was, when it was text. */
+function formText(form, name) {
+    const value = form.get(name);
+    return typeof value === 'string' ? short(value) : undefined;
+}
+/** The authorization request, as the consent screen received it. */
+export const logAuthorizationRequest = recordActivity((c) => {
+    const params = new URL(c.req.url).searchParams;
+    const userId = c.var.session?.userId;
+    const user = userId == null ? undefined : findUserById(c.var.config.dataDir, userId);
+    const clientId = params.get('client_id');
+    return Promise.resolve({
+        endpoint: 'authorization',
+        action: 'request',
+        clientId: clientId === null ? undefined : short(clientId),
+        user: user?.username,
+        pkce: (params.get('code_challenge') ?? '') !== '' && params.get('code_challenge_method') === 'S256',
+        scopes: (params.get('scope') ?? '')
+            .split(' ')
+            .filter((scope) => scope !== '')
+            .map(short),
+        carried: fromParams(params),
+    });
+});
+/** A client redeeming its code at the authorization endpoint for the profile. */
+export const logAuthorizationRedemption = recordActivity(async (c) => {
+    const body = await readBody(c);
+    const form = body.kind === 'form' ? body.form : new FormData();
+    return {
+        endpoint: 'authorization',
+        action: 'redeem',
+        clientId: formText(form, 'client_id'),
+        user: c.var.activityNote?.user,
+        carried: fromForm(form),
+    };
+});
+/** A client redeeming a code or a refresh token at the token endpoint. */
+export const logTokenRequest = recordActivity(async (c) => {
+    const body = await readBody(c);
+    const form = body.kind === 'form' ? body.form : new FormData();
+    return {
+        endpoint: 'token',
+        action: formText(form, 'grant_type') ?? 'authorization_code',
+        clientId: formText(form, 'client_id'),
+        user: c.var.activityNote?.user,
+        scopes: c.var.activityNote?.scopes ?? [],
+        carried: fromForm(form),
+    };
+});
+/** Who a Micropub request acted as, once the bearer guard let it in. */
+function bearerFacts(c) {
+    const { bearer } = c.var;
+    return { clientId: bearer?.token.clientId, user: bearer?.user.username };
+}
+/** A query, or a create, update, delete or undelete, at the Micropub endpoint. */
+export const logMicropubRequest = recordActivity(async (c) => {
+    if (c.req.method === 'GET') {
+        const params = new URL(c.req.url).searchParams;
+        return {
+            endpoint: 'micropub',
+            action: short(`q=${params.get('q') ?? ''}`),
+            ...bearerFacts(c),
+            carried: fromParams(params, ['q']),
+        };
+    }
+    const body = await readBody(c);
+    const carried = body.kind === 'form' ? fromForm(body.form) : body.kind === 'json' ? fromJson(body.value) : [];
+    const named = body.kind === 'form'
+        ? body.form.get('action')
+        : body.kind === 'json' && isRecord(body.value)
+            ? body.value['action']
+            : undefined;
+    return {
+        endpoint: 'micropub',
+        action: typeof named === 'string' ? short(named) : 'create',
+        ...bearerFacts(c),
+        carried,
+    };
+});
+/** An upload, or `q=last`, at the media endpoint. */
+export const logMediaRequest = recordActivity(async (c) => {
+    if (c.req.method === 'GET') {
+        const params = new URL(c.req.url).searchParams;
+        return {
+            endpoint: 'media',
+            action: short(`q=${params.get('q') ?? ''}`),
+            ...bearerFacts(c),
+            carried: fromParams(params, ['q']),
+        };
+    }
+    const body = await readBody(c);
+    return {
+        endpoint: 'media',
+        action: 'upload',
+        ...bearerFacts(c),
+        carried: body.kind === 'form' ? fromForm(body.form) : [],
+    };
+});
+//# sourceMappingURL=activity-log.js.map

package/dist/indieauth/activity-log.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"activity-log.js","sourceRoot":"","sources":["../../src/indieauth/activity-log.ts"],"names":[],"mappings":"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"}

package/dist/indieauth/app-activity.d.ts

@@ -0,0 +1,14 @@
+/**
+ * Users > App activity (TASK-221): the recent requests apps made to the
+ * IndieAuth and Micropub endpoints, newest first, failures marked, and one
+ * request in full. Where a site owner looks when an app will not sign in or
+ * post. Any signed-in admin may read it, as with the other admin screens.
+ */
+import type { Hono } from 'hono';
+import type { AdminRender } from '../admin/documents.ts';
+import type { GeekityEnv } from '../env.ts';
+/** Register the list and the screen for one entry. */
+export declare function mountAppActivity(app: Hono<GeekityEnv>, options: {
+    render: AdminRender;
+}): void;
+//# sourceMappingURL=app-activity.d.ts.map

package/dist/indieauth/app-activity.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"app-activity.d.ts","sourceRoot":"","sources":["../../src/indieauth/app-activity.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAEjC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAKzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAe5C,sDAAsD;AACtD,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE;IAAE,MAAM,EAAE,WAAW,CAAA;CAAE,GAAG,IAAI,CAwC9F"}

package/dist/indieauth/app-activity.js

@@ -0,0 +1,106 @@
+import { formatInTimezone } from '../admin/formatting.js';
+import { readSiteSettings } from '../admin/settings.js';
+import { ADMIN_TEMPLATES } from '../admin/templates.js';
+import { APP_ACTIVITY_CHILD, APP_ACTIVITY_PATH } from '../admin/users.js';
+import { isFailure, isFresh, readActivityLog } from './activity-log.js';
+/** What each endpoint is called on the screen. */
+const ENDPOINT_LABELS = {
+    authorization: 'Authorization',
+    token: 'Token',
+    micropub: 'Micropub',
+    media: 'Media',
+};
+/** The query that narrows the list to failures. */
+const FAILURES_QUERY = 'show=failures';
+/** Register the list and the screen for one entry. */
+export function mountAppActivity(app, options) {
+    const { render } = options;
+    app.get(APP_ACTIVITY_PATH, async (c) => {
+        const { config } = c.var;
+        const timezone = readSiteSettings(config.contentDir).timezone;
+        const entries = await freshEntries(config.dataDir, config.now());
+        const failuresOnly = c.req.query('show') === 'failures';
+        const failures = entries.filter(isFailure);
+        return render(c, ADMIN_TEMPLATES.appActivity, {
+            section: 'users',
+            child: APP_ACTIVITY_CHILD,
+            tabs: [
+                { label: 'All', url: APP_ACTIVITY_PATH, count: entries.length, current: !failuresOnly },
+                {
+                    label: 'Failures',
+                    url: `${APP_ACTIVITY_PATH}?${FAILURES_QUERY}`,
+                    count: failures.length,
+                    current: failuresOnly,
+                },
+            ],
+            rows: (failuresOnly ? failures : entries).map((entry) => row(entry, timezone)),
+        });
+    });
+    app.get(`${APP_ACTIVITY_PATH}/:id`, async (c) => {
+        const { config } = c.var;
+        const entries = await freshEntries(config.dataDir, config.now());
+        const entry = entries.find((candidate) => candidate.id === c.req.param('id'));
+        if (entry === undefined)
+            return c.notFound();
+        const timezone = readSiteSettings(config.contentDir).timezone;
+        return render(c, ADMIN_TEMPLATES.appActivityEntry, {
+            section: 'users',
+            child: APP_ACTIVITY_CHILD,
+            listUrl: APP_ACTIVITY_PATH,
+            entry: row(entry, timezone),
+            details: details(entry),
+            carried: entry.carried.map(carriedRow),
+        });
+    });
+}
+async function freshEntries(dataDir, now) {
+    return (await readActivityLog(dataDir)).filter((entry) => isFresh(entry, now));
+}
+/** One entry as the list shows it. */
+function row(entry, timezone) {
+    const failed = isFailure(entry);
+    return {
+        url: `${APP_ACTIVITY_PATH}/${entry.id}`,
+        when: { iso: entry.at, text: formatInTimezone(entry.at, timezone) },
+        endpoint: ENDPOINT_LABELS[entry.endpoint],
+        action: entry.action,
+        app: entry.clientId,
+        user: entry.user,
+        status: entry.status,
+        failed,
+        error: entry.error,
+        errorDescription: entry.errorDescription,
+    };
+}
+/** What only the full view shows: the method, and what an endpoint adds of its own. */
+function details(entry) {
+    const lines = [{ label: 'Method', value: entry.method }];
+    if (entry.endpoint === 'authorization' && entry.action === 'request') {
+        lines.push({
+            label: 'PKCE',
+            value: entry.pkce ? 'An S256 code_challenge was sent' : 'No S256 code_challenge was sent',
+        }, { label: 'Scopes asked for', value: listed(entry.scopes) });
+    }
+    if (entry.endpoint === 'token') {
+        lines.push({ label: 'Scopes granted', value: listed(entry.scopes) });
+    }
+    return lines;
+}
+function listed(values) {
+    return values.length === 0 ? 'None' : values.join(' ');
+}
+/** One field the request carried, as its row in the full view says it. */
+function carriedRow(field) {
+    if ('file' in field) {
+        const { filename, type, size } = field.file;
+        return {
+            name: field.name,
+            value: `${filename} (${type === '' ? 'no type' : type}, ${String(size)} bytes)`,
+            note: true,
+        };
+    }
+    if ('redacted' in field)
+        return { name: field.name, value: 'Sent, not recorded', note: true };
+    return { name: field.name, value: field.value, note: false };
+}
+//# sourceMappingURL=app-activity.js.map

package/dist/indieauth/app-activity.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"app-activity.js","sourceRoot":"","sources":["../../src/indieauth/app-activity.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAE1E,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAGxE,kDAAkD;AAClD,MAAM,eAAe,GAA+C;IAClE,aAAa,EAAE,eAAe;IAC9B,KAAK,EAAE,OAAO;IACd,QAAQ,EAAE,UAAU;IACpB,KAAK,EAAE,OAAO;CACf,CAAC;AAEF,mDAAmD;AACnD,MAAM,cAAc,GAAG,eAAe,CAAC;AAEvC,sDAAsD;AACtD,MAAM,UAAU,gBAAgB,CAAC,GAAqB,EAAE,OAAgC;IACtF,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAE3B,GAAG,CAAC,GAAG,CAAC,iBAAiB,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;QACrC,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC;QACzB,MAAM,QAAQ,GAAG,gBAAgB,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC;QAC9D,MAAM,OAAO,GAAG,MAAM,YAAY,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC;QACjE,MAAM,YAAY,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,UAAU,CAAC;QACxD,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QAC3C,OAAO,MAAM,CAAC,CAAC,EAAE,eAAe,CAAC,WAAW,EAAE;YAC5C,OAAO,EAAE,OAAO;YAChB,KAAK,EAAE,kBAAkB;YACzB,IAAI,EAAE;gBACJ,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,iBAAiB,EAAE,KAAK,EAAE,OAAO,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC,YAAY,EAAE;gBACvF;oBACE,KAAK,EAAE,UAAU;oBACjB,GAAG,EAAE,GAAG,iBAAiB,IAAI,cAAc,EAAE;oBAC7C,KAAK,EAAE,QAAQ,CAAC,MAAM;oBACtB,OAAO,EAAE,YAAY;iBACtB;aACF;YACD,IAAI,EAAE,CAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;SAC/E,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,GAAG,CAAC,GAAG,iBAAiB,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;QAC9C,MAAM,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC;QACzB,MAAM,OAAO,GAAG,MAAM,YAAY,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC;QACjE,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,EAAE,KAAK,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;QAC9E,IAAI,KAAK,KAAK,SAAS;YAAE,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC;QAC7C,MAAM,QAAQ,GAAG,gBAAgB,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC;QAC9D,OAAO,MAAM,CAAC,CAAC,EAAE,eAAe,CAAC,gBAAgB,EAAE;YACjD,OAAO,EAAE,OAAO;YAChB,KAAK,EAAE,kBAAkB;YACzB,OAAO,EAAE,iBAAiB;YAC1B,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC;YAC3B,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC;YACvB,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC;SACvC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,YAAY,CAAC,OAAe,EAAE,GAAS;IACpD,OAAO,CAAC,MAAM,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;AACjF,CAAC;AAED,sCAAsC;AACtC,SAAS,GAAG,CAAC,KAAoB,EAAE,QAAgB;IACjD,MAAM,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;IAChC,OAAO;QACL,GAAG,EAAE,GAAG,iBAAiB,IAAI,KAAK,CAAC,EAAE,EAAE;QACvC,IAAI,EAAE,EAAE,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,IAAI,EAAE,gBAAgB,CAAC,KAAK,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE;QACnE,QAAQ,EAAE,eAAe,CAAC,KAAK,CAAC,QAAQ,CAAC;QACzC,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,GAAG,EAAE,KAAK,CAAC,QAAQ;QACnB,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,MAAM;QACN,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,gBAAgB,EAAE,KAAK,CAAC,gBAAgB;KACzC,CAAC;AACJ,CAAC;AAED,uFAAuF;AACvF,SAAS,OAAO,CAAC,KAAoB;IACnC,MAAM,KAAK,GAAG,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IACzD,IAAI,KAAK,CAAC,QAAQ,KAAK,eAAe,IAAI,KAAK,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QACrE,KAAK,CAAC,IAAI,CACR;YACE,KAAK,EAAE,MAAM;YACb,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,iCAAiC,CAAC,CAAC,CAAC,iCAAiC;SAC1F,EACD,EAAE,KAAK,EAAE,kBAAkB,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAC3D,CAAC;IACJ,CAAC;IACD,IAAI,KAAK,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QAC/B,KAAK,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACvE,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,MAAM,CAAC,MAAyB;IACvC,OAAO,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACzD,CAAC;AAED,0EAA0E;AAC1E,SAAS,UAAU,CAAC,KAAmB;IACrC,IAAI,MAAM,IAAI,KAAK,EAAE,CAAC;QACpB,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC;QAC5C,OAAO;YACL,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,KAAK,EAAE,GAAG,QAAQ,KAAK,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,CAAC,SAAS;YAC/E,IAAI,EAAE,IAAI;SACX,CAAC;IACJ,CAAC;IACD,IAAI,UAAU,IAAI,KAAK;QAAE,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,oBAAoB,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAC9F,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;AAC/D,CAAC"}

package/dist/indieauth/bearer.d.ts

@@ -1,4 +1,4 @@
-import type { MiddlewareHandler } from 'hono';
+import type { Context, MiddlewareHandler } from 'hono';
 import type { User } from '../admin/accounts.ts';
 import type { GeekityEnv } from '../env.ts';
 import type { Scope } from './request.ts';
@@ -36,4 +36,9 @@ export interface BearerEnv {
  * 9728), which is how an MCP client finds out where to sign in.
  */
 export declare function requireBearer(guard: Guard): MiddlewareHandler<BearerEnv>;
+/**
+ * The 403 for a token that lacks `scope`, for a route that only learns which
+ * scope it needs from the request, as a Micropub POST does from its action.
+ */
+export declare function insufficientScope(c: Context<BearerEnv>, scope: Scope): Response;
 //# sourceMappingURL=bearer.d.ts.map

package/dist/indieauth/bearer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bearer.d.ts","sourceRoot":"","sources":["../../src/indieauth/bearer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAW,iBAAiB,EAAE,MAAM,MAAM,CAAC;AAGvD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAE5C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAEzD;;;;;;;GAOG;AACH,MAAM,WAAW,KAAK;IACpB,QAAQ,CAAC,QAAQ,EAAE,QAAQ,GAAG,sBAAsB,CAAC;IACrD,oDAAoD;IACpD,QAAQ,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC;CACxB;AAED,+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;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,KAAK,GAAG,iBAAiB,CAAC,SAAS,CAAC,CA+BxE"}
+{"version":3,"file":"bearer.d.ts","sourceRoot":"","sources":["../../src/indieauth/bearer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAC;AAGvD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAE5C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAEzD;;;;;;;GAOG;AACH,MAAM,WAAW,KAAK;IACpB,QAAQ,CAAC,QAAQ,EAAE,QAAQ,GAAG,sBAAsB,CAAC;IACrD,oDAAoD;IACpD,QAAQ,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC;CACxB;AAED,+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;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,KAAK,GAAG,iBAAiB,CAAC,SAAS,CAAC,CAgCxE;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,OAAO,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,KAAK,GAAG,QAAQ,CAM/E"}

package/dist/indieauth/bearer.js

@@ -13,7 +13,12 @@ import { findAccessToken, recordUse, verifyAccessToken } from './tokens.js';
 export function requireBearer(guard) {
     return async (c, next) => {
         const { config } = c.var;
-        const presented = await presentedToken(c);
+        const tokens = new Set(await presentedTokens(c));
+        if (tokens.size > 1) {
+            const description = 'The header and the body carry different access tokens.';
+            return refuse(c, 400, 'invalid_request', description, { error: 'invalid_request' });
+        }
+        const [presented] = tokens;
         if (presented === undefined) {
             return refuse(c, 401, 'unauthorized', 'An access token is required.', {});
         }
@@ -27,27 +32,50 @@ export function requireBearer(guard) {
             return refuse(c, 401, 'invalid_token', description, { error: 'invalid_token' });
         }
         if (guard.scope !== undefined && !token.scopes.includes(guard.scope)) {
-            const description = `The access token was not granted the ${guard.scope} scope.`;
-            return refuse(c, 403, 'insufficient_scope', description, {
-                error: 'insufficient_scope',
-                scope: guard.scope,
-            });
+            return insufficientScope(c, guard.scope);
         }
         await recordUse(config.dataDir, token, now);
         c.set('bearer', { token, user });
         await next();
     };
 }
-async function presentedToken(c) {
+/**
+ * The 403 for a token that lacks `scope`, for a route that only learns which
+ * scope it needs from the request, as a Micropub POST does from its action.
+ */
+export function insufficientScope(c, scope) {
+    const description = `The access token was not granted the ${scope} scope.`;
+    return refuse(c, 403, 'insufficient_scope', description, {
+        error: 'insufficient_scope',
+        scope,
+    });
+}
+/**
+ * Every access token the request carries. RFC 6750 section 3.1 says a client
+ * sends one, but Quill sends the same token in the header and a form body for
+ * servers that drop the header, so only two different tokens are refused.
+ */
+async function presentedTokens(c) {
+    const tokens = [];
     const header = /^Bearer +(\S+)$/i.exec(c.req.header('authorization') ?? '');
-    if (header !== null)
-        return header[1];
+    if (header?.[1] !== undefined)
+        tokens.push(header[1]);
     const type = c.req.header('content-type') ?? '';
-    if (!/^(application\/x-www-form-urlencoded|multipart\/form-data)\b/i.test(type)) {
+    if (/^(application\/x-www-form-urlencoded|multipart\/form-data)\b/i.test(type)) {
+        const field = (await readBody(c))?.['access_token'];
+        if (typeof field === 'string' && field !== '')
+            tokens.push(field);
+    }
+    return tokens;
+}
+/** The parsed form body, or undefined when it cannot be read, which is the route's to refuse. */
+async function readBody(c) {
+    try {
+        return await c.req.parseBody();
+    }
+    catch {
         return undefined;
     }
-    const field = (await c.req.parseBody())['access_token'];
-    return typeof field === 'string' && field !== '' ? field : undefined;
 }
 function refuse(c, status, error, description, params) {
     const challenge = Object.entries({

package/dist/indieauth/bearer.js.map

@@ -1 +1 @@
-{"version":3,"file":"bearer.js","sourceRoot":"","sources":["../../src/indieauth/bearer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"bearer.js","sourceRoot":"","sources":["../../src/indieauth/bearer.ts"],"names":[],"mappings":"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"}

package/dist/indieauth/consent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"consent.d.ts","sourceRoot":"","sources":["../../src/indieauth/consent.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAW,IAAI,EAAE,MAAM,MAAM,CAAC;AAI1C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAIzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAQ5C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAE1C;;;GAGG;AACH,eAAO,MAAM,YAAY,6BAAsC,CAAC;AAEhE,mGAAmG;AACnG,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAOxD,CAAC;AAEF;;;;;;;;;;GAUG;AACH,wBAAgB,0BAA0B,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG,IAAI,CAwBtE;AAED,8EAA8E;AAC9E,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE;IAAE,MAAM,EAAE,WAAW,CAAA;CAAE,GAAG,IAAI,CA6GhG"}
+{"version":3,"file":"consent.d.ts","sourceRoot":"","sources":["../../src/indieauth/consent.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAW,IAAI,EAAE,MAAM,MAAM,CAAC;AAI1C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAIzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAa5C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAE1C;;;GAGG;AACH,eAAO,MAAM,YAAY,6BAAsC,CAAC;AAEhE,mGAAmG;AACnG,eAAO,MAAM,YAAY,EAAE,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAOxD,CAAC;AAEF;;;;;;;;;;GAUG;AACH,wBAAgB,0BAA0B,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG,IAAI,CAyBtE;AAED,8EAA8E;AAC9E,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE;IAAE,MAAM,EAAE,WAAW,CAAA;CAAE,GAAG,IAAI,CA8GhG"}

package/dist/indieauth/consent.js

@@ -3,6 +3,7 @@ import { ADMIN_PREFIX } from '../admin/session.js';
 import { effectiveBaseUrl, readSiteSettings } from '../admin/settings.js';
 import { ADMIN_TEMPLATES } from '../admin/templates.js';
 import { isPrivateHost } from '../webmention/public-address.js';
+import { logAuthorizationRedemption, logAuthorizationRequest, noteActivity, } from './activity-log.js';
 import { fetchClientInformation, fetchClientLogo } from './client.js';
 import { AUTHORIZATION_PATH, authorizationServerMetadata } from './discovery.js';
 import { meForSignIn } from './identity.js';
@@ -35,7 +36,7 @@ export const SCOPE_LABELS = {
  */
 export function mountAuthorizationEndpoint(app) {
     app.get(AUTHORIZATION_PATH, (c) => c.redirect(`${CONSENT_PATH}${new URL(c.req.url).search}`, 302));
-    app.post(AUTHORIZATION_PATH, async (c) => {
+    app.post(AUTHORIZATION_PATH, logAuthorizationRedemption, async (c) => {
         c.header('cache-control', 'no-store');
         const { config } = c.var;
         const form = redemptionForm(await c.req.parseBody());
@@ -48,6 +49,7 @@ export function mountAuthorizationEndpoint(app) {
         if (user === undefined) {
             return c.json({ error: 'invalid_grant', error_description: 'The person who approved this is gone.' }, 400);
         }
+        noteActivity(c, { user: user.username });
         const baseUrl = effectiveBaseUrl(config, readSiteSettings(config.contentDir));
         return c.json(profileResponse(grant, user, baseUrl));
     });
@@ -57,9 +59,10 @@ export function mountConsentScreen(app, options) {
     const { render } = options;
     function refuse(c, message) {
         c.status(400);
+        noteActivity(c, { refusal: { error: 'invalid_request', description: message } });
         return render(c, ADMIN_TEMPLATES.indieauthRefused, { message });
     }
-    app.get(CONSENT_PATH, async (c) => {
+    app.get(CONSENT_PATH, logAuthorizationRequest, async (c) => {
         const { config } = c.var;
         const user = signedInUser(c);
         if (user === undefined)