Merge tag '10.102.699-m544' into custom/atsuchan

10.102.699-m544

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "mei23 <m@m544.net>",
-	"version": "10.102.698-m544",
+	"version": "10.102.699-m544",
 	"codename": "m544",
 	"repository": {
 		"type": "git",
@@ -95,7 +95,7 @@
 		"jsdom": "20.0.3",
 		"json5": "2.2.3",
 		"json5-loader": "4.0.1",
-		"jsonld": "5.2.0",
+		"jsonld": "8.3.2",
 		"katex": "0.16.10",
 		"koa": "2.15.2",
 		"koa-bodyparser": "4.4.1",

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');
 
@@ -37,7 +38,7 @@ type ApContext = {
 
 export const tryProcessInbox = async (data: InboxJobData, ctx?: ApContext): Promise<string> => {
 	const signature = data.signature;
-	const activity = data.activity;
+	let activity = data.activity;
 
 	const resolver = ctx?.resolver || new Resolver();
 
@@ -111,6 +112,11 @@ export const tryProcessInbox = async (data: InboxJobData, ctx?: ApContext): Prom
 				return `skip: LD-Signatureの検証に失敗しました`;
 			}
 
+			const activity2 = JSON.parse(JSON.stringify(activity));
+			delete activity2.signature;
+			const compacted = await ldSignature.compact(activity2, FIXED_CONTEXT);
+			activity = compacted as any;
+
 			// もう一度actorチェック
 			if (user.uri !== activity.actor) {
 				return `skip: LD-Signature user(${user.uri}) !== activity.actor(${activity.actor})`;

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' },
+	}
+];

src/remote/activitypub/misc/ld-signature.ts

@@ -103,6 +103,13 @@ export class LdSignature {
 		});
 	}
 
+	public async compact(data: any, context: any) {
+		const customLoader = this.getLoader();
+		return await jsonld.compact(data, context, {
+			documentLoader: customLoader
+		});
+	}
+
 	private getLoader() {
 		return async (url: string): Promise<any> => {
 			if (!url.match('^https?\:\/\/')) throw `Invalid URL ${url}`;

src/remote/activitypub/models/image.ts

@@ -23,7 +23,7 @@ export async function createImage(actor: IRemoteUser, value: IObject): Promise<I
 	if (!isDocument(image)) return null;
 
 	if (typeof image.url !== 'string') {
-		throw new Error('invalid image: url not privided');
+		return null;
 	}
 
 	logger.info(`Creating the Image: ${image.url}`);
@@ -68,7 +68,7 @@ export async function createImage(actor: IRemoteUser, value: IObject): Promise<I
  * Misskeyに対象のImageが登録されていればそれを返し、そうでなければ
  * リモートサーバーからフェッチしてMisskeyに登録しそれを返します。
  */
-export async function resolveImage(actor: IRemoteUser, value: IObject): Promise<IDriveFile> {
+export async function resolveImage(actor: IRemoteUser, value: IObject): Promise<IDriveFile | null | undefined> {
 	// TODO
 
 	// リモートサーバーからフェッチしてきて登録