diff options
| author | ThibG <thib@sitedethib.com> | 2020-02-06 22:48:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-06 22:48:26 +0100 |
| commit | 96ec90b986c8a2783135f123c10062725d274733 (patch) | |
| tree | 1cbb8b756a2e4d0770c19b834ede0326f99a3dcc /app/controllers | |
| parent | ccaefd139d33f2f0bf4d097131bcf91960bee956 (diff) | |
| parent | fe9a124f5a9f3a7cb6cfba141245cccb88c7dfbe (diff) | |
Merge pull request #1278 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/concerns/signature_verification.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/concerns/signature_verification.rb b/app/controllers/concerns/signature_verification.rb index ce353f1de..10efbf2e0 100644 --- a/app/controllers/concerns/signature_verification.rb +++ b/app/controllers/concerns/signature_verification.rb @@ -160,6 +160,8 @@ module SignatureVerification account ||= stoplight_wrap_request { ActivityPub::FetchRemoteKeyService.new.call(key_id, id: false) } account end + rescue Mastodon::HostValidationError + nil end def stoplight_wrap_request(&block) |