From 83d0f819be4d20a5e6917da528e01fd3bee34e3d Mon Sep 17 00:00:00 2001
From: Kisaragi <48310258+KisaragiEffective@users.noreply.github.com>
Date: Fri, 14 Apr 2023 16:27:55 +0900
Subject: [PATCH] =?UTF-8?q?refactor(backend):=20validateNote=E3=81=AE?=
=?UTF-8?q?=E5=BC=95=E6=95=B0=E3=81=AE=E5=9E=8B=E3=82=92=E5=BC=B7=E3=81=8F?=
=?UTF-8?q?=E3=81=97=E3=80=81any=E3=82=92=E9=99=A4=E5=8E=BB=20(#10325)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* refactor(backend): validateNoteの引数の型を推論する
* fix(backend): アサーションの内容から推論してエラーの内容を期待されるであろう式へと変更する
* refactor
Co-authored-by: Acid-Chicken <root@acid-chicken.com>
---------
Co-authored-by: tamaina <tamaina@hotmail.co.jp>
Co-authored-by: Acid-Chicken <root@acid-chicken.com>
---
.../backend/src/core/activitypub/models/ApNoteService.ts | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/packages/backend/src/core/activitypub/models/ApNoteService.ts b/packages/backend/src/core/activitypub/models/ApNoteService.ts
index 5ca5f6e843..5bbb036e03 100644
--- a/packages/backend/src/core/activitypub/models/ApNoteService.ts
+++ b/packages/backend/src/core/activitypub/models/ApNoteService.ts
@@ -71,7 +71,7 @@ export class ApNoteService {
}
@bindThis
- public validateNote(object: any, uri: string) {
+ public validateNote(object: IObject, uri: string) {
const expectHost = this.utilityService.extractDbHost(uri);
if (object == null) {
@@ -85,9 +85,10 @@ export class ApNoteService {
if (object.id && this.utilityService.extractDbHost(object.id) !== expectHost) {
return new Error(`invalid Note: id has different host. expected: ${expectHost}, actual: ${this.utilityService.extractDbHost(object.id)}`);
}
-
- if (object.attributedTo && this.utilityService.extractDbHost(getOneApId(object.attributedTo)) !== expectHost) {
- return new Error(`invalid Note: attributedTo has different host. expected: ${expectHost}, actual: ${this.utilityService.extractDbHost(object.attributedTo)}`);
+
+ const actualHost = object.attributedTo && this.utilityService.extractDbHost(getOneApId(object.attributedTo));
+ if (object.attributedTo && actualHost !== expectHost) {
+ return new Error(`invalid Note: attributedTo has different host. expected: ${expectHost}, actual: ${actualHost}`);
}
return null;