diff options
| author | syuilo <4439005+syuilo@users.noreply.github.com> | 2024-09-28 18:15:32 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-28 18:15:32 +0900 |
| commit | f0d0cd2e5042fb30cf3ef1c2717540391ee97aac (patch) | |
| tree | 13fd1980e127ac4f762ea7a9e6d4bf73fac8a888 /packages/backend/src/queue/processors/InboxProcessorService.ts | |
| parent | Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop (diff) | |
| download | sharkey-f0d0cd2e5042fb30cf3ef1c2717540391ee97aac.tar.gz sharkey-f0d0cd2e5042fb30cf3ef1c2717540391ee97aac.tar.bz2 sharkey-f0d0cd2e5042fb30cf3ef1c2717540391ee97aac.zip | |
wip (#14643)
Diffstat (limited to 'packages/backend/src/queue/processors/InboxProcessorService.ts')
| -rw-r--r-- | packages/backend/src/queue/processors/InboxProcessorService.ts | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/packages/backend/src/queue/processors/InboxProcessorService.ts b/packages/backend/src/queue/processors/InboxProcessorService.ts index 68999b5d17..09d51bec72 100644 --- a/packages/backend/src/queue/processors/InboxProcessorService.ts +++ b/packages/backend/src/queue/processors/InboxProcessorService.ts @@ -75,8 +75,7 @@ export class InboxProcessorService implements OnApplicationShutdown { const host = this.utilityService.toPuny(new URL(signature.keyId).hostname); - // ブロックしてたら中断 - if (this.utilityService.isBlockedHost(this.meta.blockedHosts, host)) { + if (!this.utilityService.isFederationAllowedHost(host)) { return `Blocked request: ${host}`; } @@ -175,9 +174,8 @@ export class InboxProcessorService implements OnApplicationShutdown { throw new Bull.UnrecoverableError(`skip: LD-Signature user(${authUser.user.uri}) !== activity.actor(${activity.actor})`); } - // ブロックしてたら中断 const ldHost = this.utilityService.extractDbHost(authUser.user.uri); - if (this.utilityService.isBlockedHost(this.meta.blockedHosts, ldHost)) { + if (!this.utilityService.isFederationAllowedHost(ldHost)) { throw new Bull.UnrecoverableError(`Blocked request: ${ldHost}`); } } else { |