Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Refactor domain block checks (#11268)

Browse source
This commit is contained in:
Eugen Rochko 2019-07-09 03:27:35 +02:00 • committed by GitHub
parent 1e7187f2a8
commit 4e92183227
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 108 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/concerns/signature_verification.rb
View file

@ -5,6 +5,8 @@
module SignatureVerification
extend ActiveSupport::Concern
include DomainControlHelper
def signed_request?
request.headers['Signature'].present?
end
@ -126,6 +128,8 @@ module SignatureVerification
if key_id.start_with?('acct:')
stoplight_wrap_request { ResolveAccountService.new.call(key_id.gsub(/\Aacct:/, '')) }
elsif !ActivityPub::TagManager.instance.local_uri?(key_id)
return if domain_not_allowed?(key_id)
account = ActivityPub::TagManager.instance.uri_to_resource(key_id, Account)
account ||= stoplight_wrap_request { ActivityPub::FetchRemoteKeyService.new.call(key_id, id: false) }
account