Skip to content

Node.js based forum software built for the modern web

refactor(activitypub): consolidate blocklist severity logic into check()

Julian Lam80f4a2247b26
diff --git a/src/activitypub/blocklists.js b/src/activitypub/blocklists.js
index e270562369..ae4c395a5d 100644
--- a/src/activitypub/blocklists.js
+++ b/src/activitypub/blocklists.js
@@ -117,16 +117,3 @@ Blocklists.check = async (domain) => {
listUrl: bestListUrl,
};
};
-
-Blocklists.getSeverityInfo = async (domain) => {
- const result = await Blocklists.check(domain);
- if (result.severity === null) {
- return null;
- }
- return { severity: result.severity, listUrl: result.listUrl };
-};
-
-Blocklists.getSeverity = async (domain) => {
- const result = await Blocklists.check(domain);
- return result.severity;
-};
diff --git a/src/activitypub/instances.js b/src/activitypub/instances.js
index 891e9375d9..1ecd5307c6 100644
--- a/src/activitypub/instances.js
+++ b/src/activitypub/instances.js
@@ -15,20 +15,18 @@ Instances.getCount = async () => db.sortedSetCard('instances:lastSeen');
Instances.list = async () => db.getSortedSetMembers('instances:lastSeen');
Instances.isAllowed = async (domain) => {
- const { allowed, severity } = await activitypub.blocklists.check(domain);
- const blocklistInfo = await activitypub.blocklists.getSeverityInfo(domain);
-
+ const result = await activitypub.blocklists.check(domain);
let { activitypubFilter: type, activitypubFilterList: list } = meta.config;
- if (!allowed && !type) {
- return { allowed: false, severity, ...blocklistInfo };
+ if (!result.allowed && !type) {
+ return result;
}
list = new Set(String(list).split('\n'));
- if (allowed) {
- return { allowed: type ? list.has(domain) : true, severity, ...blocklistInfo };
+ if (result.allowed) {
+ return { ...result, allowed: type ? list.has(domain) : true };
}
- return { allowed: type ? !list.has(domain) : false, severity, ...blocklistInfo };
+ return { ...result, allowed: type ? !list.has(domain) : false };
};
diff --git a/test/activitypub/blocklists.js b/test/activitypub/blocklists.js
index d2254f9b17..52a8792966 100644
--- a/test/activitypub/blocklists.js
+++ b/test/activitypub/blocklists.js
@@ -11,6 +11,11 @@ const install = require('../../src/install');
const activitypub = require('../../src/activitypub');
describe('ActivityPub blocklists', () => {
+ const getSeverity = async (domain) => {
+ const result = await activitypub.blocklists.check(domain);
+ return result.severity;
+ };
+
before(async function () {
meta.config.activitypubEnabled = 1;
meta.config.activitypubAllowLoopback = 1;
@@ -247,9 +252,9 @@ describe('ActivityPub blocklists', () => {
await activitypub.blocklists.refresh(u);
- assert.strictEqual(await activitypub.blocklists.getSeverity('suspend.com'), 1);
- assert.strictEqual(await activitypub.blocklists.getSeverity('silence.com'), 2);
- assert.strictEqual(await activitypub.blocklists.getSeverity('filter.com'), 3);
+ assert.strictEqual(await getSeverity('suspend.com'), 1);
+ assert.strictEqual(await getSeverity('silence.com'), 2);
+ assert.strictEqual(await getSeverity('filter.com'), 3);
});
it('should default unknown severity values to suspend (score 1)', async () => {
@@ -257,16 +262,16 @@ describe('ActivityPub blocklists', () => {
await activitypub.blocklists.refresh(u);
- assert.strictEqual(await activitypub.blocklists.getSeverity('unknown.com'), 1);
- assert.strictEqual(await activitypub.blocklists.getSeverity('missing.com'), 1);
- assert.strictEqual(await activitypub.blocklists.getSeverity('empty.com'), 1);
+ assert.strictEqual(await getSeverity('unknown.com'), 1);
+ assert.strictEqual(await getSeverity('missing.com'), 1);
+ assert.strictEqual(await getSeverity('empty.com'), 1);
});
it('should overwrite previous domains and severities', async () => {
mockCsv('#domain,#severity\nold.com,silence');
await activitypub.blocklists.refresh(u);
- const sev1 = await activitypub.blocklists.getSeverity('old.com');
+ const sev1 = await getSeverity('old.com');
assert.strictEqual(sev1, 2, `expected old.com severity to be 2, got ${sev1}`);
mockCsv('#domain,#severity\nnew.com,filter');
@@ -277,10 +282,10 @@ describe('ActivityPub blocklists', () => {
assert(result.domains.includes('new.com'));
assert(!result.domains.includes('old.com'));
- const sevNew = await activitypub.blocklists.getSeverity('new.com');
+ const sevNew = await getSeverity('new.com');
assert.strictEqual(sevNew, 3, `expected new.com severity to be 3, got ${sevNew}`);
- const sevOld = await activitypub.blocklists.getSeverity('old.com');
+ const sevOld = await getSeverity('old.com');
assert.strictEqual(sevOld, null, `expected old.com severity to be null, got ${sevOld}`);
});
});
@@ -375,7 +380,7 @@ describe('ActivityPub blocklists', () => {
});
it('should return null for a domain not in any blocklist', async () => {
- const result = await activitypub.blocklists.getSeverity('nowhere.com');
+ const result = await getSeverity('nowhere.com');
assert.strictEqual(result, null);
});
@@ -384,9 +389,9 @@ describe('ActivityPub blocklists', () => {
mockCsv('#domain,#severity\nsuspend.com,suspend\nsilence.com,silence\nfilter.com,filter');
await activitypub.blocklists.add(u);
- assert.strictEqual(await activitypub.blocklists.getSeverity('suspend.com'), 1);
- assert.strictEqual(await activitypub.blocklists.getSeverity('silence.com'), 2);
- assert.strictEqual(await activitypub.blocklists.getSeverity('filter.com'), 3);
+ assert.strictEqual(await getSeverity('suspend.com'), 1);
+ assert.strictEqual(await getSeverity('silence.com'), 2);
+ assert.strictEqual(await getSeverity('filter.com'), 3);
});
it('should return null after blocklist is removed', async () => {
@@ -394,11 +399,11 @@ describe('ActivityPub blocklists', () => {
mockCsv('#domain,#severity\nemp.com,silence');
await activitypub.blocklists.add(u);
- assert.strictEqual(await activitypub.blocklists.getSeverity('emp.com'), 2);
+ assert.strictEqual(await getSeverity('emp.com'), 2);
await activitypub.blocklists.remove(u);
- assert.strictEqual(await activitypub.blocklists.getSeverity('emp.com'), null);
+ assert.strictEqual(await getSeverity('emp.com'), null);
});
});