Clean up api/subscriptions controller (#3448)

This commit is contained in:
Matt Jankowski 2017-05-30 20:15:09 -04:00 committed by Eugen Rochko
parent 93de41b39b
commit 83435c49ea
2 changed files with 45 additions and 13 deletions

View file

@ -5,18 +5,15 @@ class Api::SubscriptionsController < ApiController
respond_to :txt respond_to :txt
def show def show
if @account.subscription(api_subscription_url(@account.id)).valid?(params['hub.topic']) if subscription.valid?(params['hub.topic'])
@account.update(subscription_expires_at: Time.now.utc + (params['hub.lease_seconds'] || 86_400).to_i.seconds) @account.update(subscription_expires_at: future_expires)
render plain: HTMLEntities.new.encode(params['hub.challenge']), status: 200 render plain: encoded_challenge, status: 200
else else
head 404 head 404
end end
end end
def update def update
body = request.body.read
subscription = @account.subscription(api_subscription_url(@account.id))
if subscription.verify(body, request.headers['HTTP_X_HUB_SIGNATURE']) if subscription.verify(body, request.headers['HTTP_X_HUB_SIGNATURE'])
ProcessingWorker.perform_async(@account.id, body.force_encoding('UTF-8')) ProcessingWorker.perform_async(@account.id, body.force_encoding('UTF-8'))
end end
@ -26,6 +23,28 @@ class Api::SubscriptionsController < ApiController
private private
def subscription
@_subscription ||= @account.subscription(
api_subscription_url(@account.id)
)
end
def body
@_body ||= request.body.read
end
def encoded_challenge
HTMLEntities.new.encode(params['hub.challenge'])
end
def future_expires
Time.now.utc + lease_seconds_or_default
end
def lease_seconds_or_default
(params['hub.lease_seconds'] || 86_400).to_i.seconds
end
def set_account def set_account
@account = Account.find(params[:id]) @account = Account.find(params[:id])
end end

View file

@ -6,6 +6,7 @@ RSpec.describe Api::SubscriptionsController, type: :controller do
let(:account) { Fabricate(:account, username: 'gargron', domain: 'quitter.no', remote_url: 'topic_url', secret: 'abc') } let(:account) { Fabricate(:account, username: 'gargron', domain: 'quitter.no', remote_url: 'topic_url', secret: 'abc') }
describe 'GET #show' do describe 'GET #show' do
context 'with valid subscription' do
before do before do
get :show, params: { :id => account.id, 'hub.topic' => 'topic_url', 'hub.challenge' => '456', 'hub.lease_seconds' => "#{86400 * 30}" } get :show, params: { :id => account.id, 'hub.topic' => 'topic_url', 'hub.challenge' => '456', 'hub.lease_seconds' => "#{86400 * 30}" }
end end
@ -19,6 +20,18 @@ RSpec.describe Api::SubscriptionsController, type: :controller do
end end
end end
context 'with invalid subscription' do
before do
expect_any_instance_of(Account).to receive_message_chain(:subscription, :valid?).and_return(false)
get :show, params: { :id => account.id }
end
it 'returns http success' do
expect(response).to have_http_status(:missing)
end
end
end
describe 'POST #update' do describe 'POST #update' do
let(:feed) { File.read(File.join(Rails.root, 'spec', 'fixtures', 'push', 'feed.atom')) } let(:feed) { File.read(File.join(Rails.root, 'spec', 'fixtures', 'push', 'feed.atom')) }