diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-02-10 22:16:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-10 22:16:37 +0100 |
| commit | 0c9eac80d887cdf7f1efa582b21006248d2f83eb (patch) | |
| tree | 208ac4a6745b34f45e5d69b96262ce92aa59c59f /app/services/activitypub/fetch_replies_service.rb | |
| parent | 719bb799be9a03b767bd9f55d30abf2b7bc318ec (diff) | |
Fix unbounded recursion in post discovery (#23506)
* Add a limit to how many posts can get fetched as a result of a single request * Add tests * Always pass `request_id` when processing `Announce` activities --------- Co-authored-by: nametoolong <nametoolong@users.noreply.github.com>
Diffstat (limited to 'app/services/activitypub/fetch_replies_service.rb')
| -rw-r--r-- | app/services/activitypub/fetch_replies_service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/activitypub/fetch_replies_service.rb b/app/services/activitypub/fetch_replies_service.rb index 8cb309e52..18a27e851 100644 --- a/app/services/activitypub/fetch_replies_service.rb +++ b/app/services/activitypub/fetch_replies_service.rb @@ -3,14 +3,14 @@ class ActivityPub::FetchRepliesService < BaseService include JsonLdHelper - def call(parent_status, collection_or_uri, allow_synchronous_requests = true) + def call(parent_status, collection_or_uri, allow_synchronous_requests: true, request_id: nil) @account = parent_status.account @allow_synchronous_requests = allow_synchronous_requests @items = collection_items(collection_or_uri) return if @items.nil? - FetchReplyWorker.push_bulk(filtered_replies) + FetchReplyWorker.push_bulk(filtered_replies) { |reply_uri| [reply_uri, { 'request_id' => request_id}] } @items end |