Node.js based forum software built for the modern web
fix: signatures as part of ActivityPub object, make calculateDigest an internal method in signatures.js
Julian Lam62104963a4e0
diff --git a/src/activitypub/index.js b/src/activitypub/index.jsindex 947962bd6b..dfeffaae05 100644--- a/src/activitypub/index.js+++ b/src/activitypub/index.js@@ -66,7 +66,6 @@ ActivityPub._constants = Object.freeze({ActivityPub._cache = requestCache;ActivityPub._sent = new Map(); // used only in local tests-const signatures = require('./signatures');ActivityPub.helpers = require('./helpers');ActivityPub.inbox = require('./inbox');@@ -82,6 +81,7 @@ ActivityPub.relays = require('./relays');ActivityPub.out = require('./out');ActivityPub.jobs = require('./jobs');ActivityPub.analytics = require('./analytics');+ActivityPub. signatures = require('./signatures');ActivityPub.resolveId = async (uid, id) => {try {@@ -291,13 +291,13 @@ ActivityPub.fetchPublicKey = async (uri, ip) => {ActivityPub.sign = async ({ key, keyId }, url, digest) => {// Determines HTTP method based on digest presenceconst method = digest ? 'POST' : 'GET';- return await signatures.sign({ key, keyId }, url, method, digest);+ return await ActivityPub.signatures.sign({ key, keyId }, url, method, digest);};ActivityPub.verify = async (req) => {ActivityPub.helpers.log('[activitypub/verify] Starting signature verification...');- const isValid = await signatures.verify(req, ActivityPub.fetchPublicKey);+ const isValid = await ActivityPub.signatures.verify(req, ActivityPub.fetchPublicKey);if (!isValid) {ActivityPub.helpers.log('[activitypub/verify] Signature verification failed.');} else {diff --git a/src/activitypub/signatures.js b/src/activitypub/signatures.jsindex 8c5f3be180..1116f084f8 100644--- a/src/activitypub/signatures.js+++ b/src/activitypub/signatures.js@@ -17,16 +17,6 @@ const {const Signatures = module.exports;-Signatures.calculateDigest = (body) => {- if (!body) return null;- const bodyData = typeof body === 'string' || Buffer.isBuffer(body) ?- body :- JSON.stringify(body);-- const hash = createHash('sha256').update(bodyData).digest('base64');- return `SHA-256=${hash}`;-};-Signatures.sign = async ({ key, keyId }, url, method = 'GET', digest = null) => {const parsedUrl = new URL(url);const date = new Date().toUTCString();@@ -100,7 +90,7 @@ Signatures.verify = async (req, fetchPublicKeyFn) => {const bodyData = req.rawBody || (typeof req.body === 'string' ? req.body : JSON.stringify(req.body));if (!bodyData) return false;- const computedDigest = Signatures.calculateDigest(bodyData);+ const computedDigest = calculateDigest(bodyData);if (headers.digest !== computedDigest) {winston.warn('[activitypub/signatures] Digest mismatch during request verification');return false;@@ -127,6 +117,16 @@ Signatures.verify = async (req, fetchPublicKeyFn) => {}};+function calculateDigest(body) {+ if (!body) return null;+ const bodyData = typeof body === 'string' || Buffer.isBuffer(body) ?+ body :+ JSON.stringify(body);++ const hash = createHash('sha256').update(bodyData).digest('base64');+ return `SHA-256=${hash}`;+};+async function tryVerifyDraft(req, fetchPublicKeyFn) {try {if (!req.headers.signature) {