Skip to content

Node.js based forum software built for the modern web

fix(activitypub): skip actor resolution when federation is disabled

Dirk Platef0bf44fd40b4
diff --git a/src/activitypub/actors.js b/src/activitypub/actors.js
index 6c28b30e03..613f321a5d 100644
--- a/src/activitypub/actors.js
+++ b/src/activitypub/actors.js
@@ -35,6 +35,10 @@ Actors.qualify = async (ids, options = {}) => {
* This method is only called by assert/assertGroup (at least in core.)
*/
+ if (!meta.config.activitypubEnabled) {
+ return false;
+ }
+
// Handle single values
if (!Array.isArray(ids)) {
ids = [ids];
diff --git a/test/activitypub.js b/test/activitypub.js
index bdc7247905..73c2a33276 100644
--- a/test/activitypub.js
+++ b/test/activitypub.js
@@ -82,6 +82,16 @@ describe('ActivityPub integration', () => {
assert(!body.links.some(obj => obj.type && obj.type === 'application/activity+json'));
});
+ it('actors.assert should skip webfinger for a remote @-handle', async () => {
+ const result = await activitypub.actors.assert(`nobody@${utils.generateUUID()}.invalid`);
+ assert.strictEqual(result, false);
+ });
+
+ it('user.getUidByUserslug should resolve to null for an @-handle', async () => {
+ const uid = await user.getUidByUserslug(`nobody@${utils.generateUUID()}.invalid`);
+ assert.strictEqual(uid, null);
+ });
+
after(() => {
meta.config.activitypubEnabled = 1;
});