Fix response of signature_verification_failure_reason (#6441)

This commit is contained in:
abcang 2018-02-08 13:00:45 +09:00 committed by Eugen Rochko
parent 2bb393684b
commit cf32f7da5c
3 changed files with 19 additions and 3 deletions

View File

@ -11,7 +11,7 @@ class ActivityPub::InboxesController < Api::BaseController
process_payload process_payload
head 202 head 202
else else
[signature_verification_failure_reason, 401] render plain: signature_verification_failure_reason, status: 401
end end
end end

View File

@ -1,6 +1,8 @@
# frozen_string_literal: true # frozen_string_literal: true
class Api::SalmonController < Api::BaseController class Api::SalmonController < Api::BaseController
include SignatureVerification
before_action :set_account before_action :set_account
respond_to :txt respond_to :txt
@ -9,7 +11,7 @@ class Api::SalmonController < Api::BaseController
process_salmon process_salmon
head 202 head 202
elsif payload.present? elsif payload.present?
[signature_verification_failure_reason, 401] render plain: signature_verification_failure_reason, status: 401
else else
head 400 head 400
end end

View File

@ -40,7 +40,7 @@ RSpec.describe Api::SalmonController, type: :controller do
end end
end end
context 'with invalid post data' do context 'with empty post data' do
before do before do
request.env['RAW_POST_DATA'] = '' request.env['RAW_POST_DATA'] = ''
post :update, params: { id: account.id } post :update, params: { id: account.id }
@ -50,5 +50,19 @@ RSpec.describe Api::SalmonController, type: :controller do
expect(response).to have_http_status(400) expect(response).to have_http_status(400)
end end
end end
context 'with invalid post data' do
before do
service = double(call: false)
allow(VerifySalmonService).to receive(:new).and_return(service)
request.env['RAW_POST_DATA'] = File.read(File.join(Rails.root, 'spec', 'fixtures', 'salmon', 'mention.xml'))
post :update, params: { id: account.id }
end
it 'returns http client error' do
expect(response).to have_http_status(401)
end
end
end end
end end