Skip to content

A platform for community discussion. Free, open, simple.

SECURITY: Enforce Guardian checks in `UserActionsController#show`

Alan Guo Xiang Tan14ff4decf4dc
diff --git a/app/controllers/user_actions_controller.rb b/app/controllers/user_actions_controller.rb
index 0615eaf3041..32c1245a632 100644
--- a/app/controllers/user_actions_controller.rb
+++ b/app/controllers/user_actions_controller.rb
@@ -13,8 +13,7 @@ class UserActionsController < ApplicationController
action_types = (user_actions_params[:filter] || "").split(",").map(&:to_i)
limit = user_actions_params.fetch(:limit, 30).to_i
- raise Discourse::NotFound unless guardian.can_see_profile?(user)
- raise Discourse::NotFound unless guardian.can_see_user_actions?(user, action_types)
+ ensure_user_actions_visible!(user, action_types)
if action_types.empty? && !guardian.can_see_user_actions?(user, UserAction.private_types)
action_types = UserAction.types.values - UserAction.private_types
@@ -46,11 +45,24 @@ class UserActionsController < ApplicationController
def show
params.require(:id)
- render_serialized(UserAction.stream_item(params[:id], guardian), UserActionSerializer)
+ stream_item = UserAction.stream_item(params[:id], guardian)
+ raise Discourse::NotFound if stream_item.blank?
+
+ user = User.find_by(id: stream_item.target_user_id)
+ raise Discourse::NotFound if user.blank?
+
+ ensure_user_actions_visible!(user, [stream_item.action_type])
+
+ render_serialized(stream_item, UserActionSerializer)
end
private
+ def ensure_user_actions_visible!(user, action_types)
+ raise Discourse::NotFound unless guardian.can_see_profile?(user)
+ raise Discourse::NotFound unless guardian.can_see_user_actions?(user, action_types)
+ end
+
def user_actions_params
@user_actions_params ||= params.permit(:username, :filter, :offset, :acting_username, :limit)
end
diff --git a/spec/requests/user_actions_controller_spec.rb b/spec/requests/user_actions_controller_spec.rb
index 946e60252ee..c29e561ab2f 100644
--- a/spec/requests/user_actions_controller_spec.rb
+++ b/spec/requests/user_actions_controller_spec.rb
@@ -179,4 +179,70 @@ RSpec.describe UserActionsController do
end
end
end
+
+ describe "#show" do
+ fab!(:acting_user) { Fabricate(:user, refresh_auto_groups: true) }
+
+ fab!(:target_post) do
+ UserActionManager.enable
+ post = create_post(user: acting_user)
+ acting_user.user_stat.update!(post_count: 1)
+ post
+ end
+
+ fab!(:user_action) do
+ UserAction.find_by(user_id: acting_user.id, action_type: UserAction.types[:new_topic])
+ end
+
+ it "returns the action for a visible user with a public action" do
+ get "/user_actions/#{user_action.id}.json"
+
+ parsed = response.parsed_body["user_action"]
+
+ expect(response).to have_http_status :ok
+ expect(parsed["action_type"]).to eq(user_action.action_type)
+ expect(parsed["title"]).to eq(target_post.topic.title)
+ expect(parsed["excerpt"]).to eq(
+ PrettyText.excerpt(target_post.cooked, 300, keep_emoji_images: true),
+ )
+ end
+
+ it "returns 404 for a non-existent action" do
+ get "/user_actions/-1.json"
+
+ expect(response).to have_http_status :not_found
+ end
+
+ it "returns 404 when the acting user has a hidden profile" do
+ SiteSetting.allow_users_to_hide_profile = true
+ acting_user.user_option.update!(hide_profile: true)
+
+ get "/user_actions/#{user_action.id}.json"
+
+ expect(response).to have_http_status :not_found
+ end
+
+ it "returns 404 when hide_user_activity_tab is enabled" do
+ SiteSetting.hide_user_activity_tab = true
+
+ get "/user_actions/#{user_action.id}.json"
+
+ expect(response).to have_http_status :not_found
+ end
+
+ it "returns 404 for a private action type viewed by a non-admin non-owner" do
+ liker = Fabricate(:user)
+ other_user = Fabricate(:user)
+ UserActionManager.enable
+ PostActionNotifier.enable
+ PostActionCreator.like(liker, target_post)
+ was_liked_action =
+ UserAction.find_by(user_id: acting_user.id, action_type: UserAction.types[:was_liked])
+
+ sign_in(other_user)
+ get "/user_actions/#{was_liked_action.id}.json"
+
+ expect(response).to have_http_status :not_found
+ end
+ end
end