source: Klonkt/src/routes/activitypub.js@ eb36688

main
Last change on this file since eb36688 was eb36688, checked in by Robin Genis <roboburr@…>, 6 weeks ago

FEP-e232 emit: Klonkt bewaart + serveert object-link (quote) tags op de C2S inbox

De client toonde nog geen quotes omdat Klonkt de Link-tags helemaal niet
doorgaf: de inbox-read serveerde alleen de FEP-9098 Emoji-tags (uit emoji_json),
al het andere werd weggegooid. Nu bewaren we ook de FEP-e232 Link-tags (quotes /
inline object-referenties) en serveren we ze mee, precies gespiegeld op de
emoji-aanpak.

Een Link telt als object-link als de mediaType een AP-object markeert: het
AS2-geprofileerde application/ld+json, of application/activity+json als
gelijkwaardige. Kale hyperlinks (text/html) en Mentions blijven eruit.

De inbox-read combineert nu Emoji- en Link-tags in een enkele tag-array (weg
als de note geen van beide heeft). De self-heal gaat naar v9 zodat bestaande
timeline-rijen de Link-tags eenmalig alsnog oppikken.

Changed files:
src/config/database.js

  • ap_timeline.link_json kolom (FEP-e232 object-link tags)

src/services/ActivityPubService.js

  • extractObjectLinkTags() + timelineObjectLinks() (spiegel van de emoji-functies)
  • link_json opslaan bij inbound Create en bij outbox-backfill
  • self-heal v8 -> v9: link_json meenemen (select, change-detect, update)
  • timelineObjectLinks in de default-export

src/routes/activitypub.js

  • inbox-read serveert Emoji- + Link-tags samen als tag

New file:
test/object-links.test.js

  • extractObjectLinkTags houdt AS2-ld+json en activity+json Links, laat text/html en Mention vallen; round-trip via timelineObjectLinks

remarks: 175 tests groen (was 171).

-robo
Co-Authored-By: Claude Opus 4.8 <noreply@…>

  • Property mode set to 100644
File size: 19.9 KB
Line 
1/**
2 * ActivityPub — public endpoints (Phase 1: discover + fetch).
3 *
4 * GET /.well-known/webfinger?resource=acct:<slug>@<host>
5 * GET /ap/users/:slug actor (content-negotiated: AP-JSON vs redirect to HTML profile)
6 * GET /ap/users/:slug/outbox OrderedCollection of Create(Note)
7 * GET /ap/users/:slug/followers count-only OrderedCollection
8 * GET /ap/users/:slug/featured pinned posts (Mastodon "Featured" tab)
9 * GET /ap/notes/:id a single Note
10 * POST /ap/users/:slug/inbox, /ap/inbox → 202 (Follow/Accept + signature verify: next step)
11 *
12 * Mounted before resolveSite; resolves the site by slug itself.
13 */
14import express from 'express';
15import { readFileSync } from 'fs';
16import db from '../config/database.js';
17import AP from '../services/ActivityPubService.js';
18import { apReadLimiter, apInboxLimiter } from '../middleware/rate-limit.js';
19import { apEnabled } from '../services/SettingsService.js';
20import OAuth from '../services/OAuthService.js';
21import * as Guardianship from '../services/guardianship/index.js';
22import multer from 'multer';
23import path from 'path';
24import fs from 'fs';
25import { fileURLToPath } from 'url';
26import { randomUUID } from 'crypto';
27
28const router = express.Router();
29// The whole fediverse layer can be turned off (solo "no federation" mode):
30// then /ap/*, WebFinger and NodeInfo are simply gone — the site is undiscoverable
31// and unfederatable. CRITICAL: this router is mounted at root (app.use(apRoutes)), so a
32// blanket res.status(404) here ran for EVERY request and 404'd the whole site when AP was
33// off. Use next('router') to SKIP this router entirely and let the normal routes handle it
34// (the /ap/* paths then fall through to the app's normal 404, which is correct).
35router.use((req, res, next) => { if (!apEnabled()) return next('router'); next(); });
36// Generous per-IP baseline over all /ap/* (reads). The inbox POST gets an
37// additional, tighter cap inline (it triggers outbound fetches).
38router.use(apReadLimiter);
39let _ver = '1.0.0';
40try { _ver = JSON.parse(readFileSync(new URL('../../package.json', import.meta.url))).version || _ver; } catch { /* keep default */ }
41
42const baseUrl = (req) => (process.env.PUBLIC_BASE_URL || `${req.protocol}://${req.get('host')}`).replace(/\/+$/, '');
43const hostOf = (req) => { try { return new URL(baseUrl(req)).host; } catch { return req.get('host'); } };
44const publicSite = (slug) => db.prepare('SELECT * FROM sites WHERE slug = ? AND (is_public IS NULL OR is_public = 1)').get(slug);
45const primarySlug = () => { const r = db.prepare('SELECT slug FROM sites WHERE is_primary = 1').get(); return r && r.slug; };
46
47// ── WebFinger ─────────────────────────────────────────────────────
48router.get('/.well-known/webfinger', (req, res) => {
49 const m = String(req.query.resource || '').match(/^acct:([^@]+)@(.+)$/i);
50 if (!m) return res.status(400).type('text/plain').send('bad resource');
51 const site = publicSite(m[1]);
52 if (!site) return res.status(404).end();
53 res.type('application/jrd+json; charset=utf-8');
54 res.set('Cache-Control', 'public, max-age=300');
55 const actorUri = AP.actorId(baseUrl(req), site.slug);
56 const profileUrl = baseUrl(req) + (site.slug === primarySlug() ? '/' : `/user/${encodeURIComponent(site.slug)}`);
57 res.send(JSON.stringify({
58 subject: `acct:${site.slug}@${hostOf(req)}`,
59 aliases: [actorUri, profileUrl],
60 links: [
61 { rel: 'self', type: 'application/activity+json', href: actorUri },
62 { rel: 'http://webfinger.net/rel/profile-page', type: 'text/html', href: profileUrl },
63 ],
64 }));
65});
66
67// ── Actor ─────────────────────────────────────────────────────────
68router.get('/ap/users/:slug', (req, res) => {
69 const site = publicSite(req.params.slug);
70 if (!site) return res.status(404).end();
71 if (!AP.apWants(req)) {
72 // A browser hit the AP actor URL → send them to the human profile.
73 const human = site.slug === primarySlug() ? '/' : `/user/${encodeURIComponent(site.slug)}`;
74 return res.redirect(302, baseUrl(req) + human);
75 }
76 site.primary_slug = primarySlug();
77 AP.sendAP(res, AP.buildActor(baseUrl(req), site));
78});
79
80// ── Outbox ────────────────────────────────────────────────────────
81router.get('/ap/users/:slug/outbox', async (req, res) => {
82 const site = publicSite(req.params.slug);
83 if (!site) return res.status(404).end();
84 // Authorized fetch (FEP-633c §5.3 note): a committed guardian doing a SIGNED
85 // GET may read the ward's fan-only history too, without appearing as a
86 // follower. Unsigned / non-guardian callers get the public collection only.
87 let asGuardian = false;
88 if (req.headers['signature']) {
89 const verified = await AP.verifyRequest(req).catch(() => null);
90 asGuardian = !!(verified && AP.isWardGuardian(req.params.slug, verified.id));
91 }
92 const fanClause = asGuardian ? '' : "AND (fan_only IS NULL OR fan_only = 0)";
93 const posts = db.prepare(
94 `SELECT id, slug, title, content, cover_image_url, cover_video_url, nsfw, content_warning, published_at, created_at
95 FROM posts WHERE site_id = ? AND status = 'published' ${fanClause}
96 ORDER BY COALESCE(published_at, created_at) DESC LIMIT 20`
97 ).all(site.id);
98 AP.sendAP(res, AP.buildOutbox(baseUrl(req), site, posts), asGuardian ? 'private, no-store' : undefined);
99});
100
101// ── Blocked collection (owner only, AP §5.6) ──────────────────────
102// The server blocklist is the source of truth for Shaer's "in Orbit":
103// clients read it here instead of keeping their own state. Actor-kind
104// blocks only (domain blocks are instance policy, not an Orbit member).
105router.get('/ap/users/:slug/blocked', (req, res) => {
106 const auth = OAuth.verifyBearer(req.headers.authorization);
107 if (!auth || auth.site.slug !== req.params.slug) return res.status(403).end();
108 const base = baseUrl(req);
109 const items = AP.listBlocks(auth.site.slug)
110 .filter((b) => b.kind === 'actor')
111 .map((b) => b.target);
112 AP.sendAP(res, {
113 '@context': AP.AP_CONTEXT,
114 id: `${base}/ap/users/${auth.site.slug}/blocked`,
115 type: 'OrderedCollection',
116 totalItems: items.length,
117 orderedItems: items,
118 });
119});
120
121// ── Guardian queues (owner only, FEP-633c, shaer:queues) ──────────
122// The dashboard collections the Shaer clients read: pending adoption offers,
123// gated follows (empty in Klonkt for now) and the guardian's wards. Same
124// contract as the Shaer test daemon.
125function queueRoute(name, build) {
126 router.get(`/ap/users/:slug/queues/${name}`, (req, res) => {
127 const auth = OAuth.verifyBearer(req.headers.authorization);
128 if (!auth || auth.site.slug !== req.params.slug) return res.status(403).end();
129 const base = baseUrl(req);
130 const me = `${base}/ap/users/${auth.site.slug}`;
131 AP.sendAP(res, { '@context': AP.AP_CONTEXT, ...build(`${me}/queues/${name}`, auth.site.slug, me) });
132 });
133}
134queueRoute('offers', (id, slug, me) => Guardianship.offersCollection(id, slug, me));
135queueRoute('follows', (id) => Guardianship.followsCollection(id));
136queueRoute('wards', (id, slug) => Guardianship.wardsCollection(id, slug));
137
138// ── Inbox read (owner only, AP C2S) ───────────────────────────────
139// GET on the inbox is part of ActivityPub C2S: the account owner (a bearer
140// scoped to this site) reads recent inbound posts (the timeline: accounts
141// they follow) as Create(Note) items, so an app (Shaer) can build a unified
142// feed. Anyone else gets 403; the inbox stays write-only for the public.
143router.get('/ap/users/:slug/inbox', (req, res) => {
144 const auth = OAuth.verifyBearer(req.headers.authorization);
145 if (!auth || auth.site.slug !== req.params.slug) return res.status(403).end();
146 const base = baseUrl(req);
147 const items = AP.getTimeline(auth.site.slug, 60).map((t) => ({
148 id: `${t.id}#create`,
149 type: 'Create',
150 actor: t.author_uri,
151 published: t.published || t.created_at || undefined,
152 object: {
153 id: t.id,
154 type: 'Note',
155 attributedTo: t.author_uri,
156 content: t.content,
157 url: t.url || undefined,
158 published: t.published || t.created_at || undefined,
159 sensitive: !!t.nsfw,
160 summary: t.cw || undefined,
161 // Friends' media travels along (media_json → AS2 attachment), so the
162 // client renders their images/audio like own outbox posts.
163 attachment: AP.timelineAttachments(t.media_json),
164 // The note's preserved tags, so the client can render them: FEP-9098
165 // Emoji tags (:shortcode: → image) and FEP-e232 Link tags (quotes /
166 // inline object references). Combined into one `tag` array; omitted
167 // when the note has neither.
168 tag: (() => {
169 const tags = [...(AP.timelineEmojis(t.emoji_json) || []), ...(AP.timelineObjectLinks(t.link_json) || [])];
170 return tags.length ? tags : undefined;
171 })(),
172 },
173 }));
174 AP.sendAP(res, {
175 '@context': AP.AP_CONTEXT,
176 id: `${base}/ap/users/${auth.site.slug}/inbox`,
177 type: 'OrderedCollection',
178 totalItems: items.length,
179 orderedItems: items,
180 });
181});
182
183// ── uploadMedia (owner only, AP C2S) ──────────────────────────────
184// The actor advertises endpoints.uploadMedia; this implements it. A bearer
185// scoped to this site uploads one image/audio/video (multipart field "file",
186// AP convention) into the same store the reply editor uses, and gets back
187// { url, mediaType, name } to attach on a note (e.g. the help-buoy capture).
188const AP_MEDIA_DIR = path.resolve(
189 process.env.REPLY_MEDIA_PATH ||
190 path.join(path.dirname(fileURLToPath(import.meta.url)), '..', '..', 'storage', 'media', 'reply-media')
191);
192fs.mkdirSync(AP_MEDIA_DIR, { recursive: true });
193const AP_MEDIA_EXT = new Set(['.jpg', '.jpeg', '.png', '.webp', '.gif', '.mp3', '.m4a', '.ogg', '.opus', '.flac', '.wav', '.mp4', '.webm', '.mov']);
194const apMediaUpload = multer({
195 storage: multer.diskStorage({
196 destination: (req, file, cb) => cb(null, AP_MEDIA_DIR),
197 filename: (req, file, cb) => cb(null, `${randomUUID()}${path.extname(file.originalname || '').toLowerCase()}`),
198 }),
199 limits: { fileSize: 32 * 1024 * 1024 },
200 fileFilter: (req, file, cb) => {
201 const ext = path.extname(file.originalname || '').toLowerCase();
202 if (!AP_MEDIA_EXT.has(ext)) return cb(new Error('Media must be an image, audio or video file'));
203 cb(null, true);
204 },
205});
206router.post('/ap/users/:slug/uploadMedia', (req, res) => {
207 const auth = OAuth.verifyBearer(req.headers.authorization);
208 if (!auth || auth.site.slug !== req.params.slug) return res.status(403).end();
209 apMediaUpload.single('file')(req, res, (err) => {
210 if (err) return res.status(400).json({ error: err.message });
211 if (!req.file) return res.status(400).json({ error: 'No file' });
212 const mime = String(req.file.mimetype || '');
213 if (!/^(image|audio|video)\//.test(mime)) {
214 try { fs.unlinkSync(req.file.path); } catch { /* best effort */ }
215 return res.status(400).json({ error: 'Media must be an image, audio or video file' });
216 }
217 res.status(201).json({
218 url: '/media/reply-media/' + req.file.filename,
219 mediaType: mime,
220 name: String(req.file.originalname || '').slice(0, 120),
221 });
222 });
223});
224
225// ── Followers (count-only public, full for the owner) ─────────────
226// A C2S bearer scoped to this site (the account owner) gets the real actor
227// URIs so their own client can build a friends list; everyone else gets the
228// count only (privacy).
229// FEP-9876: enrichment is opt-in via `Prefer: return=representation` (RFC 7240).
230// Returns true and sets the response headers when the owner asked for it.
231function wantsEnriched(req, res) {
232 res.set('Vary', 'Prefer'); // enriched and bare are two representations
233 if (AP.prefersEnriched(req.get('Prefer'))) {
234 res.set('Preference-Applied', 'return=representation');
235 return true;
236 }
237 return false;
238}
239
240router.get('/ap/users/:slug/followers', (req, res) => {
241 const auth = OAuth.verifyBearer(req.headers.authorization);
242 const owner = auth && auth.site.slug === req.params.slug;
243 const site = owner ? auth.site : publicSite(req.params.slug);
244 if (!site) return res.status(404).end();
245 if (owner) {
246 const uris = db.prepare('SELECT actor_uri FROM ap_followers WHERE slug = ? ORDER BY created_at').all(site.slug).map((r) => r.actor_uri);
247 // Default = bare references; enrich only when the client asks (FEP-9876).
248 const items = wantsEnriched(req, res) ? uris.map((u) => AP.buildActorRef(site.slug, u)) : uris;
249 return AP.sendAP(res, AP.buildFollowers(baseUrl(req), site, items.length, items));
250 }
251 const n = db.prepare('SELECT COUNT(*) n FROM ap_followers WHERE slug = ?').get(site.slug).n;
252 AP.sendAP(res, AP.buildFollowers(baseUrl(req), site, n));
253});
254
255// ── Following (count-only public, full for the owner) ─────────────
256router.get('/ap/users/:slug/following', (req, res) => {
257 const auth = OAuth.verifyBearer(req.headers.authorization);
258 const owner = auth && auth.site.slug === req.params.slug;
259 const site = owner ? auth.site : publicSite(req.params.slug);
260 if (!site) return res.status(404).end();
261 if (owner) {
262 const enrich = wantsEnriched(req, res); // FEP-9876 opt-in
263 let items = [];
264 try {
265 const uris = db.prepare("SELECT actor_uri FROM ap_following WHERE slug = ? AND status = 'accepted' ORDER BY created_at").all(site.slug).map((r) => r.actor_uri);
266 items = enrich ? uris.map((u) => AP.buildActorRef(site.slug, u)) : uris;
267 } catch { /* table may not exist */ }
268 return AP.sendAP(res, AP.buildFollowing(baseUrl(req), site, items.length, items));
269 }
270 let n = 0;
271 try { n = db.prepare("SELECT COUNT(*) n FROM ap_following WHERE slug = ? AND status = 'accepted'").get(site.slug).n; } catch { /* table may not exist */ }
272 AP.sendAP(res, AP.buildFollowing(baseUrl(req), site, n));
273});
274
275// ── Featured (pinned posts → Mastodon "Featured" tab) ─────────────
276router.get('/ap/users/:slug/featured', (req, res) => {
277 const site = publicSite(req.params.slug);
278 if (!site) return res.status(404).end();
279 // NB: Mastodon DISPLAYS the featured collection in REVERSE (pins shown
280 // last-processed-first). So we emit it reversed (lowest pin priority first,
281 // rank 1 last) → Mastodon flips it back to pin-rank ascending on the profile.
282 const posts = db.prepare(
283 `SELECT id, slug, title, content, cover_image_url, cover_video_url, nsfw, content_warning, published_at, created_at
284 FROM posts WHERE site_id = ? AND status = 'published' AND (fan_only IS NULL OR fan_only = 0)
285 AND pinned IS NOT NULL AND pinned > 0
286 ORDER BY pinned DESC, COALESCE(published_at, created_at) ASC LIMIT 20`
287 ).all(site.id);
288 AP.sendAP(res, AP.buildFeatured(baseUrl(req), site, posts));
289});
290
291// ── Note ──────────────────────────────────────────────────────────
292router.get('/ap/notes/:id', (req, res) => {
293 const post = db.prepare(
294 "SELECT * FROM posts WHERE id = ? AND status = 'published' AND (fan_only IS NULL OR fan_only = 0)"
295 ).get(req.params.id);
296 if (!post) {
297 // Could be one of OUR outbound replies (ap_outbox), not a post.
298 const note = AP.getOutboxNote(baseUrl(req), req.params.id);
299 if (!note) return res.status(404).end();
300 if (!AP.apWants(req)) {
301 // A browser hit a reply's AP URL → send them to the source it replies to
302 // (where the post + its reactions live), falling back to the site home.
303 const src = (typeof note.inReplyTo === 'string' && /^https?:\/\//i.test(note.inReplyTo))
304 ? note.inReplyTo : (baseUrl(req) + '/');
305 return res.redirect(302, src);
306 }
307 return AP.sendAP(res, { '@context': AP.AP_CONTEXT, ...note });
308 }
309 const site = db.prepare('SELECT * FROM sites WHERE id = ?').get(post.site_id);
310 if (!site) return res.status(404).end();
311 const note = AP.buildNote(baseUrl(req), site, post);
312 if (!AP.apWants(req)) {
313 // A browser hit a post's AP note URL → send them to the human post page
314 // (which shows the post + its "from the fediverse" reactions).
315 return res.redirect(302, note.url || (baseUrl(req) + '/'));
316 }
317 AP.sendAP(res, { '@context': AP.AP_CONTEXT, ...note });
318});
319
320// ── Replies collection ── lets remote servers fetch a post's whole thread.
321router.get('/ap/notes/:id/replies', (req, res) => {
322 const base = baseUrl(req);
323 const items = AP.getReplyUris(base, req.params.id);
324 AP.sendAP(res, {
325 '@context': AP.AP_CONTEXT,
326 id: `${base}/ap/notes/${req.params.id}/replies`,
327 type: 'OrderedCollection',
328 totalItems: items.length,
329 orderedItems: items,
330 });
331});
332
333// ── NodeInfo ── standard instance metadata so fediverse tools recognise Klonkt.
334router.get('/.well-known/nodeinfo', (req, res) => {
335 res.type('application/json');
336 res.set('Cache-Control', 'public, max-age=3600');
337 res.send(JSON.stringify({ links: [{ rel: 'http://nodeinfo.diaspora.software/ns/schema/2.1', href: `${baseUrl(req)}/nodeinfo/2.1` }] }));
338});
339router.get('/nodeinfo/2.1', (req, res) => {
340 let users = 0; let posts = 0;
341 // "users" = public AP actors (sites), not the admin/member account rows.
342 try { users = db.prepare('SELECT COUNT(*) c FROM sites WHERE (is_public IS NULL OR is_public = 1)').get().c; } catch { /* */ }
343 try { posts = db.prepare("SELECT COUNT(*) c FROM posts WHERE status = 'published'").get().c; } catch { /* */ }
344 res.type('application/json; charset=utf-8');
345 res.set('Cache-Control', 'public, max-age=600');
346 res.send(JSON.stringify({
347 version: '2.1',
348 software: { name: 'klonkt', version: _ver, repository: 'https://github.com/roboburr/klonkt' },
349 protocols: ['activitypub'],
350 services: { inbound: [], outbound: [] },
351 openRegistrations: false,
352 usage: { users: { total: users }, localPosts: posts },
353 metadata: { nodeName: 'Klonkt' },
354 }));
355});
356
357// ── Inbox — Follow→Accept, Undo Follow (best-effort signature verify) ──
358const apJson = express.json({
359 type: ['application/activity+json', 'application/ld+json', 'application/json'],
360 limit: '1mb',
361 verify: (req, _res, buf) => { req.rawBody = buf; }, // raw body for digest verification
362});
363router.post(['/ap/users/:slug/inbox', '/ap/inbox'], apInboxLimiter, apJson, async (req, res) => {
364 try { return res.status(await AP.handleInbox(req, req.params.slug || null) || 202).end(); }
365 catch (e) { console.warn('[AP inbox] error:', e.message); return res.status(202).end(); }
366});
367
368// ── Outbox POST: ActivityPub Client-to-Server ─────────────────────
369// A bearer-authenticated client (Shaer) POSTs an activity; we translate it onto
370// the normal delivery machinery. The token is scoped to one user+site (OAuth
371// consent), so it must match the slug in the URL. (Declared after apJson, which
372// this shares with the inbox handler.)
373router.post('/ap/users/:slug/outbox', apInboxLimiter, apJson, async (req, res) => {
374 const auth = OAuth.verifyBearer(req.headers.authorization);
375 if (!auth) { res.set('WWW-Authenticate', 'Bearer'); return res.status(401).json({ error: 'invalid_token' }); }
376 if (auth.site.slug !== req.params.slug) return res.status(403).json({ error: 'wrong_site', detail: 'token is scoped to a different site' });
377 if (auth.user.readonly) return res.status(403).json({ error: 'read_only_account' });
378
379 const out = await AP.ingestOutboxActivity(auth.site, auth.user, req.body);
380 if (out.error) return res.status(out.status || 400).json({ error: out.error, detail: out.detail });
381 // 201 Created → Location header (AP spec); 202 Accepted for side-effect verbs.
382 if (out.status === 201 && out.url) res.set('Location', out.url);
383 return res.status(out.status || 202).json({ ok: true, id: out.id, url: out.url });
384});
385
386export default router;
Note: See TracBrowser for help on using the repository browser.