Changeset f63cbc2 in Klonkt for src/routes

Timestamp:

06/16/2026 06:33:38 AM (3 months ago)

Author:

roboburr <roboburr@…>

Branches:

main

Children:

4fee228

Parents:

1b4d5dd

Message:

Circles: protocol version enforced via signature binding (update enforcement)

KLONKT_PROTO is now part of the signed basis (signingInput:
"klonkt/proto/N\n"+body). An instance on a different proto cannot verify
the signed outbox and vice versa → staying up to date is cryptographically
enforced, not a patchable check. Both sides verify the proto
(actor.klonkt.proto + Klonkt-Proto header → 426); too-old/too-new sources
are excluded with status 'outdated' + a clear message. Couple security to
every proto bump. Proto starts at 2; roll out in lockstep.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@…>

File:

• src/routes/federation.js (modified) (3 diffs)

src/routes/federation.js

@@ -8 +8 @@
 
 import express from 'express';
-import { buildActor, buildOutbox, signBody } from '../services/CircleFederation.js';
+import { buildActor, buildOutbox, signBody, KLONKT_PROTO, MIN_PROTO } from '../services/CircleFederation.js';
 import { getTenancy } from '../services/SettingsService.js';
 
@@ -18 +18 @@
 }
 
+// De proto die de consument zegt te draaien (uit z'n request-header), of 0.
+function consumerProto(req) {
+  return parseInt(req.get('Klonkt-Proto') || '0', 10) || 0;
+}
+
 router.get('/.klonkt/actor.json', (req, res) => {
   // Cirkels = solo-naar-solo; hubs publiceren geen federatie-actor.
   if (getTenancy() === 'hub') return res.status(404).type('text/plain').send('Niet beschikbaar in hub-modus');
+  // De actor serveren we ALTIJD (ook aan oudere consumenten) zodat zij onze proto
+  // kunnen lezen en een nette "update vereist"-melding kunnen tonen.
   const body = JSON.stringify(buildActor(baseUrl(req)), null, 2);
   res.type('application/activity+json; charset=utf-8');
+  res.set('Klonkt-Proto', String(KLONKT_PROTO));
   res.set('Cache-Control', 'public, max-age=300');
   res.send(body);
@@ -29 +37 @@
 router.get('/.klonkt/outbox.json', (req, res) => {
   if (getTenancy() === 'hub') return res.status(404).type('text/plain').send('Niet beschikbaar in hub-modus');
+  res.set('Klonkt-Proto', String(KLONKT_PROTO));
+  // Te-oude consument? Weiger met 426 Upgrade Required (de crypto-binding sluit 'm
+  // sowieso al uit; dit geeft een expliciet, leesbaar signaal). proto 0 = geen
+  // header (bv. een browser/curl) → toestaan, die verifieert toch niet.
+  const cp = consumerProto(req);
+  if (cp && cp < MIN_PROTO) {
+    return res.status(426).type('text/plain')
+      .send(`Upgrade Required: deze cirkel draait proto ${KLONKT_PROTO}; jouw Klonkt (proto ${cp}) is te oud.`);
+  }
   const body = JSON.stringify(buildOutbox(baseUrl(req)), null, 2);
   res.type('application/activity+json; charset=utf-8');