FIXED_CONTEXT

mei23 · Apr 29, 2024 · 1c2b962 · 1c2b962
1 parent aa6ebf7
commit 1c2b962
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 37 deletions.
diff --git a/src/queue/processors/inbox.ts b/src/queue/processors/inbox.ts
@@ -22,6 +22,7 @@ import resolveUser from '../../remote/resolve-user';
 import config from '../../config';
 import { publishInstanceModUpdated } from '../../services/server-event';
 import { StatusError } from '../../misc/fetch';
+import { FIXED_CONTEXT } from '../../remote/activitypub/misc/contexts';
 
 const logger = new Logger('inbox');
 
@@ -124,7 +125,7 @@ export const tryProcessInbox = async (data: InboxJobData, ctx?: ApContext): Prom
 
 			const activity2 = JSON.parse(JSON.stringify(activity));
 			delete activity2.signature;
-			const compacted = await ldSignature.compact(activity2);
+			const compacted = await ldSignature.compact(activity2, FIXED_CONTEXT);
 			activity = compacted as any;
 		} else {
 			return `skip: http-signature verification failed and ${config.ignoreApForwarded ? 'ignoreApForwarded' : 'no LD-Signature'}. keyId=${signature.keyId}`;

diff --git a/src/remote/activitypub/misc/contexts.ts b/src/remote/activitypub/misc/contexts.ts
@@ -524,3 +524,38 @@ export const CONTEXTS: Record<string, any> = {
   "https://w3id.org/security/v1": security_v1,
   "https://www.w3.org/ns/activitystreams": activitystreams,
 };
+
+export const FIXED_CONTEXT = [
+	'https://www.w3.org/ns/activitystreams',
+	'https://w3id.org/security/v1',
+	{
+		Key: 'sec:Key',
+		// as non-standards
+		manuallyApprovesFollowers: 'as:manuallyApprovesFollowers',
+		sensitive: 'as:sensitive',
+		Hashtag: 'as:Hashtag',
+		// Mastodon
+		toot: 'http://joinmastodon.org/ns#',
+		Emoji: 'toot:Emoji',
+		featured: 'toot:featured',
+		discoverable: 'toot:discoverable',
+		indexable: 'toot:indexable',
+		// schema
+		schema: 'http://schema.org#',
+		PropertyValue: 'schema:PropertyValue',
+		value: 'schema:value',
+		// Misskey
+		misskey: 'https://misskey-hub.net/ns#',
+		'_misskey_content': 'misskey:_misskey_content',
+		'_misskey_quote': 'misskey:_misskey_quote',
+		'_misskey_reaction': 'misskey:_misskey_reaction',
+		'_misskey_votes': 'misskey:_misskey_votes',
+		'isCat': 'misskey:isCat',
+		// vcard
+		vcard: 'http://www.w3.org/2006/vcard/ns#',
+		// Fedibird
+		fedibird: 'http://fedibird.com/ns#',
+		quoteUri: 'fedibird:quoteUri',
+		searchableBy: { '@id': 'fedibird:searchableBy', '@type': '@id' },
+	}
+];
diff --git a/src/remote/activitypub/misc/ld-signature.ts b/src/remote/activitypub/misc/ld-signature.ts
@@ -103,9 +103,9 @@ export class LdSignature {
 		});
 	}
 
-	public async compact(data: any) {
+	public async compact(data: any, context: any) {
 		const customLoader = this.getLoader();
-		return await jsonld.compact(data, data['@context'], {
+		return await jsonld.compact(data, context, {
 			documentLoader: customLoader
 		});
 	}

diff --git a/src/remote/activitypub/renderer/index.ts b/src/remote/activitypub/renderer/index.ts
@@ -3,6 +3,7 @@ import { v4 as uuid } from 'uuid';
 import { IActivity } from '../type';
 import { LdSignature } from '../misc/ld-signature';
 import { ILocalUser } from '../../../models/user';
+import { FIXED_CONTEXT } from '../misc/contexts';
 
 export const renderActivity = (x: any): IActivity | null => {
 	if (x == null) return null;
@@ -12,40 +13,7 @@ export const renderActivity = (x: any): IActivity | null => {
 	}
 
 	return Object.assign({
-		'@context': [
-			'https://www.w3.org/ns/activitystreams',
-			'https://w3id.org/security/v1',
-			{
-				Key: 'sec:Key',
-				// as non-standards
-				manuallyApprovesFollowers: 'as:manuallyApprovesFollowers',
-				sensitive: 'as:sensitive',
-				Hashtag: 'as:Hashtag',
-				// Mastodon
-				toot: 'http://joinmastodon.org/ns#',
-				Emoji: 'toot:Emoji',
-				featured: 'toot:featured',
-				discoverable: 'toot:discoverable',
-				indexable: 'toot:indexable',
-				// schema
-				schema: 'http://schema.org#',
-				PropertyValue: 'schema:PropertyValue',
-				value: 'schema:value',
-				// Misskey
-				misskey: 'https://misskey-hub.net/ns#',
-				'_misskey_content': 'misskey:_misskey_content',
-				'_misskey_quote': 'misskey:_misskey_quote',
-				'_misskey_reaction': 'misskey:_misskey_reaction',
-				'_misskey_votes': 'misskey:_misskey_votes',
-				'isCat': 'misskey:isCat',
-				// vcard
-				vcard: 'http://www.w3.org/2006/vcard/ns#',
-				// Fedibird
-				fedibird: 'http://fedibird.com/ns#',
-				quoteUri: 'fedibird:quoteUri',
-				searchableBy: { '@id': 'fedibird:searchableBy', '@type': '@id' },
-			}
-		]
+		'@context': FIXED_CONTEXT
 	}, x);
 };