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

fix: #13136, do not log 404s for AP requests

Browse Source
This commit is contained in:
Julian Lam
2025-02-20 12:24:17 -05:00
parent 7520e4f64d
commit 93f48409c5
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/activitypub/helpers.js
View File

@@ -64,6 +64,11 @@ Helpers.isUri = (value) => {
}); });
}; };
Helpers.assertAccept = accept => (accept && accept.split(',').some((value) => {
const parts = value.split(';').map(v => v.trim());
return activitypub._constants.acceptableTypes.includes(value || parts[0]);
}));
Helpers.isWebfinger = (value) => { Helpers.isWebfinger = (value) => {
// N.B. returns normalized handle, so truthy check! // N.B. returns normalized handle, so truthy check!
if (webfingerRegex.test(value) && !Helpers.isUri(value)) { if (webfingerRegex.test(value) && !Helpers.isUri(value)) {

7
src/controllers/404.js
View File

@@ -6,6 +6,7 @@ const validator = require('validator');
const meta = require('../meta'); const meta = require('../meta');
const plugins = require('../plugins'); const plugins = require('../plugins');
const activitypub = require('../activitypub');
const middleware = require('../middleware'); const middleware = require('../middleware');
const helpers = require('../middleware/helpers'); const helpers = require('../middleware/helpers');
const { secureRandom } = require('../utils'); const { secureRandom } = require('../utils');
@@ -24,6 +25,12 @@ exports.handle404 = helpers.try(async (req, res) => {
if (isClientScript.test(req.url)) { if (isClientScript.test(req.url)) {
res.type('text/javascript').status(404).send('Not Found'); res.type('text/javascript').status(404).send('Not Found');
} else if (
activitypub.helpers.assertAccept(req.headers.accept) ||
(req.headers['Content-Type'] && activitypub._constants.acceptableTypes.includes(req.headers['Content-Type']))
) {
// todo: separate logging of AP 404s
res.sendStatus(404);
} else if ( } else if (
!res.locals.isAPI && ( !res.locals.isAPI && (
req.path.startsWith(`${relativePath}/assets/uploads`) || req.path.startsWith(`${relativePath}/assets/uploads`) ||

6
src/middleware/activitypub.js
View File

@@ -16,10 +16,8 @@ middleware.assertS2S = async function (req, res, next) {
return next('route'); return next('route');
} }
const pass = (accept && accept.split(',').some((value) => { const pass = activitypub.helpers.assertAccepts(accept) ||
const parts = value.split(';').map(v => v.trim()); (contentType && activitypub._constants.acceptableTypes.includes(contentType));
return activitypub._constants.acceptableTypes.includes(value || parts[0]);
})) || (contentType && activitypub._constants.acceptableTypes.includes(contentType));
if (!pass) { if (!pass) {
return next('route'); return next('route');