Merge branch 'master' into glitch-soc/merge-upstream

2020-02-06 21:36:38 +01:00
parent ccaefd139d aeb6efbb03
commit 1a54b9b99e
156 changed files with 1830 additions and 544 deletions
--- 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)