Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

Reject JSON-LD objects with special properties

Chocobozzz85453c6ea268
diff --git a/packages/tests/src/api/activitypub/security.ts b/packages/tests/src/api/activitypub/security.ts
index 4a53230b0f..511ab8b57a 100644
--- a/packages/tests/src/api/activitypub/security.ts
+++ b/packages/tests/src/api/activitypub/security.ts
@@ -100,6 +100,27 @@ describe('Test ActivityPub security', function () {
headers: HTTP_SIGNATURE.HEADERS_TO_SIGN_WITH_PAYLOAD
})
+ async function postActivity (activity: any) {
+ const signer: any = { privateKey: keys.privateKey, url: servers[2].url + '/accounts/peertube' }
+ const signedBody: any = await signAndContextify({
+ byActor: signer,
+ data: activity,
+ contextType: 'Announce',
+ contextFilter: fakeFilter(),
+ signerFunction: signJsonLDObjectWithoutAssertion
+ })
+
+ const headers = buildGlobalHTTPHeaders(signedBody, buildDigest)
+
+ try {
+ await makePOSTAPRequest(url, signedBody, baseHttpSignature(), headers)
+
+ return { fail: false }
+ } catch (err) {
+ return { fail: true, statusCode: err.statusCode }
+ }
+ }
+
// ---------------------------------------------------------------
before(async function () {
@@ -297,23 +318,173 @@ describe('Test ActivityPub security', function () {
}
})
+ it('Should fail with an activity using @graph payload', async function () {
+ const activity: any = {
+ 'id': 'https://victim.example/users/alice/statuses/123/activity',
+ 'type': 'Announce',
+ 'actor': servers[2].url + '/accounts/peertube',
+ 'published': '2026-03-30T07:18:30Z',
+ 'to': [ 'https://www.w3.org/ns/activitystreams#Public' ],
+ 'cc': [ 'https://victim.example/users/alice/followers' ],
+ 'object': 'https://target.example/users/bob/statuses/456',
+ '@graph': [
+ {
+ id: 'https://victim.example/users/alice#announces/123/undo',
+ type: 'Undo',
+ actor: servers[2].url + '/accounts/peertube',
+ to: [ 'https://www.w3.org/ns/activitystreams#Public' ],
+ object: 'https://victim.example/users/alice/statuses/123/activity'
+ }
+ ]
+ }
+
+ const { fail, statusCode } = await postActivity(activity)
+ expect(fail).to.be.true
+ expect(statusCode).to.equal(HttpStatusCode.FORBIDDEN_403)
+ })
+
+ it('Should fail with an activity using @reverse payload', async function () {
+ const activity: any = {
+ 'id': 'https://victim.example/users/alice/statuses/123/activity',
+ 'type': 'Announce',
+ 'actor': servers[2].url + '/accounts/peertube',
+ 'published': '2026-03-30T07:18:30Z',
+ 'to': [ 'https://www.w3.org/ns/activitystreams#Public' ],
+ 'cc': [ 'https://victim.example/users/alice/followers' ],
+ 'object': 'https://target.example/users/bob/statuses/456',
+ '@reverse': {
+ object: {
+ id: 'https://victim.example/users/alice#announces/123/undo',
+ type: 'Undo',
+ actor: servers[2].url + '/accounts/peertube',
+ to: [ 'https://www.w3.org/ns/activitystreams#Public' ]
+ }
+ }
+ }
+
+ const { fail, statusCode } = await postActivity(activity)
+ expect(fail).to.be.true
+ expect(statusCode).to.equal(HttpStatusCode.FORBIDDEN_403)
+ })
+
+ it('Should fail with an activity using @included payload', async function () {
+ const activity: any = {
+ '@context': 'https://www.w3.org/ns/activitystreams',
+ 'id': 'https://alice.example/notes/42/activity',
+ 'type': 'Create',
+ 'actor': servers[2].url + '/accounts/peertube',
+
+ 'cc': 'https://www.w3.org/ns/activitystreams#Public',
+ 'object': {
+ id: 'https://alice.example/notes/42',
+ type: 'Note',
+ attributedTo: 'https://alice.example/actors/1',
+ cc: 'https://www.w3.org/ns/activitystreams#Public',
+ content: 'Welcome to Fediverse!'
+ },
+ '@included': {
+ id: 'https://alice.example/notes/42/activity',
+ to: 'https://bob.example/actors/1',
+ object: {
+ id: 'https://alice.example/notes/42',
+ to: 'https://bob.example/actors/1',
+ inReplyTo: 'https://bob.example/notes/1'
+ }
+ }
+ }
+
+ const { fail, statusCode } = await postActivity(activity)
+ expect(fail).to.be.true
+ expect(statusCode).to.equal(HttpStatusCode.FORBIDDEN_403)
+ })
+
+ it('Should fail with an activity using aliased @included payload', async function () {
+ const activity: any = {
+ '@context': [ 'https://www.w3.org/ns/activitystreams', { included: '@included' } ],
+ 'id': 'https://alice.example/notes/42/activity',
+ 'type': 'Create',
+ 'actor': servers[2].url + '/accounts/peertube',
+ 'cc': 'https://www.w3.org/ns/activitystreams#Public',
+ 'object': {
+ id: 'https://alice.example/notes/42',
+ type: 'Note',
+ attributedTo: 'https://alice.example/actors/1',
+ cc: 'https://www.w3.org/ns/activitystreams#Public',
+ content: 'Welcome to Fediverse!'
+ },
+ 'included': {
+ id: 'https://alice.example/notes/42/activity',
+ to: 'https://bob.example/actors/1',
+ object: {
+ id: 'https://alice.example/notes/42',
+ to: 'https://bob.example/actors/1',
+ inReplyTo: 'https://bob.example/notes/1'
+ }
+ }
+ }
+
+ const { fail, statusCode } = await postActivity(activity)
+ expect(fail).to.be.true
+ expect(statusCode).to.equal(HttpStatusCode.FORBIDDEN_403)
+ })
+
+ it('Should fail with an activity using inner @included payload', async function () {
+ const activity: any = {
+ '@context': [ 'https://www.w3.org/ns/activitystreams', { included: '@included' } ],
+ 'id': 'https://alice.example/notes/42/activity',
+ 'type': 'Create',
+ 'actor': servers[2].url + '/accounts/peertube',
+ 'cc': 'https://www.w3.org/ns/activitystreams#Public',
+ 'object': {
+ id: 'https://alice.example/notes/42',
+ type: 'Note',
+ attributedTo: 'https://alice.example/actors/1',
+ cc: 'https://www.w3.org/ns/activitystreams#Public',
+ content: 'Welcome to Fediverse!',
+ included: {
+ id: 'https://alice.example/notes/42/activity',
+ to: 'https://bob.example/actors/1',
+ object: {
+ id: 'https://alice.example/notes/42',
+ to: 'https://bob.example/actors/1',
+ inReplyTo: 'https://bob.example/notes/1'
+ }
+ }
+ }
+ }
+
+ const { fail, statusCode } = await postActivity(activity)
+ expect(fail).to.be.true
+ expect(statusCode).to.equal(HttpStatusCode.FORBIDDEN_403)
+ })
+
it('Should succeed with a valid signature', async function () {
- const body = getAnnounceWithoutContext(servers[1])
- body.actor = servers[2].url + '/accounts/peertube'
+ {
+ const activity = getAnnounceWithoutContext(servers[1])
- const signer: any = { privateKey: keys.privateKey, url: servers[2].url + '/accounts/peertube' }
- const signedBody = await signAndContextify({
- byActor: signer,
- data: body,
- contextType: 'Announce',
- contextFilter: fakeFilter(),
- signerFunction: signJsonLDObjectWithoutAssertion
- })
+ const { fail } = await postActivity(activity)
+ expect(fail).to.be.false
+ }
- const headers = buildGlobalHTTPHeaders(signedBody, buildDigest)
+ {
+ const activity: any = {
+ '@context': 'https://www.w3.org/ns/activitystreams',
+ 'id': 'https://alice.example/notes/42/activity',
+ 'type': 'Create',
+ 'actor': servers[2].url + '/accounts/peertube',
+ 'cc': 'https://www.w3.org/ns/activitystreams#Public',
+ 'object': {
+ id: 'https://alice.example/notes/42',
+ type: 'Note',
+ attributedTo: 'https://alice.example/actors/1',
+ cc: 'https://www.w3.org/ns/activitystreams#Public',
+ content: 'Welcome to Fediverse!'
+ }
+ }
- const { statusCode } = await makePOSTAPRequest(url, signedBody, baseHttpSignature(), headers)
- expect(statusCode).to.equal(HttpStatusCode.NO_CONTENT_204)
+ const { fail, statusCode } = await postActivity(activity)
+ expect(fail).to.be.false
+ }
})
it('Should refresh the actor keys', async function () {
diff --git a/server/core/helpers/peertube-jsonld.ts b/server/core/helpers/peertube-jsonld.ts
index d42e9a88ee..f802377ac7 100644
--- a/server/core/helpers/peertube-jsonld.ts
+++ b/server/core/helpers/peertube-jsonld.ts
@@ -29,8 +29,8 @@ export async function compactJSONLDAndCheckRSA2017Signature (fromActor: MActor,
req.body = { ...compacted, signature: req.body.signature }
- if (compacted['@include']) {
- logger.warn('JSON-LD @include is not supported')
+ if (containInvalidJsonldKeys(compacted)) {
+ logger.warn('JSON-LD @included, @graph or @reverse are not supported')
return false
}
@@ -151,3 +151,17 @@ function createDocWithoutSignatureHash (doc: any) {
return hashObject(docWithoutSignature)
}
+
+function containInvalidJsonldKeys (obj: any, depth = 1) {
+ if (depth > 20) return true
+
+ if (typeof obj !== 'object' || obj === null) return false
+
+ if (Array.isArray(obj)) {
+ return obj.some(item => containInvalidJsonldKeys(item, depth + 1))
+ }
+
+ if ('@included' in obj || '@graph' in obj || '@reverse' in obj) return true
+
+ return Object.values(obj).some(value => containInvalidJsonldKeys(value, depth + 1))
+}