From e24b14cc74034585b29ca92bbb9623df32328bf3 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 2 Mar 2022 18:57:26 +0100
Subject: [PATCH] Fix leak of existence of otherwise inaccessible statuses in
REST API (#17684)
---
app/controllers/api/v1/statuses_controller.rb | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/app/controllers/api/v1/statuses_controller.rb b/app/controllers/api/v1/statuses_controller.rb
index 2d82a7a99b..f48aeb945a 100644
--- a/app/controllers/api/v1/statuses_controller.rb
+++ b/app/controllers/api/v1/statuses_controller.rb
@@ -92,8 +92,9 @@ class Api::V1::StatusesController < Api::BaseController
end
def set_thread
- @thread = status_params[:in_reply_to_id].blank? ? nil : Status.find(status_params[:in_reply_to_id])
- rescue ActiveRecord::RecordNotFound
+ @thread = Status.find(status_params[:in_reply_to_id]) if status_params[:in_reply_to_id].present?
+ authorize(@thread, :show?) if @thread.present?
+ rescue ActiveRecord::RecordNotFound, Mastodon::NotPermittedError
render json: { error: I18n.t('statuses.errors.in_reply_not_found') }, status: 404
end