@rmdes/indiekit-endpoint-activitypub 3.8.2 → 3.8.4

package/index.js

@@ -5,6 +5,11 @@ import { createMastodonRouter } from "./lib/mastodon/router.js";
 import { setLocalIdentity } from "./lib/mastodon/entities/status.js";
 import { initRedisCache } from "./lib/redis-cache.js";
 import { lookupWithSecurity } from "./lib/lookup-helpers.js";
+import {
+  needsDirectFollow,
+  sendDirectFollow,
+  sendDirectUnfollow,
+} from "./lib/direct-follow.js";
 import {
   createFedifyMiddleware,
 } from "./lib/federation-bridge.js";
@@ -231,13 +236,6 @@ export default class ActivityPubEndpoint {
       // authenticated `routes` getter, not the federation layer.
       if (req.path.startsWith("/admin")) return next();
 
-      // Diagnostic: log inbox POSTs to detect federation stalls
-      if (req.method === "POST" && req.path.includes("inbox")) {
-        const ua = req.get("user-agent") || "unknown";
-        const bodyParsed = req.body !== undefined && Object.keys(req.body || {}).length > 0;
-        console.info(`[federation-diag] POST ${req.path} from=${ua.slice(0, 60)} bodyParsed=${bodyParsed} readable=${req.readable}`);
-      }
-
       // Fedify's acceptsJsonLd() treats Accept: */* as NOT accepting JSON-LD
       // (it only returns true for explicit application/activity+json etc.).
       // Remote servers fetching actor URLs for HTTP Signature verification
@@ -729,6 +727,32 @@ export default class ActivityPubEndpoint {
    * @param {string} [actorInfo.photo] - Actor avatar URL
    * @returns {Promise<{ok: boolean, error?: string}>}
    */
+  /**
+   * Load the RSA private key from ap_keys for direct HTTP Signature signing.
+   * @returns {Promise<CryptoKey|null>}
+   */
+  async _loadRsaPrivateKey() {
+    try {
+      const keyDoc = await this._collections.ap_keys.findOne({
+        privateKeyPem: { $exists: true },
+      });
+      if (!keyDoc?.privateKeyPem) return null;
+      const pemBody = keyDoc.privateKeyPem
+        .replace(/-----[^-]+-----/g, "")
+        .replace(/\s/g, "");
+      return await crypto.subtle.importKey(
+        "pkcs8",
+        Buffer.from(pemBody, "base64"),
+        { name: "RSASSA-PKCS1-v1_5", hash: "SHA-256" },
+        false,
+        ["sign"],
+      );
+    } catch (error) {
+      console.error("[ActivityPub] Failed to load RSA key:", error.message);
+      return null;
+    }
+  }
+
   async followActor(actorUrl, actorInfo = {}) {
     if (!this._federation) {
       return { ok: false, error: "Federation not initialized" };
@@ -755,14 +779,33 @@ export default class ActivityPubEndpoint {
       }
 
       // Send Follow activity
-      const follow = new Follow({
-        actor: ctx.getActorUri(handle),
-        object: new URL(actorUrl),
-      });
-
-      await ctx.sendActivity({ identifier: handle }, remoteActor, follow, {
-        orderingKey: actorUrl,
-      });
+      if (needsDirectFollow(actorUrl)) {
+        // tags.pub rejects Fedify's LD Signature context (identity/v1).
+        // Send a minimal signed Follow directly, bypassing the outbox pipeline.
+        // See: https://github.com/social-web-foundation/tags.pub/issues/10
+        const rsaKey = await this._loadRsaPrivateKey();
+        if (!rsaKey) {
+          return { ok: false, error: "No RSA key available for direct follow" };
+        }
+        const result = await sendDirectFollow({
+          actorUri: ctx.getActorUri(handle).href,
+          targetActorUrl: actorUrl,
+          inboxUrl: remoteActor.inboxId?.href,
+          keyId: `${ctx.getActorUri(handle).href}#main-key`,
+          privateKey: rsaKey,
+        });
+        if (!result.ok) {
+          return { ok: false, error: result.error };
+        }
+      } else {
+        const follow = new Follow({
+          actor: ctx.getActorUri(handle),
+          object: new URL(actorUrl),
+        });
+        await ctx.sendActivity({ identifier: handle }, remoteActor, follow, {
+          orderingKey: actorUrl,
+        });
+      }
 
       // Store in ap_following
       const name =
@@ -866,19 +909,35 @@ export default class ActivityPubEndpoint {
         return { ok: true };
       }
 
-      const follow = new Follow({
-        actor: ctx.getActorUri(handle),
-        object: new URL(actorUrl),
-      });
-
-      const undo = new Undo({
-        actor: ctx.getActorUri(handle),
-        object: follow,
-      });
-
-      await ctx.sendActivity({ identifier: handle }, remoteActor, undo, {
-        orderingKey: actorUrl,
-      });
+      if (needsDirectFollow(actorUrl)) {
+        // tags.pub rejects Fedify's LD Signature context (identity/v1).
+        // See: https://github.com/social-web-foundation/tags.pub/issues/10
+        const rsaKey = await this._loadRsaPrivateKey();
+        if (rsaKey) {
+          const result = await sendDirectUnfollow({
+            actorUri: ctx.getActorUri(handle).href,
+            targetActorUrl: actorUrl,
+            inboxUrl: remoteActor.inboxId?.href,
+            keyId: `${ctx.getActorUri(handle).href}#main-key`,
+            privateKey: rsaKey,
+          });
+          if (!result.ok) {
+            console.warn(`[ActivityPub] Direct unfollow failed for ${actorUrl}: ${result.error}`);
+          }
+        }
+      } else {
+        const follow = new Follow({
+          actor: ctx.getActorUri(handle),
+          object: new URL(actorUrl),
+        });
+        const undo = new Undo({
+          actor: ctx.getActorUri(handle),
+          object: follow,
+        });
+        await ctx.sendActivity({ identifier: handle }, remoteActor, undo, {
+          orderingKey: actorUrl,
+        });
+      }
       await this._collections.ap_following.deleteOne({ actorUrl });
 
       console.info(`[ActivityPub] Sent Undo(Follow) to ${actorUrl}`);

package/lib/direct-follow.js

@@ -0,0 +1,163 @@
+/**
+ * Direct Follow/Undo(Follow) for servers that reject Fedify's LD Signatures.
+ *
+ * tags.pub's activitypub-bot uses the `activitystrea.ms` AS2 parser, which
+ * rejects the `https://w3id.org/identity/v1` JSON-LD context that Fedify 2.0
+ * adds for RsaSignature2017. This module sends Follow/Undo(Follow) activities
+ * with a minimal body (no LD Sig, no Data Integrity Proof) signed with
+ * draft-cavage HTTP Signatures.
+ *
+ * Upstream issue: https://github.com/social-web-foundation/tags.pub/issues/10
+ *
+ * @module direct-follow
+ */
+
+import crypto from "node:crypto";
+
+/** Hostnames that need direct follow (bypass Fedify outbox pipeline) */
+const DIRECT_FOLLOW_HOSTS = new Set(["tags.pub"]);
+
+/**
+ * Check if an actor URL requires direct follow delivery.
+ * @param {string} actorUrl
+ * @returns {boolean}
+ */
+export function needsDirectFollow(actorUrl) {
+  try {
+    return DIRECT_FOLLOW_HOSTS.has(new URL(actorUrl).hostname);
+  } catch {
+    return false;
+  }
+}
+
+/**
+ * Send a Follow activity directly with draft-cavage HTTP Signatures.
+ * @param {object} options
+ * @param {string} options.actorUri - Our actor URI
+ * @param {string} options.targetActorUrl - Remote actor URL to follow
+ * @param {string} options.inboxUrl - Remote actor's inbox URL
+ * @param {string} options.keyId - Our key ID (e.g. ...#main-key)
+ * @param {CryptoKey} options.privateKey - RSA private key for signing
+ * @returns {Promise<{ok: boolean, status?: number, error?: string}>}
+ */
+export async function sendDirectFollow({
+  actorUri,
+  targetActorUrl,
+  inboxUrl,
+  keyId,
+  privateKey,
+}) {
+  const body = JSON.stringify({
+    "@context": "https://www.w3.org/ns/activitystreams",
+    type: "Follow",
+    actor: actorUri,
+    object: targetActorUrl,
+    id: `${actorUri.replace(/\/$/, "")}/#Follow/${crypto.randomUUID()}`,
+  });
+
+  return _signAndSend(inboxUrl, body, keyId, privateKey);
+}
+
+/**
+ * Send an Undo(Follow) activity directly with draft-cavage HTTP Signatures.
+ * @param {object} options
+ * @param {string} options.actorUri - Our actor URI
+ * @param {string} options.targetActorUrl - Remote actor URL to unfollow
+ * @param {string} options.inboxUrl - Remote actor's inbox URL
+ * @param {string} options.keyId - Our key ID (e.g. ...#main-key)
+ * @param {CryptoKey} options.privateKey - RSA private key for signing
+ * @returns {Promise<{ok: boolean, status?: number, error?: string}>}
+ */
+export async function sendDirectUnfollow({
+  actorUri,
+  targetActorUrl,
+  inboxUrl,
+  keyId,
+  privateKey,
+}) {
+  const body = JSON.stringify({
+    "@context": "https://www.w3.org/ns/activitystreams",
+    type: "Undo",
+    actor: actorUri,
+    object: {
+      type: "Follow",
+      actor: actorUri,
+      object: targetActorUrl,
+    },
+    id: `${actorUri.replace(/\/$/, "")}/#Undo/${crypto.randomUUID()}`,
+  });
+
+  return _signAndSend(inboxUrl, body, keyId, privateKey);
+}
+
+/**
+ * Sign a POST request with draft-cavage HTTP Signatures and send it.
+ * @private
+ */
+async function _signAndSend(inboxUrl, body, keyId, privateKey) {
+  const url = new URL(inboxUrl);
+  const date = new Date().toUTCString();
+
+  // Compute SHA-256 digest of the body
+  const digestRaw = await crypto.subtle.digest(
+    "SHA-256",
+    new TextEncoder().encode(body),
+  );
+  const digest = "SHA-256=" + Buffer.from(digestRaw).toString("base64");
+
+  // Build draft-cavage signing string
+  const signingString = [
+    `(request-target): post ${url.pathname}`,
+    `host: ${url.host}`,
+    `date: ${date}`,
+    `digest: ${digest}`,
+  ].join("\n");
+
+  // Sign with RSA-SHA256
+  const signature = await crypto.subtle.sign(
+    "RSASSA-PKCS1-v1_5",
+    privateKey,
+    new TextEncoder().encode(signingString),
+  );
+  const signatureB64 = Buffer.from(signature).toString("base64");
+
+  const signatureHeader = [
+    `keyId="${keyId}"`,
+    `algorithm="rsa-sha256"`,
+    `headers="(request-target) host date digest"`,
+    `signature="${signatureB64}"`,
+  ].join(",");
+
+  try {
+    const response = await fetch(inboxUrl, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/activity+json",
+        Date: date,
+        Digest: digest,
+        Host: url.host,
+        Signature: signatureHeader,
+      },
+      body,
+    });
+
+    if (response.ok) {
+      return { ok: true, status: response.status };
+    }
+
+    const errorBody = await response.text().catch(() => "");
+    let detail = errorBody;
+    try {
+      detail = JSON.parse(errorBody).detail || errorBody;
+    } catch {
+      // not JSON
+    }
+    return {
+      ok: false,
+      status: response.status,
+      error: `${response.status} ${response.statusText}: ${detail}`,
+    };
+  } catch (error) {
+    return { ok: false, error: error.message };
+  }
+}

package/lib/federation-setup.js

@@ -154,7 +154,16 @@ export function setupFederation(options) {
           };
           if (keyPairs.length > 0) {
             appOptions.publicKey = keyPairs[0].cryptographicKey;
-            appOptions.assertionMethods = keyPairs.map((k) => k.multikey);
+            // Only include Ed25519 keys in assertionMethod (Object Integrity Proofs).
+            // RSA keys belong only in publicKey (HTTP Signatures). Putting the RSA
+            // Multikey in assertionMethod with the same #main-key id as the
+            // CryptographicKey in publicKey causes id collisions — servers that
+            // traverse JSON-LD properties alphabetically (assertionMethod before
+            // publicKey) find the Multikey first, which has no publicKeyPem,
+            // and fail signature verification.
+            appOptions.assertionMethods = keyPairs
+              .filter((k) => k.privateKey.algorithm.name !== "RSASSA-PKCS1-v1_5")
+              .map((k) => k.multikey);
           }
           return new Application(appOptions);
         }
@@ -753,7 +762,12 @@ export async function buildPersonActor(
 
   if (keyPairs.length > 0) {
     personOptions.publicKey = keyPairs[0].cryptographicKey;
-    personOptions.assertionMethods = keyPairs.map((k) => k.multikey);
+    // Only include Ed25519 keys in assertionMethod (Object Integrity Proofs).
+    // RSA keys belong only in publicKey (HTTP Signatures). See instance actor
+    // above for the full explanation of why this filter is necessary.
+    personOptions.assertionMethods = keyPairs
+      .filter((k) => k.privateKey.algorithm.name !== "RSASSA-PKCS1-v1_5")
+      .map((k) => k.multikey);
   }
 
   // Build profile field attachments (PropertyValue).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rmdes/indiekit-endpoint-activitypub",
-  "version": "3.8.2",
+  "version": "3.8.4",
   "description": "ActivityPub federation endpoint for Indiekit via Fedify. Adds full fediverse support: actor, inbox, outbox, followers, following, syndication, and Mastodon migration.",
   "keywords": [
     "indiekit",