A platform for community discussion. Free, open, simple.
SECURITY: Signup-time primary_group_id assignment grants whisperer access
discourse-patch-triage[bot]5418e3027dba
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rbindex e1af046bfa6..dc932572857 100644--- a/app/controllers/users_controller.rb+++ b/app/controllers/users_controller.rb@@ -696,7 +696,12 @@ class UsersController < ApplicationControllerparams[:locale] ||= I18n.locale unless current_user- new_user_params = user_params.except(:timezone)+ new_user_params =+ if current_user&.admin? && is_api?+ user_params.except(:timezone)+ else+ user_params.except(:timezone, :primary_group_id, :flair_group_id)+ enduser = User.where(staged: true).with_email(new_user_params[:email].strip.downcase).firstdiff --git a/app/models/concerns/roleable.rb b/app/models/concerns/roleable.rbindex 1ee464cbab3..c2756c7124c 100644--- a/app/models/concerns/roleable.rb+++ b/app/models/concerns/roleable.rb@@ -24,7 +24,6 @@ module Roleablebeginreturn false if SiteSetting.whispers_allowed_groups_map.empty?return true if admin- return true if SiteSetting.whispers_allowed_groups_map.include?(primary_group_id)group_users&.exists?(group_id: SiteSetting.whispers_allowed_groups_map)endenddiff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rbindex 06d5dd63795..f3d458f48a9 100644--- a/spec/models/user_spec.rb+++ b/spec/models/user_spec.rb@@ -3627,6 +3627,19 @@ RSpec.describe User doexpect(admin.whisperer?).to eq(false)end+ context "when primary_group_id is set without matching group membership" do+ fab!(:user)++ before do+ SiteSetting.whispers_allowed_groups = group.id.to_s+ user.update_column(:primary_group_id, group.id)+ end++ it "does not grant whisper access" do+ expect(user).not_to be_a_whisperer+ end+ end+it "returns true for user belonging to whisperers groups" dowhisperer = Fabricate(:user)user = Fabricate(:user)diff --git a/spec/requests/users_controller_spec.rb b/spec/requests/users_controller_spec.rbindex aca3a894e81..4084c9b39e3 100644--- a/spec/requests/users_controller_spec.rb+++ b/spec/requests/users_controller_spec.rb@@ -906,6 +906,22 @@ RSpec.describe UsersController doendend+ context "when signup params include group assignments" do+ fab!(:whisperers_group, :group)++ let(:created_user) { User.find(response.parsed_body["user_id"]) }++ before { SiteSetting.whispers_allowed_groups = whisperers_group.id.to_s }++ it "ignores primary_group_id and flair_group_id on unauthenticated signup" do+ post_user(primary_group_id: whisperers_group.id, flair_group_id: whisperers_group.id)++ expect(response).to have_http_status(:ok)+ expect(created_user).to have_attributes(primary_group_id: nil, flair_group_id: nil)+ expect(created_user).not_to be_a_whisperer+ end+ end+context "with discourse connect enabled" dobefore doSiteSetting.discourse_connect_url = "http://example.com/sso"