Leahnaya/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2026-09-12 12:25:55 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix error when processing remote actors with null public keys (#40194)

Browse Source
This commit is contained in:
Claire
2026-08-18 13:21:57 +00:00
committed by GitHub
parent a1e899b413
commit 28d02eb873
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -406,6 +406,8 @@ class ActivityPub::ProcessAccountService < BaseService
next unless value['owner'] == @account.uri
key = value['publicKeyPem']
next if key.nil?
{ type: :rsa, public_key: key, uri: key_id }
end
end
@@ -433,7 +435,7 @@ class ActivityPub::ProcessAccountService < BaseService
next unless value['type'] == 'Multikey' && value['controller'] == @account.uri
key_type, key = key_from_multikey(value['publicKeyMultibase'])
next if key_type.nil?
next if key_type.nil? || key.nil?
{ type: key_type, public_key: key, uri: key_id }
end