Add fallback redirection when getting a webfinger query LOCAL_DOMAIN@LOCAL_DOMAIN (#23600)

Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
This commit is contained in:
Claire 2023-05-02 17:42:42 +02:00
parent 210ff36860
commit 2779bce9a2
2 changed files with 47 additions and 12 deletions

View file

@ -18,7 +18,14 @@ module WellKnown
private private
def set_account def set_account
@account = Account.find_local!(username_from_resource) username = username_from_resource
@account = begin
if username == Rails.configuration.x.local_domain
Account.representative
else
Account.find_local!(username)
end
end
end end
def username_from_resource def username_from_resource

View file

@ -4,6 +4,10 @@ describe WellKnown::WebfingerController, type: :controller do
render_views render_views
describe 'GET #show' do describe 'GET #show' do
subject(:perform_show!) do
get :show, params: { resource: resource }, format: :json
end
let(:alternate_domains) { [] } let(:alternate_domains) { [] }
let(:alice) { Fabricate(:account, username: 'alice') } let(:alice) { Fabricate(:account, username: 'alice') }
let(:resource) { nil } let(:resource) { nil }
@ -15,10 +19,6 @@ describe WellKnown::WebfingerController, type: :controller do
Rails.configuration.x.alternate_domains = tmp Rails.configuration.x.alternate_domains = tmp
end end
subject do
get :show, params: { resource: resource }, format: :json
end
shared_examples 'a successful response' do shared_examples 'a successful response' do
it 'returns http success' do it 'returns http success' do
expect(response).to have_http_status(200) expect(response).to have_http_status(200)
@ -43,7 +43,7 @@ describe WellKnown::WebfingerController, type: :controller do
let(:resource) { alice.to_webfinger_s } let(:resource) { alice.to_webfinger_s }
before do before do
subject perform_show!
end end
it_behaves_like 'a successful response' it_behaves_like 'a successful response'
@ -54,7 +54,7 @@ describe WellKnown::WebfingerController, type: :controller do
before do before do
alice.suspend! alice.suspend!
subject perform_show!
end end
it_behaves_like 'a successful response' it_behaves_like 'a successful response'
@ -66,7 +66,7 @@ describe WellKnown::WebfingerController, type: :controller do
before do before do
alice.suspend! alice.suspend!
alice.deletion_request.destroy alice.deletion_request.destroy
subject perform_show!
end end
it 'returns http gone' do it 'returns http gone' do
@ -78,7 +78,7 @@ describe WellKnown::WebfingerController, type: :controller do
let(:resource) { 'acct:not@existing.com' } let(:resource) { 'acct:not@existing.com' }
before do before do
subject perform_show!
end end
it 'returns http not found' do it 'returns http not found' do
@ -90,7 +90,7 @@ describe WellKnown::WebfingerController, type: :controller do
let(:alternate_domains) { ['foo.org'] } let(:alternate_domains) { ['foo.org'] }
before do before do
subject perform_show!
end end
context 'when an account exists' do context 'when an account exists' do
@ -114,11 +114,39 @@ describe WellKnown::WebfingerController, type: :controller do
end end
end end
context 'when the old name scheme is used to query the instance actor' do
let(:resource) do
"#{Rails.configuration.x.local_domain}@#{Rails.configuration.x.local_domain}"
end
before do
perform_show!
end
it 'returns http success' do
expect(response).to have_http_status(200)
end
it 'does not set a Vary header' do
expect(response.headers['Vary']).to be_nil
end
it 'returns application/jrd+json' do
expect(response.media_type).to eq 'application/jrd+json'
end
it 'returns links for the internal account' do
json = body_as_json
expect(json[:subject]).to eq 'acct:mastodon.internal@cb6e6126.ngrok.io'
expect(json[:aliases]).to eq ['https://cb6e6126.ngrok.io/actor']
end
end
context 'with no resource parameter' do context 'with no resource parameter' do
let(:resource) { nil } let(:resource) { nil }
before do before do
subject perform_show!
end end
it 'returns http bad request' do it 'returns http bad request' do
@ -130,7 +158,7 @@ describe WellKnown::WebfingerController, type: :controller do
let(:resource) { 'df/:dfkj' } let(:resource) { 'df/:dfkj' }
before do before do
subject perform_show!
end end
it 'returns http bad request' do it 'returns http bad request' do