Add spec for Pubsubhubbub::DistributionWorker. PuSH-deliver public items (#2954)

to all subscribers. IDN-normalize callback URLs for subscriptions on insert.
This commit is contained in:
Eugen Rochko 2017-05-10 02:55:43 +02:00 committed by GitHub
parent 29d8313b28
commit 3a38322a54
4 changed files with 67 additions and 15 deletions

View file

@ -6,9 +6,9 @@ class Pubsubhubbub::SubscribeService < BaseService
attr_reader :account, :callback, :secret, :lease_seconds attr_reader :account, :callback, :secret, :lease_seconds
def call(account, callback, secret, lease_seconds) def call(account, callback, secret, lease_seconds)
@account = account @account = account
@callback = callback @callback = Addressable::URI.parse(callback).normalize.to_s
@secret = secret @secret = secret
@lease_seconds = lease_seconds @lease_seconds = lease_seconds
process_subscribe process_subscribe
@ -52,7 +52,7 @@ class Pubsubhubbub::SubscribeService < BaseService
end end
def blocked_domain? def blocked_domain?
DomainBlock.blocked? Addressable::URI.parse(callback).normalize.host DomainBlock.blocked? Addressable::URI.parse(callback).host
end end
def locate_subscription def locate_subscription

View file

@ -1,11 +1,11 @@
# frozen_string_literal: true # frozen_string_literal: true
class Pubsubhubbub::UnsubscribeService < BaseService class Pubsubhubbub::UnsubscribeService < BaseService
attr_reader :account, :callback_url attr_reader :account, :callback
def call(account, callback_url) def call(account, callback)
@account = account @account = account
@callback_url = callback_url @callback = Addressable::URI.parse(callback).normalize.to_s
process_unsubscribe process_unsubscribe
end end
@ -26,6 +26,6 @@ class Pubsubhubbub::UnsubscribeService < BaseService
end end
def subscription def subscription
@_subscription ||= Subscription.find_by(account: account, callback_url: callback_url) @_subscription ||= Subscription.find_by(account: account, callback_url: callback)
end end
end end

View file

@ -10,15 +10,21 @@ class Pubsubhubbub::DistributionWorker
return if stream_entry.status&.direct_visibility? return if stream_entry.status&.direct_visibility?
account = stream_entry.account @account = stream_entry.account
payload = AtomSerializer.render(AtomSerializer.new.feed(account, [stream_entry])) @payload = AtomSerializer.render(AtomSerializer.new.feed(@account, [stream_entry]))
domains = account.followers_domains @domains = @account.followers_domains
Subscription.where(account: account).active.select('id, callback_url').find_each do |subscription| Subscription.where(account: @account).active.select('id, callback_url').find_each do |subscription|
next unless domains.include?(Addressable::URI.parse(subscription.callback_url).host) next if stream_entry.hidden? && !allowed_to_receive?(subscription.callback_url)
Pubsubhubbub::DeliveryWorker.perform_async(subscription.id, payload) Pubsubhubbub::DeliveryWorker.perform_async(subscription.id, @payload)
end end
rescue ActiveRecord::RecordNotFound rescue ActiveRecord::RecordNotFound
true true
end end
private
def allowed_to_receive?(callback_url)
@domains.include?(Addressable::URI.parse(callback_url).host)
end
end end

View file

@ -0,0 +1,46 @@
require 'rails_helper'
describe Pubsubhubbub::DistributionWorker do
subject { Pubsubhubbub::DistributionWorker.new }
let!(:alice) { Fabricate(:account, username: 'alice') }
let!(:bob) { Fabricate(:account, username: 'bob', domain: 'example2.com') }
let!(:anonymous_subscription) { Fabricate(:subscription, account_id: alice.id, callback_url: 'http://example1.com', confirmed: true, lease_seconds: 3600) }
let!(:subscription_with_follower) { Fabricate(:subscription, account_id: alice.id, callback_url: 'http://example2.com', confirmed: true, lease_seconds: 3600) }
before do
bob.follow!(alice)
end
describe 'with public status' do
let(:status) { Fabricate(:status, account: alice, text: 'Hello', visibility: :public) }
it 'delivers payload to all subscriptions' do
allow(Pubsubhubbub::DeliveryWorker).to receive(:perform_async)
subject.perform(status.stream_entry.id)
expect(Pubsubhubbub::DeliveryWorker).to have_received(:perform_async).with(subscription_with_follower.id, /.*/)
expect(Pubsubhubbub::DeliveryWorker).to have_received(:perform_async).with(anonymous_subscription.id, /.*/)
end
end
describe 'with private status' do
let(:status) { Fabricate(:status, account: alice, text: 'Hello', visibility: :private) }
it 'delivers payload only to subscriptions with followers' do
allow(Pubsubhubbub::DeliveryWorker).to receive(:perform_async)
subject.perform(status.stream_entry.id)
expect(Pubsubhubbub::DeliveryWorker).to have_received(:perform_async).with(subscription_with_follower.id, /.*/)
expect(Pubsubhubbub::DeliveryWorker).to_not have_received(:perform_async).with(anonymous_subscription.id, /.*/)
end
end
describe 'with direct status' do
let(:status) { Fabricate(:status, account: alice, text: 'Hello', visibility: :direct) }
it 'does not deliver payload' do
allow(Pubsubhubbub::DeliveryWorker).to receive(:perform_async)
subject.perform(status.stream_entry.id)
expect(Pubsubhubbub::DeliveryWorker).to_not have_received(:perform_async)
end
end
end