me
/
glitchier-soc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix replies collection incorrectly looping (#17462)

Browse Source 
* Refactor tests

* Add tests

* Fix replies collection incorrectly looping
th-downstream
Claire 3 years ago committed by GitHub
parent 621d92114d
commit 42fdf52f0c
2 changed files with 152 additions and 173 deletions
Show Stats Download Patch File Download Diff File

32
app/controllers/activitypub/replies_controller.rb
Unescape View File

@ -63,15 +63,29 @@ class ActivityPub::RepliesController < ActivityPub::BaseController
end end
def next_page def next_page
only_other_accounts = !(@replies&.last&.account_id == @account.id && @replies.size == DESCENDANTS_LIMIT) if only_other_accounts?
# Only consider remote accounts
account_status_replies_url( return nil if @replies.size < DESCENDANTS_LIMIT
@account,
@status, account_status_replies_url(
page: true, @account,
min_id: only_other_accounts && !only_other_accounts? ? nil : @replies&.last&.id, @status,
only_other_accounts: only_other_accounts page: true,
) min_id: @replies&.last&.id,
only_other_accounts: true
)
else
# For now, we're serving only self-replies, but next page might be other accounts
next_only_other_accounts = @replies&.last&.account_id != @account.id || @replies.size < DESCENDANTS_LIMIT
account_status_replies_url(
@account,
@status,
page: true,
min_id: next_only_other_accounts ? nil : @replies&.last&.id,
only_other_accounts: next_only_other_accounts
)
end
end end
def page_params def page_params

293
spec/controllers/activitypub/replies_controller_spec.rb
Unescape View File

@ -4,8 +4,9 @@ require 'rails_helper'
RSpec.describe ActivityPub::RepliesController, type: :controller do RSpec.describe ActivityPub::RepliesController, type: :controller do
let(:status) { Fabricate(:status, visibility: parent_visibility) } let(:status) { Fabricate(:status, visibility: parent_visibility) }
let(:remote_reply_id) { nil } let(:remote_account) { Fabricate(:account, domain: 'foobar.com') }
let(:remote_account) { nil } let(:remote_reply_id) { 'https://foobar.com/statuses/1234' }
let(:remote_querier) { nil }
shared_examples 'cachable response' do shared_examples 'cachable response' do
it 'does not set cookies' do it 'does not set cookies' do
@ -23,224 +24,188 @@ RSpec.describe ActivityPub::RepliesController, type: :controller do
end end
end end
before do shared_examples 'common behavior' do
allow(controller).to receive(:signed_request_account).and_return(remote_account) context 'when status is private' do
let(:parent_visibility) { :private }
Fabricate(:status, thread: status, visibility: :public) it 'returns http not found' do
Fabricate(:status, thread: status, visibility: :public) expect(response).to have_http_status(404)
Fabricate(:status, thread: status, visibility: :private) end
Fabricate(:status, account: status.account, thread: status, visibility: :public) end
Fabricate(:status, account: status.account, thread: status, visibility: :private)
Fabricate(:status, account: remote_account, thread: status, visibility: :public, uri: remote_reply_id) if remote_reply_id
end
describe 'GET #index' do context 'when status is direct' do
context 'with no signature' do let(:parent_visibility) { :direct }
subject(:response) { get :index, params: { account_username: status.account.username, status_id: status.id } }
subject(:body) { body_as_json }
context 'when account is permanently suspended' do it 'returns http not found' do
let(:parent_visibility) { :public } expect(response).to have_http_status(404)
end
end
end
before do shared_examples 'disallowed access' do
status.account.suspend! context 'when status is public' do
status.account.deletion_request.destroy let(:parent_visibility) { :public }
end
it 'returns http gone' do it 'returns http not found' do
expect(response).to have_http_status(410) expect(response).to have_http_status(404)
end
end end
end
context 'when account is temporarily suspended' do it_behaves_like 'common behavior'
let(:parent_visibility) { :public } end
before do shared_examples 'allowed access' do
status.account.suspend! context 'when account is permanently suspended' do
end let(:parent_visibility) { :public }
it 'returns http forbidden' do before do
expect(response).to have_http_status(403) status.account.suspend!
end status.account.deletion_request.destroy
end end
context 'when status is public' do it 'returns http gone' do
let(:parent_visibility) { :public } expect(response).to have_http_status(410)
end
it 'returns http success' do end
expect(response).to have_http_status(200)
end
it 'returns application/activity+json' do context 'when account is temporarily suspended' do
expect(response.media_type).to eq 'application/activity+json' let(:parent_visibility) { :public }
end
it_behaves_like 'cachable response' before do
status.account.suspend!
end
it 'returns items with account\'s own replies' do it 'returns http forbidden' do
expect(body[:first]).to be_a Hash expect(response).to have_http_status(403)
expect(body[:first][:items]).to be_an Array
expect(body[:first][:items].size).to eq 1
expect(body[:first][:items].all? { |item| item[:to].include?(ActivityPub::TagManager::COLLECTIONS[:public]) || item[:cc].include?(ActivityPub::TagManager::COLLECTIONS[:public]) }).to be true
end
end end
end
context 'when status is private' do context 'when status is public' do
let(:parent_visibility) { :private } let(:parent_visibility) { :public }
let(:json) { body_as_json }
let(:page_json) { json[:first] }
it 'returns http not found' do it 'returns http success' do
expect(response).to have_http_status(404) expect(response).to have_http_status(200)
end
end end
context 'when status is direct' do it 'returns application/activity+json' do
let(:parent_visibility) { :direct } expect(response.media_type).to eq 'application/activity+json'
it 'returns http not found' do
expect(response).to have_http_status(404)
end
end end
end
context 'with signature' do it_behaves_like 'cachable response'
let(:remote_account) { Fabricate(:account, domain: 'example.com') }
let(:only_other_accounts) { nil }
context do context 'without only_other_accounts' do
before do it "returns items with thread author's replies" do
get :index, params: { account_username: status.account.username, status_id: status.id, only_other_accounts: only_other_accounts } expect(page_json).to be_a Hash
expect(page_json[:items]).to be_an Array
expect(page_json[:items].size).to eq 1
expect(page_json[:items].all? { |item| item[:to].include?(ActivityPub::TagManager::COLLECTIONS[:public]) || item[:cc].include?(ActivityPub::TagManager::COLLECTIONS[:public]) }).to be true
end end
context 'when status is public' do context 'when there are few self-replies' do
let(:parent_visibility) { :public } it 'points next to replies from other people' do
expect(page_json).to be_a Hash
it 'returns http success' do expect(Addressable::URI.parse(page_json[:next]).query.split('&')).to include('only_other_accounts=true', 'page=true')
expect(response).to have_http_status(200)
end end
end
it 'returns application/activity+json' do context 'when there are many self-replies' do
expect(response.media_type).to eq 'application/activity+json' before do
10.times { Fabricate(:status, account: status.account, thread: status, visibility: :public) }
end end
it_behaves_like 'cachable response' it 'points next to other self-replies' do
expect(page_json).to be_a Hash
context 'without only_other_accounts' do expect(Addressable::URI.parse(page_json[:next]).query.split('&')).to include('only_other_accounts=false', 'page=true')
it 'returns items with account\'s own replies' do
json = body_as_json
expect(json[:first]).to be_a Hash
expect(json[:first][:items]).to be_an Array
expect(json[:first][:items].size).to eq 1
expect(json[:first][:items].all? { |item| item[:to].include?(ActivityPub::TagManager::COLLECTIONS[:public]) || item[:cc].include?(ActivityPub::TagManager::COLLECTIONS[:public]) }).to be true
end
end end
end
end
context 'with only_other_accounts' do context 'with only_other_accounts' do
let(:only_other_accounts) { 'true' } let(:only_other_accounts) { 'true' }
it 'returns items with other public or unlisted replies' do
json = body_as_json
expect(json[:first]).to be_a Hash
expect(json[:first][:items]).to be_an Array
expect(json[:first][:items].size).to eq 2
expect(json[:first][:items].all? { |item| item[:to].include?(ActivityPub::TagManager::COLLECTIONS[:public]) || item[:cc].include?(ActivityPub::TagManager::COLLECTIONS[:public]) }).to be true
end
context 'with remote responses' do
let(:remote_reply_id) { 'foo' }
it 'returned items are all inlined local toots or are ids' do it 'returns items with other public or unlisted replies' do
json = body_as_json expect(page_json).to be_a Hash
expect(page_json[:items]).to be_an Array
expect(page_json[:items].size).to eq 3
end
expect(json[:first]).to be_a Hash it 'only inlines items that are local and public or unlisted replies' do
expect(json[:first][:items]).to be_an Array inlined_replies = page_json[:items].select { |x| x.is_a?(Hash) }
expect(json[:first][:items].size).to eq 3 public_collection = ActivityPub::TagManager::COLLECTIONS[:public]
expect(json[:first][:items].all? { |item| item.is_a?(Hash) ? ActivityPub::TagManager.instance.local_uri?(item[:id]) : item.is_a?(String) }).to be true expect(inlined_replies.all? { |item| item[:to].include?(public_collection) || item[:cc].include?(public_collection) }).to be true
expect(json[:first][:items]).to include remote_reply_id expect(inlined_replies.all? { |item| ActivityPub::TagManager.instance.local_uri?(item[:id]) }).to be true
end
end
end
end end
context 'when status is private' do it 'uses ids for remote toots' do
let(:parent_visibility) { :private } remote_replies = page_json[:items].select { |x| !x.is_a?(Hash) }
expect(remote_replies.all? { |item| item.is_a?(String) && !ActivityPub::TagManager.instance.local_uri?(item) }).to be true
end
it 'returns http not found' do context 'when there are few replies' do
expect(response).to have_http_status(404) it 'does not have a next page' do
expect(page_json).to be_a Hash
expect(page_json[:next]).to be_nil
end end
end end
context 'when status is direct' do context 'when there are many replies' do
let(:parent_visibility) { :direct } before do
10.times { Fabricate(:status, thread: status, visibility: :public) }
end
it 'returns http not found' do it 'points next to other replies' do
expect(response).to have_http_status(404) expect(page_json).to be_a Hash
expect(Addressable::URI.parse(page_json[:next]).query.split('&')).to include('only_other_accounts=true', 'page=true')
end end
end end
end end
end
context 'when signed request account is blocked' do it_behaves_like 'common behavior'
before do end
status.account.block!(remote_account)
get :index, params: { account_username: status.account.username, status_id: status.id }
end
context 'when status is public' do
let(:parent_visibility) { :public }
it 'returns http not found' do before do
expect(response).to have_http_status(404) stub_const 'ActivityPub::RepliesController::DESCENDANTS_LIMIT', 5
end allow(controller).to receive(:signed_request_account).and_return(remote_querier)
end
context 'when status is private' do Fabricate(:status, thread: status, visibility: :public)
let(:parent_visibility) { :private } Fabricate(:status, thread: status, visibility: :public)
Fabricate(:status, thread: status, visibility: :private)
Fabricate(:status, account: status.account, thread: status, visibility: :public)
Fabricate(:status, account: status.account, thread: status, visibility: :private)
it 'returns http not found' do Fabricate(:status, account: remote_account, thread: status, visibility: :public, uri: remote_reply_id)
expect(response).to have_http_status(404) end
end
end
context 'when status is direct' do describe 'GET #index' do
let(:parent_visibility) { :direct } subject(:response) { get :index, params: { account_username: status.account.username, status_id: status.id, only_other_accounts: only_other_accounts } }
let(:only_other_accounts) { nil }
it 'returns http not found' do context 'with no signature' do
expect(response).to have_http_status(404) it_behaves_like 'allowed access'
end end
end
end
context 'when signed request account is domain blocked' do context 'with signature' do
before do let(:remote_querier) { Fabricate(:account, domain: 'example.com') }
status.account.block_domain!(remote_account.domain)
get :index, params: { account_username: status.account.username, status_id: status.id }
end
context 'when status is public' do it_behaves_like 'allowed access'
let(:parent_visibility) { :public }
it 'returns http not found' do context 'when signed request account is blocked' do
expect(response).to have_http_status(404) before do
end status.account.block!(remote_querier)
end end
context 'when status is private' do it_behaves_like 'disallowed access'
let(:parent_visibility) { :private } end
it 'returns http not found' do context 'when signed request account is domain blocked' do
expect(response).to have_http_status(404) before do
end status.account.block_domain!(remote_querier.domain)
end end
context 'when status is direct' do it_behaves_like 'disallowed access'
let(:parent_visibility) { :direct }
it 'returns http not found' do
expect(response).to have_http_status(404)
end
end
end end
end end
end end

Write Preview
Loading…
Cancel
Save