Node.js based forum software built for the modern web
feat(activitypub): add core blocklist for domain management
Julian Lamfe48222990c4
diff --git a/public/language/en-GB/admin/settings/activitypub.json b/public/language/en-GB/admin/settings/activitypub.jsonindex bd31641fb3..8f541178ad 100644--- a/public/language/en-GB/admin/settings/activitypub.json+++ b/public/language/en-GB/admin/settings/activitypub.json@@ -60,6 +60,18 @@"server.filter-help": "Specify servers you would like to bar from federating with your NodeBB. Alternatively, you may opt to selectively <em>allow</em> federation with specific servers, instead. Both options are supported, although they are mutually exclusive.","server.filter-help-hostname": "Enter just the instance hostname below (e.g. <code>example.org</code>), separated by line breaks.","server.filter-allow-list": "Use this as an Allow List instead",+ "server.filter-allow-list-help": "When enabled, only domains in the core list are allowed to federate. Severity settings are ignored in allow list mode."++ "core-domains.title": "Add/Modify Domain",+ "core-domains.add": "Add",+ "core-domains.domain": "Domain",+ "core-domains.severity": "Severity",+ "core-domains.empty": "No domains yet. Add domains above to start filtering.",+ "core-domains.placeholder": "Enter domain name",++ "severity.suspend": "Suspend",+ "severity.silence": "Silence",+ "severity.filter": "Filter","content.outgoing": "Outgoing","content.summary-limit": "Character count after which a summary is generated",diff --git a/public/openapi/write.yaml b/public/openapi/write.yamlindex 2b529e98cc..9ea243e444 100644--- a/public/openapi/write.yaml+++ b/public/openapi/write.yaml@@ -306,6 +306,8 @@ paths:$ref: 'write/admin/activitypub/relays/url.yaml'/admin/activitypub/blocklists:$ref: 'write/admin/activitypub/blocklists.yaml'+ /admin/activitypub/blocklists/core:+ $ref: 'write/admin/activitypub/blocklists/core.yaml'/admin/activitypub/blocklists/{url}:$ref: 'write/admin/activitypub/blocklists/url.yaml'/admin/activitypub/blocklists/{url}/refresh:diff --git a/public/openapi/write/admin/activitypub/blocklists/core.yaml b/public/openapi/write/admin/activitypub/blocklists/core.yamlnew file mode 100644index 0000000000..50b4182822--- /dev/null+++ b/public/openapi/write/admin/activitypub/blocklists/core.yaml@@ -0,0 +1,97 @@+post:+ tags:+ - admin+ summary: add core domain+ description: This operation adds a domain to the core blocklist+ requestBody:+ required: true+ content:+ application/json:+ schema:+ type: object+ properties:+ domain:+ type: string+ description: The domain to add+ example: example.org+ severity:+ type: string+ description: The severity level for this domain+ enum:+ - suspend+ - silence+ - filter+ default: suspend+ responses:+ '200':+ description: domain successfully added+ content:+ application/json:+ schema:+ type: object+ properties:+ status:+ $ref: ../../../../components/schemas/Status.yaml#/Status+ response:+ type: object+ properties:+ domains:+ type: array+ items:+ type: object+ properties:+ domain:+ type: string+ severity:+ type: string+ count:+ type: number+ '400':+ description: invalid request+ content:+ application/json:+ schema:+ $ref: ../../../../components/schemas/Error.yaml#/Error++delete:+ tags:+ - admin+ summary: remove core domain+ description: This operation removes a domain from the core blocklist+ parameters:+ - in: query+ name: domain+ schema:+ type: string+ required: true+ example: example.org+ responses:+ '200':+ description: domain successfully removed+ content:+ application/json:+ schema:+ type: object+ properties:+ status:+ $ref: ../../../../components/schemas/Status.yaml#/Status+ response:+ type: object+ properties:+ domains:+ type: array+ items:+ type: object+ properties:+ domain:+ type: string+ severity:+ type: string+ count:+ type: number+ '400':+ description: invalid request+ content:+ application/json:+ schema:+ $ref: ../../../../components/schemas/Error.yaml#/Errordiff --git a/public/src/admin/federation/safety.js b/public/src/admin/federation/safety.jsindex f32da91904..87bf72b915 100644--- a/public/src/admin/federation/safety.js+++ b/public/src/admin/federation/safety.js@@ -4,9 +4,11 @@ import { get, post, del } from 'api';import { error } from 'alerts';import { render } from 'benchpress';import { alert, dialog } from 'bootbox';+import { translate } from 'translator';export function init() {setupBlocklists();+ setupCoreDomains();};function setupBlocklists() {@@ -97,6 +99,69 @@ async function refresh(url) {}}+function setupCoreDomains() {+ const coreTable = document.getElementById('coreDomains');+ if (coreTable) {+ coreTable.addEventListener('click', (e) => {+ const subselector = e.target.closest('[data-action]');+ if (subselector) {+ const action = subselector.getAttribute('data-action');+ const row = subselector.closest('tr');+ const domain = row.getAttribute('data-domain');+ if (action === 'core.remove') {+ removeDomain(domain);+ }+ }+ });+ }++ const addBtn = document.querySelector('[data-action="core.add"]');+ if (addBtn) {+ addBtn.addEventListener('click', () => {+ const input = document.getElementById('coreDomainInput');+ const select = document.getElementById('coreSeveritySelect');+ const domain = input.value.trim();+ const severity = select.value;+ if (!domain) {+ return;+ }+ addDomain(domain, severity);+ input.value = '';+ });+ }+}++async function addDomain(domain, severity = 'suspend') {+ try {+ const { domains } = await post('/admin/activitypub/blocklists/core', { domain, severity });+ const tbody = document.querySelector('#coreDomains tbody');+ if (!tbody) return;++ const html = await app.parseAndTranslate('admin/federation/safety', 'domains', { domains });+ $(tbody).html(html);+ } catch (e) {+ error(e);+ }+}++async function removeDomain(domain) {+ try {+ const { domains } = await del(`/admin/activitypub/blocklists/core?domain=${encodeURIComponent(domain)}`);+ const tbody = document.querySelector('#coreDomains tbody');+ if (!tbody) return;++ if (!domains.length) {+ tbody.innerHTML = await translate(`<tr><td colspan="3" class="text-muted">[[admin/settings/activitypub:core-domains.empty]]</td></tr>`);+ return;+ }++ const html = await app.parseAndTranslate('admin/federation/safety', 'domains', { domains });+ $(tbody).html(html);+ } catch (e) {+ error(e);+ }+}+async function view(url) {console.log('ehjre');try {diff --git a/src/activitypub/blocklists.js b/src/activitypub/blocklists.jsindex 71d921d4d5..2ddf999801 100644--- a/src/activitypub/blocklists.js+++ b/src/activitypub/blocklists.js@@ -26,8 +26,14 @@ Blocklists.list = async () => {Blocklists.get = async (url) => {const domains = await db.getSortedSetMembers(`blocklist:${url}`);+ const severityKey = `blocklist:${url}:severity`;+ const severityMap = await db.getObject(severityKey) || {};+return {- domains,+ domains: domains.map(d => ({+ domain: d,+ severity: severityMap[d] || 'suspend',+ })),count: domains.length,};};@@ -49,6 +55,23 @@ Blocklists.remove = async (url) => {]);};+Blocklists.core = {};++Blocklists.core.add = async (domain, severity = 'suspend') => {+ const now = Date.now();+ const score = severityScore[severity] ?? severityScore.suspend;++ await Promise.all([+ db.sortedSetAdd('blocklists', now, 'core'),+ db.sortedSetAdd('blocklist:core', score, domain),+ db.setObjectField('blocklist:core:severity', domain, severity),+ ]);+};++Blocklists.core.remove = async (domain) => {+ await db.sortedSetRemove('blocklist:core', domain);+};+Blocklists.refresh = async (url) => {activitypub.helpers.log(`[blocklists/refresh] Processing ${url}`);@@ -85,6 +108,13 @@ Blocklists.refresh = async (url) => {return records.length;};+Blocklists.core.ensure = async () => {+ const exists = await db.isSortedSetMember('blocklists', 'core');+ if (!exists) {+ await db.sortedSetAdd('blocklists', Date.now(), 'core');+ }+};+Blocklists.check = async (domain) => {const blocklists = await Blocklists.list();let present = await db.isMemberOfSortedSets(blocklists.map(({ url }) => `blocklist:${url}`), domain);diff --git a/src/activitypub/instances.js b/src/activitypub/instances.jsindex ca0a73881b..f8194c8752 100644--- a/src/activitypub/instances.js+++ b/src/activitypub/instances.js@@ -16,19 +16,19 @@ Instances.list = async () => db.getSortedSetMembers('instances:lastSeen');Instances.isAllowed = async (domain) => {const result = await activitypub.blocklists.check(domain);- let { activitypubFilter: type, activitypubFilterList: list } = meta.config;-- list = new Set(String(list).split('\n'));+ await activitypub.blocklists.core.ensure();+ const core = await activitypub.blocklists.get('core');+ const { activitypubFilter: type } = meta.config;if (!type) {- // type = 0: blocklist mode — deny if domain is on the list+ // type = 0: blocklist mode — deny if domain is on the core listif (result.allowed) {- return { ...result, allowed: !list.has(domain) };+ return { ...result, allowed: !core.domains.some(d => d.domain === domain) };}return result;}- // type = 1: allowlist mode — allow only if domain is on the list- return { ...result, allowed: list.has(domain) };+ // type = 1: allowlist mode — allow only if domain is on the core list+ return { ...result, allowed: core.domains.some(d => d.domain === domain) };};diff --git a/src/controllers/admin/federation.js b/src/controllers/admin/federation.jsindex 4c1edeed2d..a8758e25c6 100644--- a/src/controllers/admin/federation.js+++ b/src/controllers/admin/federation.js@@ -69,12 +69,14 @@ federationController.pruning = function (req, res) {federationController.safety = async function (req, res) {const instanceCount = await activitypub.instances.getCount();- const blocklists = await activitypub.blocklists.list();+ const blocklists = (await activitypub.blocklists.list()).filter(bl => bl.url !== 'core');+ const core = await activitypub.blocklists.get('core');res.render(`admin/federation/safety`, {title: '[[admin/menu:federation/safety]]',blocklists,instanceCount,+ domains: core.domains,});};diff --git a/src/controllers/write/admin.js b/src/controllers/write/admin.jsindex 5282957fd5..2e71364977 100644--- a/src/controllers/write/admin.js+++ b/src/controllers/write/admin.js@@ -141,7 +141,8 @@ Admin.activitypub.addBlocklist = async (req, res, next) => {Admin.activitypub.viewBlocklist = async (req, res) => {const { url } = req.params;- helpers.formatApiResponse(200, res, await activitypub.blocklists.get(url));+ const { domains, count } = await activitypub.blocklists.get(url);+ helpers.formatApiResponse(200, res, { domains: domains.map(d => d.domain), count });};Admin.activitypub.removeBlocklist = async (req, res) => {@@ -159,3 +160,32 @@ Admin.activitypub.refreshBlocklist = async (req, res) => {helpers.formatApiResponse(200, res, { blocklists, count });};++Admin.activitypub.addCoreDomain = async (req, res) => {+ const { domain, severity } = req.body;+ if (!domain) {+ return helpers.formatApiResponse(400, res);+ }++ try {+ const parsed = new URL(`https://${domain}`);+ if (parsed.hostname.split('.').length < 2) {+ return helpers.formatApiResponse(400, res);+ }+ } catch (e) {+ return helpers.formatApiResponse(400, res);+ }++ await activitypub.blocklists.core.add(domain, severity);+ helpers.formatApiResponse(200, res, await activitypub.blocklists.get('core'));+};++Admin.activitypub.removeCoreDomain = async (req, res) => {+ const { domain } = req.query;+ if (!domain) {+ return helpers.formatApiResponse(400, res);+ }++ await activitypub.blocklists.core.remove(domain);+ helpers.formatApiResponse(200, res, await activitypub.blocklists.get('core'));+};diff --git a/src/routes/write/admin.js b/src/routes/write/admin.jsindex caac9e9b3e..13172884ec 100644--- a/src/routes/write/admin.js+++ b/src/routes/write/admin.js@@ -31,6 +31,8 @@ module.exports = function () {setupApiRoute(router, 'post', '/activitypub/relays', [...middlewares, middleware.checkRequired.bind(null, ['url'])], controllers.write.admin.activitypub.addRelay);setupApiRoute(router, 'delete', '/activitypub/relays/:url', [...middlewares], controllers.write.admin.activitypub.removeRelay);setupApiRoute(router, 'post', '/activitypub/blocklists', [...middlewares, middleware.checkRequired.bind(null, ['url'])], controllers.write.admin.activitypub.addBlocklist);+ setupApiRoute(router, 'post', '/activitypub/blocklists/core', [...middlewares], controllers.write.admin.activitypub.addCoreDomain);+ setupApiRoute(router, 'delete', '/activitypub/blocklists/core', [...middlewares], controllers.write.admin.activitypub.removeCoreDomain);setupApiRoute(router, 'get', '/activitypub/blocklists/:url', [...middlewares], controllers.write.admin.activitypub.viewBlocklist);setupApiRoute(router, 'delete', '/activitypub/blocklists/:url', [...middlewares], controllers.write.admin.activitypub.removeBlocklist);setupApiRoute(router, 'post', '/activitypub/blocklists/:url/refresh', [...middlewares], controllers.write.admin.activitypub.refreshBlocklist);diff --git a/src/upgrades/4.13.0/migrate-filter-list-to-core.js b/src/upgrades/4.13.0/migrate-filter-list-to-core.jsnew file mode 100644index 0000000000..5c00ea0793--- /dev/null+++ b/src/upgrades/4.13.0/migrate-filter-list-to-core.js@@ -0,0 +1,51 @@+'use strict';++const db = require('../../database');+const activitypub = require('../../activitypub');++module.exports = {+ name: 'Migrate activitypubFilterList config to core blocklist',+ timestamp: Date.UTC(2026, 5, 1),+ method: async function () {+ const list = await db.getObjectField('config', 'activitypubFilterList');+ if (!list) {+ return;+ }++ const domains = String(list)+ .split('\n')+ .map(d => d.trim())+ .filter(d => d.length > 0);++ if (!domains.length) {+ await db.deleteObjectField('config', 'activitypubFilterList');+ return;+ }++ // Ensure core blocklist is registered+ const exists = await db.isSortedSetMember('blocklists', 'core');+ if (!exists) {+ await db.sortedSetAdd('blocklists', Date.now(), 'core');+ }++ // Clear any existing core domains (idempotent)+ await db.delete('blocklist:core');+ await db.delete('blocklist:core:severity');++ // Add migrated domains with default severity (suspend = 1)+ await db.sortedSetAdd(+ 'blocklist:core',+ domains.map(() => 1),+ domains+ );+ await db.setObject(+ 'blocklist:core:severity',+ domains.reduce((obj, d) => { obj[d] = 'suspend'; return obj; }, {})+ );++ // Remove old config field+ await db.deleteObjectField('config', 'activitypubFilterList');++ activitypub.helpers.log(`[upgrade] Migrated ${domains.length} domains to core blocklist`);+ },+};diff --git a/src/views/admin/federation/safety.tpl b/src/views/admin/federation/safety.tplindex b7fe38c49d..1537294cfb 100644--- a/src/views/admin/federation/safety.tpl+++ b/src/views/admin/federation/safety.tpl@@ -49,12 +49,45 @@<p>[[admin/settings/activitypub:server.filter-help]]</p><p>[[admin/settings/activitypub:server.filter-help-hostname]]</p><p>[[admin/settings/activitypub:count, {instanceCount}]]</p>- <label for="activitypubFilterList" class="form-label">Filtering list</label>- <textarea class="form-control" id="activitypubFilterList" data-field="activitypubFilterList" rows="10"></textarea>+ <div class="mb-3">+ <h6 class="fw-bold">[[admin/settings/activitypub:core-domains.title]]</h6>+ <div class="input-group mb-2">+ <input type="text" class="form-control" id="coreDomainInput" placeholder="[[admin/settings/activitypub:core-domains.placeholder]]" />+ <select class="form-select" id="coreSeveritySelect">+ <option value="suspend">[[admin/settings/activitypub:severity.suspend]]</option>+ <option value="silence">[[admin/settings/activitypub:severity.silence]]</option>+ <option value="filter">[[admin/settings/activitypub:severity.filter]]</option>+ </select>+ <button class="btn btn-sm btn-primary" type="button" data-action="core.add">[[admin/settings/activitypub:core-domains.add]]</button>+ </div>+ <div class="table-responsive">+ <table class="table table-sm table-striped" id="coreDomains">+ <thead>+ <th>[[admin/settings/activitypub:core-domains.domain]]</th>+ <th>[[admin/settings/activitypub:core-domains.severity]]</th>+ <th></th>+ </thead>+ <tbody>+ {{{ if !domains.length }}}+ <tr><td colspan="3" class="text-muted">[[admin/settings/activitypub:core-domains.empty]]</td></tr>+ {{{ else }}}+ {{{ each domains }}}+ <tr data-domain="{./domain}">+ <td>{./domain}</td>+ <td>[[admin/settings/activitypub:severity.{./severity}]]</td>+ <td><a href="#" data-action="core.remove"><i class="fa fa-trash link-danger"></i></a></td>+ </tr>+ {{{ end }}}+ {{{ end }}}+ </tbody>+ </table>+ </div>+ </div></div><div class="form-check form-switch mb-3"><input class="form-check-input" type="checkbox" id="activitypubFilter" data-field="activitypubFilter" /><label class="form-check-label" for="activitypubFilter">[[admin/settings/activitypub:server.filter-allow-list]]</label>+ <p class="form-text">[[admin/settings/activitypub:server.filter-allow-list-help]]</p></div></form></div>diff --git a/src/views/admin/partials/activitypub/core-domains-row.tpl b/src/views/admin/partials/activitypub/core-domains-row.tplnew file mode 100644index 0000000000..2559c590a2--- /dev/null+++ b/src/views/admin/partials/activitypub/core-domains-row.tpl@@ -0,0 +1,7 @@+{{{ each domains }}}+<tr data-domain="{./domain}">+ <td>{./domain}</td>+ <td>[[admin/settings/activitypub:severity.{./severity}]]</td>+ <td><a href="#" data-action="core.remove"><i class="fa fa-trash link-danger"></i></a></td>+</tr>+{{{ end }}}