Leahnaya/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2026-09-28 06:19:03 -05:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Change FEP-521 processing to happen in addition of old security context instead of replacing it (#39725)

Browse Source
This commit is contained in:
Claire
2026-07-06 13:43:54 +02:00
committed by GitHub
parent 320a00c33f
commit ee02364e4b
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/services/activitypub/process_account_service.rb
View File

@@ -271,7 +271,7 @@ class ActivityPub::ProcessAccountService < BaseService
end
def public_keys
@public_keys ||= fep_521a_public_keys.presence || legacy_public_keys
@public_keys ||= (fep_521a_public_keys + legacy_public_keys).uniq { |key| key[:uri] }
end
def legacy_public_keys
@@ -305,8 +305,6 @@ class ActivityPub::ProcessAccountService < BaseService
end
def fep_521a_public_keys
return if @json['assertionMethod'].blank?
as_array(@json['assertionMethod']).take(MAX_PUBLIC_KEYS).filter_map do |value|
next if value.nil?