Adding embedded PuSH server
This commit is contained in:
parent
26287b6e7d
commit
2d2c81765b
21 changed files with 262 additions and 8 deletions
37
app/controllers/api/push_controller.rb
Normal file
37
app/controllers/api/push_controller.rb
Normal file
|
@ -0,0 +1,37 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
class Api::PushController < ApiController
|
||||
def update
|
||||
mode = params['hub.mode']
|
||||
topic = params['hub.topic']
|
||||
callback = params['hub.callback']
|
||||
lease_seconds = params['hub.lease_seconds']
|
||||
secret = params['hub.secret']
|
||||
|
||||
case mode
|
||||
when 'subscribe'
|
||||
response, status = Pubsubhubbub::SubscribeService.new.call(topic_to_account(topic), callback, secret, lease_seconds)
|
||||
when 'unsubscribe'
|
||||
response, status = Pubsubhubbub::UnsubscribeService.new.call(topic_to_account(topic), callback)
|
||||
else
|
||||
response = "Unknown mode: #{mode}"
|
||||
status = 422
|
||||
end
|
||||
|
||||
render plain: response, status: status
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def topic_to_account(topic_url)
|
||||
return if topic_url.blank?
|
||||
|
||||
uri = Addressable::URI.parse(topic_url)
|
||||
params = Rails.application.routes.recognize_path(uri.path)
|
||||
domain = uri.host + (uri.port ? ":#{uri.port}" : '')
|
||||
|
||||
return unless TagManager.instance.local_domain?(domain) && params[:controller] == 'accounts' && params[:action] == 'show' && params[:format] == 'atom'
|
||||
|
||||
Account.find_local(params[:username])
|
||||
end
|
||||
end
|
|
@ -44,8 +44,12 @@ class Account < ApplicationRecord
|
|||
has_many :block_relationships, class_name: 'Block', foreign_key: 'account_id', dependent: :destroy
|
||||
has_many :blocking, -> { order('blocks.id desc') }, through: :block_relationships, source: :target_account
|
||||
|
||||
# Media
|
||||
has_many :media_attachments, dependent: :destroy
|
||||
|
||||
# PuSH subscriptions
|
||||
has_many :subscriptions, dependent: :destroy
|
||||
|
||||
pg_search_scope :search_for, against: { username: 'A', domain: 'B' }, using: { tsearch: { prefix: true } }
|
||||
|
||||
scope :remote, -> { where.not(domain: nil) }
|
||||
|
|
29
app/models/subscription.rb
Normal file
29
app/models/subscription.rb
Normal file
|
@ -0,0 +1,29 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
class Subscription < ApplicationRecord
|
||||
MIN_EXPIRATION = 3600 * 24
|
||||
MAX_EXPIRATION = 3600 * 24 * 30
|
||||
|
||||
belongs_to :account
|
||||
|
||||
validates :callback_url, presence: true
|
||||
validates :callback_url, uniqueness: { scope: :account_id }
|
||||
|
||||
scope :active, -> { where(confirmed: true).where('expires_at > ?', Time.now.utc) }
|
||||
|
||||
def lease_seconds=(str)
|
||||
self.expires_at = Time.now.utc + [[MIN_EXPIRATION, str.to_i].max, MAX_EXPIRATION].min.seconds
|
||||
end
|
||||
|
||||
def lease_seconds
|
||||
(expires_at - Time.now.utc).to_i
|
||||
end
|
||||
|
||||
before_validation :set_min_expiration
|
||||
|
||||
private
|
||||
|
||||
def set_min_expiration
|
||||
self.lease_seconds = 0 unless expires_at
|
||||
end
|
||||
end
|
|
@ -7,7 +7,9 @@ class FavouriteService < BaseService
|
|||
# @return [Favourite]
|
||||
def call(account, status)
|
||||
favourite = Favourite.create!(account: account, status: status)
|
||||
|
||||
HubPingWorker.perform_async(account.id)
|
||||
Pubsubhubbub::DistributionWorker.perform_async(favourite.stream_entry.id)
|
||||
|
||||
if status.local?
|
||||
NotifyService.new.call(status.account, favourite)
|
||||
|
|
|
@ -19,7 +19,10 @@ class FollowService < BaseService
|
|||
end
|
||||
|
||||
merge_into_timeline(target_account, source_account)
|
||||
|
||||
HubPingWorker.perform_async(source_account.id)
|
||||
Pubsubhubbub::DistributionWorker.perform_async(follow.stream_entry.id)
|
||||
|
||||
follow
|
||||
end
|
||||
|
||||
|
|
|
@ -14,8 +14,11 @@ class PostStatusService < BaseService
|
|||
attach_media(status, options[:media_ids])
|
||||
process_mentions_service.call(status)
|
||||
process_hashtags_service.call(status)
|
||||
|
||||
DistributionWorker.perform_async(status.id)
|
||||
HubPingWorker.perform_async(account.id)
|
||||
Pubsubhubbub::DistributionWorker.perform_async(status.stream_entry.id)
|
||||
|
||||
status
|
||||
end
|
||||
|
||||
|
|
13
app/services/pubsubhubbub/subscribe_service.rb
Normal file
13
app/services/pubsubhubbub/subscribe_service.rb
Normal file
|
@ -0,0 +1,13 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
class Pubsubhubbub::SubscribeService < BaseService
|
||||
def call(account, callback, secret, lease_seconds)
|
||||
return ['Invalid topic URL', 422] if account.nil?
|
||||
return ['Invalid callback URL', 422] unless !callback.blank? && callback =~ /\A#{URI.regexp(%w(http https))}\z/
|
||||
|
||||
subscription = Subscription.where(account: account, callback_url: callback).first_or_create!(account: account, callback_url: callback)
|
||||
Pubsubhubbub::ConfirmationWorker.perform_async(subscription.id, 'subscribe', secret, lease_seconds)
|
||||
|
||||
['', 202]
|
||||
end
|
||||
end
|
15
app/services/pubsubhubbub/unsubscribe_service.rb
Normal file
15
app/services/pubsubhubbub/unsubscribe_service.rb
Normal file
|
@ -0,0 +1,15 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
class Pubsubhubbub::SubscribeService < BaseService
|
||||
def call(account, callback)
|
||||
return ['Invalid topic URL', 422] if account.nil?
|
||||
|
||||
subscription = Subscription.where(account: account, callback_url: callback)
|
||||
|
||||
unless subscription.nil?
|
||||
Pubsubhubbub::ConfirmationWorker.perform_async(subscription.id, 'unsubscribe')
|
||||
end
|
||||
|
||||
['', 202]
|
||||
end
|
||||
end
|
|
@ -7,8 +7,10 @@ class ReblogService < BaseService
|
|||
# @return [Status]
|
||||
def call(account, reblogged_status)
|
||||
reblog = account.statuses.create!(reblog: reblogged_status, text: '')
|
||||
|
||||
DistributionWorker.perform_async(reblog.id)
|
||||
HubPingWorker.perform_async(account.id)
|
||||
Pubsubhubbub::DistributionWorker.perform_async(reblog.stream_entry.id)
|
||||
|
||||
if reblogged_status.local?
|
||||
NotifyService.new.call(reblogged_status.account, reblog)
|
||||
|
|
|
@ -10,6 +10,9 @@ class RemoveStatusService < BaseService
|
|||
remove_from_public(status)
|
||||
|
||||
status.destroy!
|
||||
|
||||
HubPingWorker.perform_async(status.account.id)
|
||||
Pubsubhubbub::DistributionWorker.perform_async(status.stream_entry.id)
|
||||
end
|
||||
|
||||
private
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
Nokogiri::XML::Builder.new do |xml|
|
||||
feed(xml) do
|
||||
simple_id xml, account_url(@account, format: 'atom')
|
||||
|
@ -12,6 +14,7 @@ Nokogiri::XML::Builder.new do |xml|
|
|||
|
||||
link_alternate xml, TagManager.instance.url_for(@account)
|
||||
link_self xml, account_url(@account, format: 'atom')
|
||||
link_hub xml, api_push_url
|
||||
link_hub xml, Rails.configuration.x.hub_url
|
||||
link_salmon xml, api_salmon_url(@account.id)
|
||||
|
||||
|
|
29
app/workers/pubsubhubbub/confirmation_worker.rb
Normal file
29
app/workers/pubsubhubbub/confirmation_worker.rb
Normal file
|
@ -0,0 +1,29 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
class Pubsubhubbub::ConfirmationWorker
|
||||
include Sidekiq::Worker
|
||||
include RoutingHelper
|
||||
|
||||
def perform(subscription_id, mode, secret = nil, lease_seconds = nil)
|
||||
subscription = Subscription.find(subscription_id)
|
||||
challenge = SecureRandom.hex
|
||||
|
||||
subscription.secret = secret
|
||||
subscription.lease_seconds = lease_seconds
|
||||
|
||||
response = HTTP.headers(user_agent: 'Mastodon/PubSubHubbub')
|
||||
.timeout(:per_operation, write: 20, connect: 20, read: 50)
|
||||
.get(subscription.callback_url, params: {
|
||||
'hub.topic' => account_url(subscription.account, format: :atom),
|
||||
'hub.mode' => mode,
|
||||
'hub.challenge' => challenge,
|
||||
'hub.lease_seconds' => subscription.lease_seconds,
|
||||
})
|
||||
|
||||
if mode == 'subscribe' && response.body.to_s == challenge
|
||||
subscription.save!
|
||||
elsif (mode == 'unsubscribe' && response.body.to_s == challenge) || !subscription.confirmed?
|
||||
subscription.destroy!
|
||||
end
|
||||
end
|
||||
end
|
28
app/workers/pubsubhubbub/delivery_worker.rb
Normal file
28
app/workers/pubsubhubbub/delivery_worker.rb
Normal file
|
@ -0,0 +1,28 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
class Pubsubhubbub::DeliveryWorker
|
||||
include Sidekiq::Worker
|
||||
include RoutingHelper
|
||||
|
||||
def perform(subscription_id, payload)
|
||||
subscription = Subscription.find(subscription_id)
|
||||
headers = {}
|
||||
|
||||
headers['User-Agent'] = 'Mastodon/PubSubHubbub'
|
||||
headers['Link'] = LinkHeader.new([[api_push_url, [%w(rel hub)]], [account_url(subscription.account, format: :atom), [%w(rel self)]]]).to_s
|
||||
headers['X-Hub-Signature'] = signature(subscription.secret, payload) unless subscription.secret.blank?
|
||||
|
||||
response = HTTP.timeout(:per_operation, write: 50, connect: 20, read: 50)
|
||||
.headers(headers)
|
||||
.post(subscription.callback_url, body: payload)
|
||||
|
||||
raise "Delivery failed for #{subscription.callback_url}: HTTP #{response.code}" unless response.code > 199 && response.code < 300
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def signature(secret, payload)
|
||||
hmac = OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha1'), secret, payload)
|
||||
"sha1=#{hmac}"
|
||||
end
|
||||
end
|
15
app/workers/pubsubhubbub/distribution_worker.rb
Normal file
15
app/workers/pubsubhubbub/distribution_worker.rb
Normal file
|
@ -0,0 +1,15 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
class Pubsubhubbub::DistributionWorker
|
||||
include Sidekiq::Worker
|
||||
|
||||
def perform(stream_entry_id)
|
||||
stream_entry = StreamEntry.find(stream_entry_id)
|
||||
account = stream_entry.account
|
||||
payload = AccountsController.render(:show, assigns: { account: account, entries: [stream_entry] }, formats: [:atom])
|
||||
|
||||
Subscription.where(account: account).active.select('id').find_each do |subscription|
|
||||
Pubsubhubbub::DeliveryWorker.perform_async(subscription.id, payload)
|
||||
end
|
||||
end
|
||||
end
|
|
@ -7,9 +7,9 @@ class ThreadResolveWorker
|
|||
child_status = Status.find(child_status_id)
|
||||
parent_status = FetchRemoteStatusService.new.call(parent_url)
|
||||
|
||||
unless parent_status.nil?
|
||||
child_status.thread = parent_status
|
||||
child_status.save!
|
||||
end
|
||||
return if parent_status.nil?
|
||||
|
||||
child_status.thread = parent_status
|
||||
child_status.save!
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue