Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-26 16:46:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore: add verbose logging to middleware.validate

Browse Source
This commit is contained in:
Julian Lam
2024-04-05 16:03:41 -04:00
parent f40df38786
commit 719bb0a0ec
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/middleware/activitypub.js
View File

@@ -1,5 +1,7 @@
'use strict'; 'use strict';
const winston = require('winston');
const db = require('../database'); const db = require('../database');
const meta = require('../meta'); const meta = require('../meta');
const activitypub = require('../activitypub'); const activitypub = require('../activitypub');
@@ -33,17 +35,22 @@ middleware.assertS2S = async function (req, res, next) {
}; };
middleware.validate = async function (req, res, next) { middleware.validate = async function (req, res, next) {
winston.verbose('[middleware/activitypub] Validating incoming payload...');
// Checks the validity of the incoming payload against the sender and rejects on failure // Checks the validity of the incoming payload against the sender and rejects on failure
const verified = await activitypub.verify(req); const verified = await activitypub.verify(req);
if (!verified) { if (!verified) {
winston.verbose('[middleware/activitypub] HTTP signature verification failed.');
return res.sendStatus(400); return res.sendStatus(400);
} }
winston.verbose('[middleware/activitypub] HTTP signature verification passed.');
// Sanity-check payload schema // Sanity-check payload schema
const required = ['type', 'actor', 'object']; const required = ['type', 'actor', 'object'];
if (!required.every(prop => req.body.hasOwnProperty(prop))) { if (!required.every(prop => req.body.hasOwnProperty(prop))) {
winston.verbose('[middleware/activitypub] Request body missing required properties.');
return res.sendStatus(400); return res.sendStatus(400);
} }
winston.verbose('[middleware/activitypub] Request body check passed.');
const { actor, object } = req.body; const { actor, object } = req.body;
@@ -52,8 +59,10 @@ middleware.validate = async function (req, res, next) {
const actorHostname = new URL(actor).hostname; const actorHostname = new URL(actor).hostname;
const objectHostname = new URL(object.id).hostname; const objectHostname = new URL(object.id).hostname;
if (actorHostname !== objectHostname) { if (actorHostname !== objectHostname) {
winston.verbose('[middleware/activitypub] Origin check failed.');
return res.sendStatus(403); return res.sendStatus(403);
} }
winston.verbose('[middleware/activitypub] Origin check passed.');
} }
// Cross-check key ownership against received actor // Cross-check key ownership against received actor
@@ -62,8 +71,10 @@ middleware.validate = async function (req, res, next) {
const { signature } = req.headers; const { signature } = req.headers;
const keyId = new Map(signature.split(',').filter(Boolean).map(v => v.split('='))).get('keyId'); const keyId = new Map(signature.split(',').filter(Boolean).map(v => v.split('='))).get('keyId');
if (`"${compare}"` !== keyId) { if (`"${compare}"` !== keyId) {
winston.verbose('[middleware/activitypub] Key ownership cross-check failed.');
return res.sendStatus(403); return res.sendStatus(403);
} }
winston.verbose('[middleware/activitypub] Key ownership cross-check passed.');
next(); next();
}; };