diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2024-02-01 15:56:46 +0100 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2024-02-01 14:41:00 -0600 |
| commit | 8f6a0c2cc87d4515ffa3be0ab8768ced5dcb5850 (patch) | |
| tree | cca832f1cc0077bb8641cac74d89dbcc996350e2 /app/lib/activitypub | |
| parent | 10d676b5a82841e3739fa8921499a394e49c3303 (diff) | |
Merge pull request from GHSA-3fjr-858r-92rw
* Fix insufficient origin validation * Bump version to 4.3.0-alpha.1
Diffstat (limited to 'app/lib/activitypub')
| -rw-r--r-- | app/lib/activitypub/activity.rb | 2 | ||||
| -rw-r--r-- | app/lib/activitypub/linked_data_signature.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/lib/activitypub/activity.rb b/app/lib/activitypub/activity.rb index 5d9596254..1738b8fe9 100644 --- a/app/lib/activitypub/activity.rb +++ b/app/lib/activitypub/activity.rb @@ -154,7 +154,7 @@ class ActivityPub::Activity if object_uri.start_with?('http') return if ActivityPub::TagManager.instance.local_uri?(object_uri) - ActivityPub::FetchRemoteStatusService.new.call(object_uri, id: true, on_behalf_of: @account.followers.local.first, request_id: @options[:request_id]) + ActivityPub::FetchRemoteStatusService.new.call(object_uri, on_behalf_of: @account.followers.local.first, request_id: @options[:request_id]) elsif @object['url'].present? ::FetchRemoteStatusService.new.call(@object['url'], request_id: @options[:request_id]) end diff --git a/app/lib/activitypub/linked_data_signature.rb b/app/lib/activitypub/linked_data_signature.rb index ea59879f3..ce2492c4f 100644 --- a/app/lib/activitypub/linked_data_signature.rb +++ b/app/lib/activitypub/linked_data_signature.rb @@ -18,8 +18,8 @@ class ActivityPub::LinkedDataSignature return unless type == 'RsaSignature2017' - creator = ActivityPub::TagManager.instance.uri_to_actor(creator_uri) - creator ||= ActivityPub::FetchRemoteKeyService.new.call(creator_uri, id: false) + creator = ActivityPub::TagManager.instance.uri_to_actor(creator_uri) + creator = ActivityPub::FetchRemoteKeyService.new.call(creator_uri) if creator&.public_key.blank? return if creator.nil? |