Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-31 02:55:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Julian Lam
2025-02-26 12:57:47 -05:00
parent bfffbfbe57 c65e1ebb8f
commit c98f29aeb4
3 changed files with 49 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/activitypub/inbox.js
View File

@@ -36,7 +36,7 @@ inbox.create = async (req) => {
const { object } = req.body;
// Alternative logic for non-public objects
const isPublic = [...object.to, ...object.cc].includes(activitypub._constants.publicAddress);
const isPublic = [...(object.to || []), ...(object.cc || [])].includes(activitypub._constants.publicAddress);
if (!isPublic) {
return await activitypub.notes.assertPrivate(object);
}

2
src/activitypub/notes.js
View File

@@ -234,7 +234,7 @@ Notes.assertPrivate = async (object) => {
}
const localUids = [];
const recipients = new Set([...object.to, ...object.cc]);
const recipients = new Set([...(object.to || []), ...(object.cc || [])]);
await Promise.all(Array.from(recipients).map(async (value) => {
const { type, id } = await activitypub.helpers.resolveLocalId(value);
if (type === 'user') {

86
test/activitypub/notes.js
View File

@@ -1,70 +1,78 @@
'use strict';
const assert = require('assert');
const nconf = require('nconf');
const db = require('../../src/database');
const meta = require('../../src/meta');
const install = require('../../src/install');
const user = require('../../src/user');
const categories = require('../../src/categories');
const posts = require('../../src/posts');
const topics = require('../../src/topics');
const activitypub = require('../../src/activitypub');
const utils = require('../../src/utils');
const helpers = require('./helpers');
describe('Notes', () => {
describe('Assertion', () => {
const baseUrl = 'https://example.org';
before(async () => {
meta.config.activitypubEnabled = 1;
await install.giveWorldPrivileges();
});
it('should pull a remote root-level object by its id and create a new topic', async () => {
const uuid = utils.generateUUID();
const id = `${baseUrl}/resource/${uuid}`;
activitypub._cache.set(`0;${id}`, {
'@context': 'https://www.w3.org/ns/activitystreams',
id,
url: id,
type: 'Note',
to: ['https://www.w3.org/ns/activitystreams#Public'],
cc: ['https://example.org/user/foobar/followers'],
inReplyTo: null,
attributedTo: 'https://example.org/user/foobar',
name: 'Foo Bar',
content: '<b>Baz quux</b>',
published: new Date().toISOString(),
describe('Public objects', () => {
it('should pull a remote root-level object by its id and create a new topic', async () => {
const { id } = helpers.mocks.note();
const { tid, count } = await activitypub.notes.assert(0, id, { skipChecks: true });
assert.strictEqual(count, 1);
const exists = await topics.exists(tid);
assert(exists);
});
const { tid, count } = await activitypub.notes.assert(0, id, { skipChecks: true });
assert.strictEqual(count, 1);
it('should assert if the cc property is missing', async () => {
const { id } = helpers.mocks.note({ cc: 'remove' });
const { tid, count } = await activitypub.notes.assert(0, id, { skipChecks: true });
assert.strictEqual(count, 1);
const exists = await topics.exists(tid);
assert(exists);
const exists = await topics.exists(tid);
assert(exists);
});
});
it('should assert if the cc property is missing', async () => {
const uuid = utils.generateUUID();
const id = `${baseUrl}/resource/${uuid}`;
activitypub._cache.set(`0;${id}`, {
'@context': 'https://www.w3.org/ns/activitystreams',
id,
url: id,
type: 'Note',
to: ['https://www.w3.org/ns/activitystreams#Public'],
inReplyTo: null,
attributedTo: 'https://example.org/user/foobar',
name: 'Foo Bar',
content: '<b>Baz quux</b>',
published: new Date().toISOString(),
describe('Private objects', () => {
let recipientUid;
before(async () => {
recipientUid = await user.create({ username: utils.generateUUID().slice(0, 8) });
});
const { tid, count } = await activitypub.notes.assert(0, id, { skipChecks: true });
assert.strictEqual(count, 1);
it('should NOT create a new topic or post when asserting a private note', async () => {
const { id, note } = helpers.mocks.note({
to: [`${nconf.get('url')}/uid/${recipientUid}`],
cc: [],
});
const { activity } = helpers.mocks.create(note);
const { roomId } = await activitypub.inbox.create({ body: activity });
assert(roomId);
assert(utils.isNumber(roomId));
const exists = await topics.exists(tid);
assert(exists);
const exists = await posts.exists(id);
assert(!exists);
});
it('should still assert if the cc property is missing', async () => {
const { id, note } = helpers.mocks.note({
to: [`${nconf.get('url')}/uid/${recipientUid}`],
cc: 'remove',
});
const { activity } = helpers.mocks.create(note);
const { roomId } = await activitypub.inbox.create({ body: activity });
assert(roomId);
assert(utils.isNumber(roomId));
});
});
});