HTTP signatures (#4146)

* Add Request class with HTTP signature generator

Spec: https://tools.ietf.org/html/draft-cavage-http-signatures-06

* Add HTTP signature verification concern

* Add test for SignatureVerification concern

* Add basic test for Request class

* Make PuSH subscribe/unsubscribe requests use new Request class

Accidentally fix lease_seconds not being set and sent properly, and
change the new minimum subscription duration to 1 day

* Make all PuSH workers use new Request class

* Make Salmon sender use new Request class

* Make FetchLinkService use new Request class

* Make FetchAtomService use the new Request class

* Make Remotable use the new Request class

* Make ResolveRemoteAccountService use the new Request class

* Add more tests

* Allow +-30 seconds window for signed request to remain valid

* Disable time window validation for signed requests, restore 7 days
as PuSH subscription duration (which was previous default due to a bug)
This commit is contained in:
Eugen Rochko 2017-07-14 20:41:49 +02:00 committed by GitHub
parent c1f201c49a
commit 1618b68bfa
23 changed files with 379 additions and 90 deletions

View file

@ -1,16 +1,14 @@
# frozen_string_literal: true
class FetchAtomService < BaseService
include HttpHelper
def call(url)
return if url.blank?
response = http_client.head(url)
response = Request.new(:head, url).perform
Rails.logger.debug "Remote status HEAD request returned code #{response.code}"
response = http_client.get(url) if response.code == 405
response = Request.new(:get, url).perform if response.code == 405
Rails.logger.debug "Remote status GET request returned code #{response.code}"
@ -49,6 +47,6 @@ class FetchAtomService < BaseService
end
def fetch(url)
http_client.get(url).to_s
Request.new(:get, url).perform.to_s
end
end

View file

@ -1,8 +1,6 @@
# frozen_string_literal: true
class FetchLinkCardService < BaseService
include HttpHelper
URL_PATTERN = %r{https?://\S+}
def call(status)
@ -13,7 +11,7 @@ class FetchLinkCardService < BaseService
url = url.to_s
card = PreviewCard.where(status: status).first_or_initialize(status: status, url: url)
res = http_client.head(url)
res = Request.new(:head, url).perform
return if res.code != 200 || res.mime_type != 'text/html'
@ -80,7 +78,7 @@ class FetchLinkCardService < BaseService
end
def attempt_opengraph(card, url)
response = http_client.get(url)
response = Request.new(:get, url).perform
return if response.code != 200 || response.mime_type != 'text/html'

View file

@ -2,7 +2,6 @@
class ResolveRemoteAccountService < BaseService
include OStatus2::MagicKey
include HttpHelper
DFRN_NS = 'http://purl.org/macgirvin/dfrn/1.0'
@ -79,7 +78,7 @@ class ResolveRemoteAccountService < BaseService
end
def get_feed(url)
response = http_client(write: 20, connect: 20, read: 50).get(Addressable::URI.parse(url).normalize)
response = Request.new(:get, url).perform
raise Goldfinger::Error, "Feed attempt failed for #{url}: HTTP #{response.code}" unless response.code == 200
[response.to_s, Nokogiri::XML(response)]
end

View file

@ -12,13 +12,23 @@ class SendInteractionService < BaseService
return if block_notification?
envelope = salmon.pack(@xml, @source_account.keypair)
delivery = salmon.post(@target_account.salmon_url, envelope)
delivery = build_request.perform
raise "Delivery failed for #{target_account.salmon_url}: HTTP #{delivery.code}" unless delivery.code > 199 && delivery.code < 300
end
private
def build_request
request = Request.new(:post, @target_account.salmon_url, body: envelope)
request.add_headers('Content-Type' => 'application/magic-envelope+xml')
request
end
def envelope
salmon.pack(@xml, @source_account.keypair)
end
def block_notification?
DomainBlock.blocked?(@target_account.domain)
end

View file

@ -2,34 +2,54 @@
class SubscribeService < BaseService
def call(account)
account.secret = SecureRandom.hex
@account = account
@account.secret = SecureRandom.hex
@response = build_request.perform
subscription = account.subscription(api_subscription_url(account.id))
response = subscription.subscribe
if response_failed_permanently?(response)
if response_failed_permanently?
# We're not allowed to subscribe. Fail and move on.
account.secret = ''
account.save!
elsif response_successful?(response)
@account.secret = ''
@account.save!
elsif response_successful?
# The subscription will be confirmed asynchronously.
account.save!
@account.save!
else
# The response was either a 429 rate limit, or a 5xx error.
# We need to retry at a later time. Fail loudly!
raise "Subscription attempt failed for #{account.acct} (#{account.hub_url}): HTTP #{response.code}"
raise "Subscription attempt failed for #{@account.acct} (#{@account.hub_url}): HTTP #{@response.code}"
end
end
private
def build_request
request = Request.new(:post, @account.hub_url, form: subscription_params)
request.on_behalf_of(some_local_account) if some_local_account
request
end
def subscription_params
{
'hub.topic': @account.remote_url,
'hub.mode': 'subscribe',
'hub.callback': api_subscription_url(@account.id),
'hub.verify': 'async',
'hub.secret': @account.secret,
'hub.lease_seconds': 7.days.seconds,
}
end
def some_local_account
@some_local_account ||= Account.local.first
end
# Any response in the 3xx or 4xx range, except for 429 (rate limit)
def response_failed_permanently?(response)
(response.status.redirect? || response.status.client_error?) && !response.status.too_many_requests?
def response_failed_permanently?
(@response.status.redirect? || @response.status.client_error?) && !@response.status.too_many_requests?
end
# Any response in the 2xx range
def response_successful?(response)
response.status.success?
def response_successful?
@response.status.success?
end
end

View file

@ -2,17 +2,30 @@
class UnsubscribeService < BaseService
def call(account)
subscription = account.subscription(api_subscription_url(account.id))
response = subscription.unsubscribe
@account = account
@response = build_request.perform
unless response.status.success?
Rails.logger.debug "PuSH unsubscribe for #{account.acct} failed: #{response.status}"
end
Rails.logger.debug "PuSH unsubscribe for #{@account.acct} failed: #{@response.status}" unless @response.status.success?
account.secret = ''
account.subscription_expires_at = nil
account.save!
@account.secret = ''
@account.subscription_expires_at = nil
@account.save!
rescue HTTP::Error, OpenSSL::SSL::SSLError
Rails.logger.debug "PuSH subscription request for #{account.acct} could not be made due to HTTP or SSL error"
Rails.logger.debug "PuSH subscription request for #{@account.acct} could not be made due to HTTP or SSL error"
end
private
def build_request
Request.new(:post, @account.hub_url, form: subscription_params)
end
def subscription_params
{
'hub.topic': @account.remote_url,
'hub.mode': 'unsubscribe',
'hub.callback': api_subscription_url(@account.id),
'hub.verify': 'async',
}
end
end