gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Fix #2672 - Connect signed PuSH subscription requests to instance domain (#4205)

Browse source 
* Fix #2672 - Connect signed PuSH subscription requests to instance domain

Resolves #2739

* Fix return of locate_subscription

* Fix tests
This commit is contained in:
Eugen Rochko 2017-07-14 23:01:20 +02:00 • committed by GitHub
parent de397f3bc1
commit cd9b2ab2f7
7 changed files with 33 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/services/pubsubhubbub/subscribe_service.rb
View file

@ -3,13 +3,15 @@
class Pubsubhubbub::SubscribeService < BaseService
URL_PATTERN = /\A#{URI.regexp(%w(http https))}\z/
attr_reader :account, :callback, :secret, :lease_seconds
attr_reader :account, :callback, :secret,
:lease_seconds, :domain
def call(account, callback, secret, lease_seconds)
def call(account, callback, secret, lease_seconds, verified_domain = nil)
@account = account
@callback = Addressable::URI.parse(callback).normalize.to_s
@secret = secret
@lease_seconds = lease_seconds
@domain = verified_domain
process_subscribe
end
@ -56,6 +58,14 @@ class Pubsubhubbub::SubscribeService < BaseService
end
def locate_subscription
Subscription.where(account: account, callback_url: callback).first_or_create!(account: account, callback_url: callback)
subscription = Subscription.find_by(account: account, callback_url: callback)
if subscription.nil?
subscription = Subscription.new(account: account, callback_url: callback)
end
subscription.domain = domain
subscription.save!
subscription
end
end