Node.js based forum software built for the modern web
fix(activitypub): gate user-facing S2S endpoints on fediverse view:users privilege
Julian Lamf0368a2faef3
diff --git a/src/middleware/activitypub.js b/src/middleware/activitypub.jsindex cc3ded3e4b..d36433e18d 100644--- a/src/middleware/activitypub.js+++ b/src/middleware/activitypub.js@@ -3,6 +3,7 @@const db = require('../database');const user = require('../user');const meta = require('../meta');+const privileges = require('../privileges');const activitypub = require('../activitypub');const analytics = require('../analytics');const helpers = require('./helpers');@@ -193,3 +194,14 @@ middleware.configureResponse = async function (req, res, next) {res.header('Content-Type', 'application/activity+json');next();};++middleware.canViewUsers = helpers.try(async function (req, res, next) {+ // For S2S ActivityPub requests, check view:users privilege.+ // This mirrors the check in WebFinger (well-known.js profile()) which uses uid -2.+ const callerUid = req.uid || activitypub._constants.uid;+ const canView = await privileges.global.can('view:users', callerUid);+ if (!canView) {+ return res.sendStatus(404);+ }+ next();+});diff --git a/src/routes/activitypub.js b/src/routes/activitypub.jsindex 85e702fa01..b0d6cd4661 100644--- a/src/routes/activitypub.js+++ b/src/routes/activitypub.js@@ -36,14 +36,14 @@ module.exports = function (app, middleware, controllers) {app.get('/actor/admins', middlewares, helpers.tryRoute(controllers.activitypub.getAdmins));app.post('/inbox', [...middlewares, ...inboxMiddlewares], helpers.tryRoute(controllers.activitypub.postInbox));- app.get('/uid/:uid', [...middlewares, middleware.assert.user, middleware.canViewUsers], helpers.tryRoute(controllers.activitypub.actors.user));- app.get('/user/:userslug', [...middlewares, middleware.exposeUid, middleware.assert.user, middleware.canViewUsers], helpers.tryRoute(controllers.activitypub.actors.userBySlug));- app.get('/uid/:uid/inbox', [...middlewares, middleware.assert.user], helpers.tryRoute(controllers.activitypub.getInbox));+ app.get('/uid/:uid', [...middlewares, middleware.assert.user, middleware.activitypub.canViewUsers], helpers.tryRoute(controllers.activitypub.actors.user));+ app.get('/user/:userslug', [...middlewares, middleware.exposeUid, middleware.assert.user, middleware.activitypub.canViewUsers], helpers.tryRoute(controllers.activitypub.actors.userBySlug));+ app.get('/uid/:uid/inbox', [...middlewares, middleware.assert.user, middleware.activitypub.canViewUsers], helpers.tryRoute(controllers.activitypub.getInbox));app.post('/uid/:uid/inbox', [...middlewares, middleware.assert.user, ...inboxMiddlewares], helpers.tryRoute(controllers.activitypub.postInbox));- app.get('/uid/:uid/outbox', [...middlewares, middleware.assert.user], helpers.tryRoute(controllers.activitypub.getOutbox));+ app.get('/uid/:uid/outbox', [...middlewares, middleware.assert.user, middleware.activitypub.canViewUsers], helpers.tryRoute(controllers.activitypub.getOutbox));app.post('/uid/:uid/outbox', [...middlewares, middleware.assert.user], helpers.tryRoute(controllers.activitypub.postOutbox));- app.get('/uid/:uid/following', [...middlewares, middleware.assert.user], helpers.tryRoute(controllers.activitypub.getFollowing));- app.get('/uid/:uid/followers', [...middlewares, middleware.assert.user], helpers.tryRoute(controllers.activitypub.getFollowers));+ app.get('/uid/:uid/following', [...middlewares, middleware.assert.user, middleware.activitypub.canViewUsers], helpers.tryRoute(controllers.activitypub.getFollowing));+ app.get('/uid/:uid/followers', [...middlewares, middleware.assert.user, middleware.activitypub.canViewUsers], helpers.tryRoute(controllers.activitypub.getFollowers));app.get('/post/:pid', [...middlewares, middleware.assert.post], helpers.tryRoute(controllers.activitypub.actors.note));app.get('/post/:pid/replies', [...middlewares, middleware.assert.post], helpers.tryRoute(controllers.activitypub.actors.replies));