techhub/mastodon
2
0
Fork 0
Code Activity

Fix handling of inlined instrument in incoming QuoteRequest (#35714)

Browse Source
This commit is contained in:
Claire
2025-08-07 14:52:29 +02:00
committed by GitHub
parent 39a3ffaf2f
commit 836a2bfee0
2 changed files with 76 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
spec/lib/activitypub/activity/quote_request_spec.rb
View File

@@ -8,6 +8,7 @@ RSpec.describe ActivityPub::Activity::QuoteRequest, feature: :outgoing_quotes do
let(:quoted_post) { Fabricate(:status, account: recipient) }
let(:request_uri) { 'https://example.com/missing-ui' }
let(:quoted_uri) { ActivityPub::TagManager.instance.uri_for(quoted_post) }
let(:instrument) { 'https://example.com/unknown-status' }
let(:json) do
{
@@ -21,8 +22,30 @@ RSpec.describe ActivityPub::Activity::QuoteRequest, feature: :outgoing_quotes do
type: 'QuoteRequest',
actor: ActivityPub::TagManager.instance.uri_for(sender),
object: quoted_uri,
instrument: 'https://example.com/unknown-status',
}.with_indifferent_access
instrument: instrument,
}.deep_stringify_keys
end
let(:status_json) do
{
'@context': [
'https://www.w3.org/ns/activitystreams',
{
'@id': 'https://w3id.org/fep/044f#quote',
'@type': '@id',
},
{
'@id': 'https://w3id.org/fep/044f#quoteAuthorization',
'@type': '@id',
},
],
id: 'https://example.com/unknown-status',
type: 'Note',
summary: 'Show more',
content: 'Hello universe',
quote: ActivityPub::TagManager.instance.uri_for(quoted_post),
attributedTo: ActivityPub::TagManager.instance.uri_for(sender),
}.deep_stringify_keys
end
describe '#perform' do
@@ -48,29 +71,20 @@ RSpec.describe ActivityPub::Activity::QuoteRequest, feature: :outgoing_quotes do
end
end
context 'when trying to quote a quotable local status' do
let(:status_json) do
{
'@context': [
'https://www.w3.org/ns/activitystreams',
{
'@id': 'https://w3id.org/fep/044f#quote',
'@type': '@id',
},
{
'@id': 'https://w3id.org/fep/044f#quoteAuthorization',
'@type': '@id',
},
],
id: 'https://example.com/unknown-status',
type: 'Note',
summary: 'Show more',
content: 'Hello universe',
quote: ActivityPub::TagManager.instance.uri_for(quoted_post),
attributedTo: ActivityPub::TagManager.instance.uri_for(sender),
}.deep_stringify_keys
end
context 'when trying to quote an unquotable local status with an inlined instrument' do
let(:instrument) { status_json.without('@context') }
it 'sends a Reject activity' do
expect { subject.perform }
.to enqueue_sidekiq_job(ActivityPub::DeliveryWorker)
.with(satisfying do |body|
outgoing_json = Oj.load(body)
outgoing_json['type'] == 'Reject' && json['instrument']['id'] == outgoing_json['object']['instrument'] && %w(type id actor object).all? { |key| json[key] == outgoing_json['object'][key] }
end, recipient.id, sender.inbox_url)
end
end
context 'when trying to quote a quotable local status' do
before do
stub_request(:get, 'https://example.com/unknown-status').to_return(status: 200, body: Oj.dump(status_json), headers: { 'Content-Type': 'application/activity+json' })
quoted_post.update(quote_approval_policy: Status::QUOTE_APPROVAL_POLICY_FLAGS[:public] << 16)
@@ -86,5 +100,23 @@ RSpec.describe ActivityPub::Activity::QuoteRequest, feature: :outgoing_quotes do
end, recipient.id, sender.inbox_url)
end
end
context 'when trying to quote a quotable local status with an inlined instrument' do
let(:instrument) { status_json.without('@context') }
before do
quoted_post.update(quote_approval_policy: Status::QUOTE_APPROVAL_POLICY_FLAGS[:public] << 16)
end
it 'accepts the quote and sends an Accept activity' do
expect { subject.perform }
.to change { quoted_post.reload.quotes.accepted.count }.by(1)
.and enqueue_sidekiq_job(ActivityPub::DeliveryWorker)
.with(satisfying do |body|
outgoing_json = Oj.load(body)
outgoing_json['type'] == 'Accept' && json['instrument']['id'] == outgoing_json['object']['instrument'] && %w(type id actor object).all? { |key| json[key] == outgoing_json['object'][key] }
end, recipient.id, sender.inbox_url)
end
end
end
end