diff options
author | Claire <claire.github-309c@sitedethib.com> | 2021-02-24 06:32:13 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-24 06:32:13 +0100 |
commit | 5f4c0b79c25486548b44f1bc5d65e7527a4843c4 (patch) | |
tree | 376e4de10619b73b47ddc36a76a17e13bb52637b /spec/services | |
parent | eb83ab45e26811dc9ddc07db68559bd36f33deb5 (diff) |
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
Diffstat (limited to 'spec/services')
-rw-r--r-- | spec/services/follow_service_spec.rb | 20 | ||||
-rw-r--r-- | spec/services/resolve_account_service_spec.rb | 41 |
2 files changed, 51 insertions, 10 deletions
diff --git a/spec/services/follow_service_spec.rb b/spec/services/follow_service_spec.rb index ae863a9f0..63d6eb3bd 100644 --- a/spec/services/follow_service_spec.rb +++ b/spec/services/follow_service_spec.rb @@ -10,7 +10,7 @@ RSpec.describe FollowService, type: :service do let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, locked: true, username: 'bob')).account } before do - subject.call(sender, bob.acct) + subject.call(sender, bob) end it 'creates a follow request with reblogs' do @@ -22,7 +22,7 @@ RSpec.describe FollowService, type: :service do let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, locked: true, username: 'bob')).account } before do - subject.call(sender, bob.acct, reblogs: false) + subject.call(sender, bob, reblogs: false) end it 'creates a follow request without reblogs' do @@ -35,7 +35,7 @@ RSpec.describe FollowService, type: :service do before do sender.touch(:silenced_at) - subject.call(sender, bob.acct) + subject.call(sender, bob) end it 'creates a follow request with reblogs' do @@ -48,7 +48,7 @@ RSpec.describe FollowService, type: :service do before do bob.mute!(sender) - subject.call(sender, bob.acct) + subject.call(sender, bob) end it 'creates a following relation with reblogs' do @@ -61,7 +61,7 @@ RSpec.describe FollowService, type: :service do let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account } before do - subject.call(sender, bob.acct) + subject.call(sender, bob) end it 'creates a following relation with reblogs' do @@ -74,7 +74,7 @@ RSpec.describe FollowService, type: :service do let(:bob) { Fabricate(:user, email: 'bob@example.com', account: Fabricate(:account, username: 'bob')).account } before do - subject.call(sender, bob.acct, reblogs: false) + subject.call(sender, bob, reblogs: false) end it 'creates a following relation without reblogs' do @@ -88,7 +88,7 @@ RSpec.describe FollowService, type: :service do before do sender.follow!(bob) - subject.call(sender, bob.acct) + subject.call(sender, bob) end it 'keeps a following relation' do @@ -101,7 +101,7 @@ RSpec.describe FollowService, type: :service do before do sender.follow!(bob, reblogs: true) - subject.call(sender, bob.acct, reblogs: false) + subject.call(sender, bob, reblogs: false) end it 'disables reblogs' do @@ -114,7 +114,7 @@ RSpec.describe FollowService, type: :service do before do sender.follow!(bob, reblogs: false) - subject.call(sender, bob.acct, reblogs: true) + subject.call(sender, bob, reblogs: true) end it 'disables reblogs' do @@ -128,7 +128,7 @@ RSpec.describe FollowService, type: :service do before do stub_request(:post, "http://example.com/inbox").to_return(:status => 200, :body => "", :headers => {}) - subject.call(sender, bob.acct) + subject.call(sender, bob) end it 'creates follow request' do diff --git a/spec/services/resolve_account_service_spec.rb b/spec/services/resolve_account_service_spec.rb index a604e90b5..7b1e8885c 100644 --- a/spec/services/resolve_account_service_spec.rb +++ b/spec/services/resolve_account_service_spec.rb @@ -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')) |