Change ResolveAccountService's handling of skip_webfinger (#15750)
* Change ResolveAccountService's handling of skip_webfinger Change it so it never makes any webfinger query, as the name would imply. * Add tests * Change FollowService to not take an URI for target_account * Restore domain-block check in FollowService * Fix tests
This commit is contained in:
parent
eb83ab45e2
commit
5f4c0b79c2
7 changed files with 60 additions and 19 deletions
|
@ -13,6 +13,47 @@ RSpec.describe ResolveAccountService, type: :service do
|
|||
stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:hoge@example.com').to_return(status: 410)
|
||||
end
|
||||
|
||||
context 'using skip_webfinger' do
|
||||
context 'when account is known' do
|
||||
let!(:remote_account) { Fabricate(:account, username: 'foo', domain: 'ap.example.com', protocol: 'activitypub') }
|
||||
|
||||
context 'when domain is banned' do
|
||||
let!(:domain_block) { Fabricate(:domain_block, domain: 'ap.example.com', severity: :suspend) }
|
||||
|
||||
it 'does not return an account' do
|
||||
expect(subject.call('foo@ap.example.com', skip_webfinger: true)).to be_nil
|
||||
end
|
||||
|
||||
it 'does not make a webfinger query' do
|
||||
subject.call('foo@ap.example.com', skip_webfinger: true)
|
||||
expect(a_request(:get, 'https://ap.example.com/.well-known/webfinger?resource=acct:foo@ap.example.com')).to_not have_been_made
|
||||
end
|
||||
end
|
||||
|
||||
context 'when domain is not banned' do
|
||||
it 'returns the expected account' do
|
||||
expect(subject.call('foo@ap.example.com', skip_webfinger: true)).to eq remote_account
|
||||
end
|
||||
|
||||
it 'does not make a webfinger query' do
|
||||
subject.call('foo@ap.example.com', skip_webfinger: true)
|
||||
expect(a_request(:get, 'https://ap.example.com/.well-known/webfinger?resource=acct:foo@ap.example.com')).to_not have_been_made
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
context 'when account is not known' do
|
||||
it 'does not return an account' do
|
||||
expect(subject.call('foo@ap.example.com', skip_webfinger: true)).to be_nil
|
||||
end
|
||||
|
||||
it 'does not make a webfinger query' do
|
||||
subject.call('foo@ap.example.com', skip_webfinger: true)
|
||||
expect(a_request(:get, 'https://ap.example.com/.well-known/webfinger?resource=acct:foo@ap.example.com')).to_not have_been_made
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
context 'when there is an LRDD endpoint but no resolvable account' do
|
||||
before do
|
||||
stub_request(:get, "https://quitter.no/.well-known/host-meta").to_return(request_fixture('.host-meta.txt'))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue