mirror of
https://github.com/funamitech/mastodon
synced 2024-11-24 07:06:34 +09:00
8b8004a962
* Fix webfinger redirect handling in ResolveAccountService ResolveAccountService#process_webfinger! handled a one-step webfinger redirection, but only accepting the result if it matched the exact URI passed as input, defeating the point of a redirection check. Instead, use the same logic as in `ActivityPub::FetchRemoteAccountService`, updating the resulting `acct:` URI with the result of the first webfinger query. * Add tests
143 lines
5.4 KiB
Ruby
143 lines
5.4 KiB
Ruby
require 'rails_helper'
|
|
|
|
RSpec.describe ResolveAccountService, type: :service do
|
|
subject { described_class.new }
|
|
|
|
before do
|
|
stub_request(:get, "https://example.com/.well-known/host-meta").to_return(status: 404)
|
|
stub_request(:get, "https://quitter.no/avatar/7477-300-20160211190340.png").to_return(request_fixture('avatar.txt'))
|
|
stub_request(:get, "https://ap.example.com/.well-known/webfinger?resource=acct:foo@ap.example.com").to_return(request_fixture('activitypub-webfinger.txt'))
|
|
stub_request(:get, "https://ap.example.com/users/foo").to_return(request_fixture('activitypub-actor.txt'))
|
|
stub_request(:get, "https://ap.example.com/users/foo.atom").to_return(request_fixture('activitypub-feed.txt'))
|
|
stub_request(:get, %r{https://ap.example.com/users/foo/\w+}).to_return(status: 404)
|
|
stub_request(:get, 'https://example.com/.well-known/webfinger?resource=acct:hoge@example.com').to_return(status: 410)
|
|
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'))
|
|
stub_request(:get, "https://quitter.no/.well-known/webfinger?resource=acct:catsrgr8@quitter.no").to_return(status: 404)
|
|
end
|
|
|
|
it 'returns nil' do
|
|
expect(subject.call('catsrgr8@quitter.no')).to be_nil
|
|
end
|
|
end
|
|
|
|
context 'when there is no LRDD endpoint nor resolvable account' do
|
|
before do
|
|
stub_request(:get, "https://example.com/.well-known/webfinger?resource=acct:catsrgr8@example.com").to_return(status: 404)
|
|
end
|
|
|
|
it 'returns nil' do
|
|
expect(subject.call('catsrgr8@example.com')).to be_nil
|
|
end
|
|
end
|
|
|
|
context 'when webfinger returns http gone' do
|
|
context 'for a previously known account' do
|
|
before do
|
|
Fabricate(:account, username: 'hoge', domain: 'example.com', last_webfingered_at: nil)
|
|
allow(AccountDeletionWorker).to receive(:perform_async)
|
|
end
|
|
|
|
it 'returns nil' do
|
|
expect(subject.call('hoge@example.com')).to be_nil
|
|
end
|
|
|
|
it 'queues account deletion worker' do
|
|
subject.call('hoge@example.com')
|
|
expect(AccountDeletionWorker).to have_received(:perform_async)
|
|
end
|
|
end
|
|
|
|
context 'for a previously unknown account' do
|
|
it 'returns nil' do
|
|
expect(subject.call('hoge@example.com')).to be_nil
|
|
end
|
|
end
|
|
end
|
|
|
|
context 'with a legitimate webfinger redirection' do
|
|
before do
|
|
webfinger = { subject: 'acct:foo@ap.example.com', links: [{ rel: 'self', href: 'https://ap.example.com/users/foo' }] }
|
|
stub_request(:get, 'https://redirected.example.com/.well-known/webfinger?resource=acct:Foo@redirected.example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
|
|
end
|
|
|
|
it 'returns new remote account' do
|
|
account = subject.call('Foo@redirected.example.com')
|
|
|
|
expect(account.activitypub?).to eq true
|
|
expect(account.acct).to eq 'foo@ap.example.com'
|
|
expect(account.inbox_url).to eq 'https://ap.example.com/users/foo/inbox'
|
|
end
|
|
end
|
|
|
|
context 'with too many webfinger redirections' do
|
|
before do
|
|
webfinger = { subject: 'acct:foo@evil.example.com', links: [{ rel: 'self', href: 'https://ap.example.com/users/foo' }] }
|
|
stub_request(:get, 'https://redirected.example.com/.well-known/webfinger?resource=acct:Foo@redirected.example.com').to_return(body: Oj.dump(webfinger), headers: { 'Content-Type': 'application/jrd+json' })
|
|
webfinger2 = { subject: 'acct:foo@ap.example.com', links: [{ rel: 'self', href: 'https://ap.example.com/users/foo' }] }
|
|
stub_request(:get, 'https://evil.example.com/.well-known/webfinger?resource=acct:foo@evil.example.com').to_return(body: Oj.dump(webfinger2), headers: { 'Content-Type': 'application/jrd+json' })
|
|
end
|
|
|
|
it 'returns new remote account' do
|
|
expect { subject.call('Foo@redirected.example.com') }.to raise_error Webfinger::RedirectError
|
|
end
|
|
end
|
|
|
|
context 'with an ActivityPub account' do
|
|
it 'returns new remote account' do
|
|
account = subject.call('foo@ap.example.com')
|
|
|
|
expect(account.activitypub?).to eq true
|
|
expect(account.domain).to eq 'ap.example.com'
|
|
expect(account.inbox_url).to eq 'https://ap.example.com/users/foo/inbox'
|
|
end
|
|
|
|
context 'with multiple types' do
|
|
before do
|
|
stub_request(:get, "https://ap.example.com/users/foo").to_return(request_fixture('activitypub-actor-individual.txt'))
|
|
end
|
|
|
|
it 'returns new remote account' do
|
|
account = subject.call('foo@ap.example.com')
|
|
|
|
expect(account.activitypub?).to eq true
|
|
expect(account.domain).to eq 'ap.example.com'
|
|
expect(account.inbox_url).to eq 'https://ap.example.com/users/foo/inbox'
|
|
expect(account.actor_type).to eq 'Person'
|
|
end
|
|
end
|
|
end
|
|
|
|
it 'processes one remote account at a time using locks' do
|
|
wait_for_start = true
|
|
fail_occurred = false
|
|
return_values = Concurrent::Array.new
|
|
|
|
# Preload classes that throw circular dependency errors in threads
|
|
Account
|
|
TagManager
|
|
DomainBlock
|
|
|
|
threads = Array.new(5) do
|
|
Thread.new do
|
|
true while wait_for_start
|
|
|
|
begin
|
|
return_values << described_class.new.call('foo@ap.example.com')
|
|
rescue ActiveRecord::RecordNotUnique
|
|
fail_occurred = true
|
|
end
|
|
end
|
|
end
|
|
|
|
wait_for_start = false
|
|
threads.each(&:join)
|
|
|
|
expect(fail_occurred).to be false
|
|
expect(return_values).to_not include(nil)
|
|
end
|
|
end
|