summaryrefslogtreecommitdiff
path: root/src/queue
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2020-05-15 20:53:29 +0900
committersyuilo <syuilotan@yahoo.co.jp>2020-05-15 20:53:29 +0900
commit6667b866502dc3a49e80a2c807c91f102f2681fd (patch)
tree15ec8bfb71acce4d89f5709ece2d7761a2c08e78 /src/queue
parentfix(client): Mk:api関数にトークンを渡せない問題 (diff)
parentリレーに不正なURLは追加できないように (#6351) (diff)
downloadmisskey-6667b866502dc3a49e80a2c807c91f102f2681fd.tar.gz
misskey-6667b866502dc3a49e80a2c807c91f102f2681fd.tar.bz2
misskey-6667b866502dc3a49e80a2c807c91f102f2681fd.zip
Merge branch 'develop' of https://github.com/syuilo/misskey into develop
Diffstat (limited to 'src/queue')
-rw-r--r--src/queue/processors/inbox.ts6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/queue/processors/inbox.ts b/src/queue/processors/inbox.ts
index 3a0bdbe28a..e0419cad28 100644
--- a/src/queue/processors/inbox.ts
+++ b/src/queue/processors/inbox.ts
@@ -90,6 +90,12 @@ export default async (job: Bull.Job<InboxJobData>): Promise<string> => {
if (authUser.user.uri !== activity.actor) {
return `skip: LD-Signature user(${authUser.user.uri}) !== activity.actor(${activity.actor})`;
}
+
+ // ブロックしてたら中断
+ const ldHost = extractDbHost(authUser.user.uri);
+ if (meta.blockedHosts.includes(ldHost)) {
+ return `Blocked request: ${ldHost}`;
+ }
} else {
throw `skip: http-signature verification failed.`;
}