about summary refs log tree commit diff
path: root/app/controllers
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2020-02-06 21:36:38 +0100
committerThibaut Girka <thib@sitedethib.com>2020-02-06 21:36:38 +0100
commit1a54b9b99e85e9d6b3c52bfe654659019960eb24 (patch)
tree33fe0d6c546dade46cf7842959feff686db4f909 /app/controllers
parentccaefd139d33f2f0bf4d097131bcf91960bee956 (diff)
parentaeb6efbb03cd98c0425d094677fc748e0c36c240 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/concerns/signature_verification.rb2
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)