gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-10-05 16:42:47 +00:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Fix QuoteAuthorization id not being properly serialized when federating revocation (#36083)

Browse Source
This commit is contained in:
Claire 2025-09-11 11:37:56 +02:00 committed by GitHub
parent 8a0d0025ff
commit b60ee191ac
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/serializers/activitypub/quote_authorization_serializer.rb
View File

@ -8,7 +8,7 @@ class ActivityPub::QuoteAuthorizationSerializer < ActivityPub::Serializer
attributes :id, :type, :attributed_to, :interacting_object, :interaction_target attributes :id, :type, :attributed_to, :interacting_object, :interaction_target
def id def id
ActivityPub::TagManager.instance.approval_uri_for(object) ActivityPub::TagManager.instance.approval_uri_for(object, check_approval: !instance_options[:force_approval_id])
end end
def type def type

2
app/services/revoke_quote_service.rb
View File

@ -34,6 +34,6 @@ class RevokeQuoteService < BaseService
end end
def signed_activity_json def signed_activity_json
@signed_activity_json ||= Oj.dump(serialize_payload(@quote, ActivityPub::DeleteQuoteAuthorizationSerializer, signer: @account, always_sign: true)) @signed_activity_json ||= Oj.dump(serialize_payload(@quote, ActivityPub::DeleteQuoteAuthorizationSerializer, signer: @account, always_sign: true, force_approval_id: true))
end end
end end

17
spec/services/revoke_quote_service_spec.rb
View File

@ -20,7 +20,22 @@ RSpec.describe RevokeQuoteService do
it 'revokes the quote and sends a Delete activity' do it 'revokes the quote and sends a Delete activity' do
expect { described_class.new.call(quote) } expect { described_class.new.call(quote) }
.to change { quote.reload.state }.from('accepted').to('revoked') .to change { quote.reload.state }.from('accepted').to('revoked')
.and enqueue_sidekiq_job(ActivityPub::DeliveryWorker).with(/Delete/, alice.id, hank.inbox_url) .and enqueue_sidekiq_job(ActivityPub::DeliveryWorker).with(
match_json_values(
type: 'Delete',
id: %r{https://.*},
object: include(
type: 'QuoteAuthorization',
id: %r{https://.*},
attributedTo: ActivityPub::TagManager.instance.uri_for(alice),
interactionTarget: ActivityPub::TagManager.instance.uri_for(status),
interactingObject: ActivityPub::TagManager.instance.uri_for(quote.status)
),
actor: ActivityPub::TagManager.instance.uri_for(alice)
),
alice.id,
hank.inbox_url
)
end end
end end
end end