Actor publicKeyはArrayでもいいように (#4991)

mei23 · Jul 21, 2024 · b4aa3e0 · b4aa3e0
1 parent 58492e2
commit b4aa3e0
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/src/remote/activitypub/models/person.ts b/src/remote/activitypub/models/person.ts
@@ -79,12 +79,13 @@ function validateActor(x: IObject, uri: string): IActor {
 		throw new Error('invalid Actor: id has different host');
 	}
 
-	if (x.publicKey) {
-		if (typeof x.publicKey.id !== 'string') {
+	const publicKey = toSingle(x.publicKey);
+	if (publicKey) {
+		if (typeof publicKey.id !== 'string') {
 			throw new Error('invalid Actor: publicKey.id is not a string');
 		}
 
-		const publicKeyIdHost = toUnicode(new URL(x.publicKey.id).hostname.toLowerCase());
+		const publicKeyIdHost = toUnicode(new URL(publicKey.id).hostname.toLowerCase());
 		if (publicKeyIdHost !== expectHost) {
 			throw new Error('invalid Actor: publicKey.id has different host');
 		}
@@ -145,6 +146,8 @@ export async function createPerson(uri: string, resolver?: Resolver): Promise<IR
 
 	const bday = person['vcard:bday']?.match(/^[0-9]{4,8}-\d{2}-\d{2}/);
 
+	const publicKey = toSingle(person.publicKey);
+
 	// Create user
 	let user: IRemoteUser | undefined;
 	try {
@@ -164,9 +167,9 @@ export async function createPerson(uri: string, resolver?: Resolver): Promise<IR
 			username: person.preferredUsername,
 			usernameLower: person.preferredUsername.toLowerCase(),
 			host,
-			publicKey: person.publicKey ? {
-				id: person.publicKey.id,
-				publicKeyPem: person.publicKey.publicKeyPem
+			publicKey: publicKey ? {
+				id: publicKey.id,
+				publicKeyPem: publicKey.publicKeyPem
 			} : undefined,
 			inbox: person.inbox,
 			sharedInbox: person.sharedInbox || (person.endpoints ? person.endpoints.sharedInbox : undefined),
@@ -358,6 +361,8 @@ export async function updatePerson(uri: string, resolver?: Resolver, hint?: IAct
 
 	const bday = person['vcard:bday']?.match(/^[0-9]{4,8}-\d{2}-\d{2}/);
 
+	const publicKey = toSingle(person.publicKey);
+
 	const updates = {
 		lastFetchedAt: new Date(),
 		inbox: person.inbox,
@@ -387,9 +392,9 @@ export async function updatePerson(uri: string, resolver?: Resolver, hint?: IAct
 		isLocked: person.manuallyApprovesFollowers,
 		isExplorable: !!person.discoverable,
 		searchableBy: parseSearchableBy(person),
-		publicKey: person.publicKey ? {
-			id: person.publicKey.id,
-			publicKeyPem: person.publicKey.publicKeyPem
+		publicKey: publicKey ? {
+			id: publicKey.id,
+			publicKeyPem: publicKey.publicKeyPem
 		} : undefined,
 	} as any;
 

diff --git a/src/remote/activitypub/type.ts b/src/remote/activitypub/type.ts
@@ -243,7 +243,10 @@ export interface IActor extends IObject {
 	publicKey?: {
 		id: string;
 		publicKeyPem: string;
-	};
+	} | {
+		id: string;
+		publicKeyPem: string;
+	}[];
 	followers?: string | ICollection | IOrderedCollection;
 	following?: string | ICollection | IOrderedCollection;
 	featured?: string | IOrderedCollection;