about summary refs log tree commit diff
path: root/app/services/fetch_resource_service.rb
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2024-02-16 11:56:12 +0100
committerStarfall <us@starfall.systems>2024-02-16 11:19:46 -0600
commit41a1757aecf7d894965b45abece8cbc408f8f99c (patch)
tree857a5c25e55a4cd7311ac32059c8ee597ff2335c /app/services/fetch_resource_service.rb
parent8f6a0c2cc87d4515ffa3be0ab8768ced5dcb5850 (diff)
Merge pull request from GHSA-jhrq-qvrm-qr36 hotfix
* Fix insufficient Content-Type checking of fetched ActivityStreams objects

* Allow JSON-LD documents with multiple profiles
Diffstat (limited to 'app/services/fetch_resource_service.rb')
-rw-r--r--app/services/fetch_resource_service.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/fetch_resource_service.rb b/app/services/fetch_resource_service.rb
index c6f382876..01b602124 100644
--- a/app/services/fetch_resource_service.rb
+++ b/app/services/fetch_resource_service.rb
@@ -43,7 +43,7 @@ class FetchResourceService < BaseService
     @response_code = response.code
     return nil if response.code != 200
 
-    if ['application/activity+json', 'application/ld+json'].include?(response.mime_type)
+    if valid_activitypub_content_type?(response)
       body = response.body_with_limit
       json = body_to_json(body)