Skip to content

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

SECURITY: Prevent private user action types from leaking

Isaac Janzen3d9b005281c5
diff --git a/app/controllers/user_actions_controller.rb b/app/controllers/user_actions_controller.rb
index ebad42936c4..0615eaf3041 100644
--- a/app/controllers/user_actions_controller.rb
+++ b/app/controllers/user_actions_controller.rb
@@ -16,6 +16,10 @@ class UserActionsController < ApplicationController
raise Discourse::NotFound unless guardian.can_see_profile?(user)
raise Discourse::NotFound unless guardian.can_see_user_actions?(user, action_types)
+ if action_types.empty? && !guardian.can_see_user_actions?(user, UserAction.private_types)
+ action_types = UserAction.types.values - UserAction.private_types
+ end
+
opts = {
user_id: user.id,
user: user,
diff --git a/spec/requests/user_actions_controller_spec.rb b/spec/requests/user_actions_controller_spec.rb
index 5e4c547f343..946e60252ee 100644
--- a/spec/requests/user_actions_controller_spec.rb
+++ b/spec/requests/user_actions_controller_spec.rb
@@ -43,6 +43,7 @@ RSpec.describe UserActionsController do
let(:user) { Fabricate(:user) }
before do
+ sign_in(post.user)
PostActionNotifier.enable
PostActionCreator.like(user, post)
params[:acting_username] = user.username
@@ -80,6 +81,27 @@ RSpec.describe UserActionsController do
context "when checking other users' activity" do
fab!(:another_user, :user)
+ context "when filter is omitted" do
+ it "does not return private action types for another user" do
+ another_user.user_stat.update!(post_count: 1)
+ topic = Fabricate(:topic, user: another_user)
+ post = Fabricate(:post, topic: topic, user: another_user)
+ UserAction.create!(
+ action_type: UserAction::RESPONSE,
+ user_id: another_user.id,
+ acting_user_id: another_user.id,
+ target_topic_id: topic.id,
+ target_post_id: post.id,
+ )
+
+ get "/user_actions.json", params: { username: another_user.username }
+
+ expect(response.status).to eq(200)
+ action_types = response.parsed_body["user_actions"].map { |a| a["action_type"] }
+ expect(action_types).not_to include(*UserAction.private_types)
+ end
+ end
+
context "when user is anonymous" do
UserAction.private_types.each do |action_type|
action_name = UserAction.types.key(action_type)