From 28d02eb873574c9c33ad0887874718d56281d2cd Mon Sep 17 00:00:00 2001 From: Claire Date: Tue, 18 Aug 2026 13:21:57 +0000 Subject: [PATCH] Fix error when processing remote actors with `null` public keys (#40194) --- app/services/activitypub/process_account_service.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/services/activitypub/process_account_service.rb b/app/services/activitypub/process_account_service.rb index 4ee6a0a8bea..8da3b01d651 100644 --- a/app/services/activitypub/process_account_service.rb +++ b/app/services/activitypub/process_account_service.rb @@ -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