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:
parent
c1f201c49a
commit
1618b68bfa
23 changed files with 379 additions and 90 deletions
|
@ -60,9 +60,7 @@ class Pubsubhubbub::ConfirmationWorker
|
|||
end
|
||||
|
||||
def callback_get_with_params
|
||||
HTTP.headers(user_agent: 'Mastodon/PubSubHubbub')
|
||||
.timeout(:per_operation, write: 20, connect: 20, read: 50)
|
||||
.get(subscription.callback_url, params: callback_params)
|
||||
Request.new(:get, subscription.callback_url, params: callback_params).perform
|
||||
end
|
||||
|
||||
def callback_response_body
|
||||
|
@ -71,10 +69,10 @@ class Pubsubhubbub::ConfirmationWorker
|
|||
|
||||
def callback_params
|
||||
{
|
||||
'hub.topic' => account_url(subscription.account, format: :atom),
|
||||
'hub.mode' => mode,
|
||||
'hub.challenge' => challenge,
|
||||
'hub.lease_seconds' => subscription.lease_seconds,
|
||||
'hub.topic': account_url(subscription.account, format: :atom),
|
||||
'hub.mode': mode,
|
||||
'hub.challenge': challenge,
|
||||
'hub.lease_seconds': subscription.lease_seconds,
|
||||
}
|
||||
end
|
||||
|
||||
|
|
|
@ -33,9 +33,9 @@ class Pubsubhubbub::DeliveryWorker
|
|||
end
|
||||
|
||||
def callback_post_payload
|
||||
HTTP.timeout(:per_operation, write: 50, connect: 20, read: 50)
|
||||
.headers(headers)
|
||||
.post(subscription.callback_url, body: payload)
|
||||
request = Request.new(:post, subscription.callback_url, body: payload)
|
||||
request.add_headers(headers)
|
||||
request.perform
|
||||
end
|
||||
|
||||
def blocked_domain?
|
||||
|
@ -48,13 +48,12 @@ class Pubsubhubbub::DeliveryWorker
|
|||
|
||||
def headers
|
||||
{
|
||||
'User-Agent' => 'Mastodon/PubSubHubbub',
|
||||
'Content-Type' => 'application/atom+xml',
|
||||
'Link' => link_headers,
|
||||
'Link' => link_header,
|
||||
}.merge(signature_headers.to_h)
|
||||
end
|
||||
|
||||
def link_headers
|
||||
def link_header
|
||||
LinkHeader.new([hub_link_header, self_link_header]).to_s
|
||||
end
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue