A platform for community discussion. Free, open, simple.
SECURITY: Enforce hide_user_activity_tab in reactions activity endpoint (#42959)
Sam504fee3518fd
diff --git a/lib/guardian/user_guardian.rb b/lib/guardian/user_guardian.rbindex be4fde3b517..9c0cdf385bf 100644--- a/lib/guardian/user_guardian.rb+++ b/lib/guardian/user_guardian.rb@@ -186,7 +186,7 @@ module UserGuardian!profile_hiddenend- def can_see_user_actions?(user, action_types)+ def can_see_user_actions?(user, action_types = [])return true if [email protected]? && (is_me?(user) || is_admin?)return false if SiteSetting.hide_user_activity_tab?(action_types & UserAction.private_types).empty?diff --git a/plugins/discourse-reactions/app/controllers/discourse_reactions/custom_reactions_controller.rb b/plugins/discourse-reactions/app/controllers/discourse_reactions/custom_reactions_controller.rbindex f7b52246c3e..df79de60539 100644--- a/plugins/discourse-reactions/app/controllers/discourse_reactions/custom_reactions_controller.rb+++ b/plugins/discourse-reactions/app/controllers/discourse_reactions/custom_reactions_controller.rb@@ -45,6 +45,7 @@ class DiscourseReactions::CustomReactionsController < ApplicationControllercurrent_user.try(:staff?) || (current_user && SiteSetting.show_inactive_accounts),)raise Discourse::NotFound unless guardian.can_see_profile?(user)+ raise Discourse::NotFound unless guardian.can_see_user_actions?(user)reaction_users =DiscourseReactions::ReactionUserdiff --git a/plugins/discourse-reactions/spec/requests/custom_reactions_controller_spec.rb b/plugins/discourse-reactions/spec/requests/custom_reactions_controller_spec.rbindex 687da3e4251..140a19d154c 100644--- a/plugins/discourse-reactions/spec/requests/custom_reactions_controller_spec.rb+++ b/plugins/discourse-reactions/spec/requests/custom_reactions_controller_spec.rb@@ -218,6 +218,23 @@ describe DiscourseReactions::CustomReactionsController doexpect(parsed[0]["reaction"]["id"]).to eq(laughing_reaction.id)end+ it "hides another user's reaction activity when user activity is hidden" do+ SiteSetting.hide_user_activity_tab = true+ sign_in(user_1)++ get "/discourse-reactions/posts/reactions.json", params: { username: user_2.username }++ aggregate_failures do+ expect(response).to have_http_status(:not_found)+ expect(response.body).not_to include(+ reaction_user_1.id.to_s,+ user_2.id.to_s,+ post_2.id.to_s,+ laughing_reaction.reaction_value,+ )+ end+ end+it "does not expose post author names when names are disabled" doSiteSetting.enable_names = falsesign_in(user_1)diff --git a/spec/lib/guardian/user_guardian_spec.rb b/spec/lib/guardian/user_guardian_spec.rbindex cae17db206b..a54e8a7a9b9 100644--- a/spec/lib/guardian/user_guardian_spec.rb+++ b/spec/lib/guardian/user_guardian_spec.rb@@ -439,8 +439,8 @@ RSpec.describe UserGuardian doenddescribe "#can_see_user_actions?" do- it "is true by default" do- expect(Guardian.new.can_see_user_actions?(nil, [])).to eq(true)+ it "defaults to no action types" do+ expect(Guardian.new.can_see_user_actions?(nil)).to eq(true)endcontext "with 'hide_user_activity_tab' setting" do