Bump to 1.5.0rc1 (#4318)

This commit is contained in:
Eugen Rochko 2017-07-24 16:21:08 +02:00 committed by GitHub
parent 467456f7a1
commit a549d1ae6b
3 changed files with 8 additions and 5 deletions

View File

@ -9,23 +9,27 @@ module Mastodon
end end
def minor def minor
4 5
end end
def patch def patch
7 0
end end
def pre def pre
nil nil
end end
def flags
'rc1'
end
def to_a def to_a
[major, minor, patch, pre].compact [major, minor, patch, pre].compact
end end
def to_s def to_s
to_a.join('.') [to_a.join('.'), flags].join
end end
end end
end end

View File

@ -83,6 +83,6 @@ describe Pubsubhubbub::ConfirmationWorker do
end end
def http_headers def http_headers
{ 'Connection' => 'close', 'Host' => 'example.com', 'User-Agent' => 'http.rb/2.2.2 (Mastodon/1.4.7; +https://cb6e6126.ngrok.io/)' } { 'Connection' => 'close', 'Host' => 'example.com' }
end end
end end

View File

@ -59,7 +59,6 @@ describe Pubsubhubbub::DeliveryWorker do
'Content-Type' => 'application/atom+xml', 'Content-Type' => 'application/atom+xml',
'Host' => 'example.com', 'Host' => 'example.com',
'Link' => "<https://#{Rails.configuration.x.local_domain}/api/push>; rel=\"hub\", <https://#{Rails.configuration.x.local_domain}/users/#{subscription.account.username}.atom>; rel=\"self\"", 'Link' => "<https://#{Rails.configuration.x.local_domain}/api/push>; rel=\"hub\", <https://#{Rails.configuration.x.local_domain}/users/#{subscription.account.username}.atom>; rel=\"self\"",
'User-Agent' => 'http.rb/2.2.2 (Mastodon/1.4.7; +https://cb6e6126.ngrok.io/)',
}.tap do |basic| }.tap do |basic|
known_digest = OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha1'), subscription.secret.to_s, payload) known_digest = OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha1'), subscription.secret.to_s, payload)
basic.merge('X-Hub-Signature' => "sha1=#{known_digest}") if subscription.secret? basic.merge('X-Hub-Signature' => "sha1=#{known_digest}") if subscription.secret?