Skip to content

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

FIX: Moderator Can Modify Trust Level of Admin and Staff Accounts (#41992)

Isaac Janzen2c8063e078f8
diff --git a/lib/guardian.rb b/lib/guardian.rb
index 26d178a19d6..8a24921f081 100644
--- a/lib/guardian.rb
+++ b/lib/guardian.rb
@@ -432,7 +432,8 @@ class Guardian
end
def can_change_trust_level?(user)
- user && (is_admin? || (is_moderator? && SiteSetting.moderators_change_trust_levels))
+ user &&
+ (is_admin? || (is_moderator? && SiteSetting.moderators_change_trust_levels && !user.staff?))
end
# Support sites that have to approve users
diff --git a/spec/requests/admin/users_controller_spec.rb b/spec/requests/admin/users_controller_spec.rb
index 35f88d5a043..da365262294 100644
--- a/spec/requests/admin/users_controller_spec.rb
+++ b/spec/requests/admin/users_controller_spec.rb
@@ -1288,6 +1288,33 @@ RSpec.describe Admin::UsersController do
before { SiteSetting.moderators_change_trust_levels = true }
include_examples "trust level updates possible"
+
+ it "prevents changing or locking a staff user's trust level" do
+ another_admin.update!(trust_level: TrustLevel[4], manual_locked_trust_level: nil)
+
+ put "/admin/users/#{another_admin.id}/trust_level.json", params: { level: TrustLevel[0] }
+
+ trust_level_status = response.status
+ trust_level_errors = response.parsed_body["errors"]
+ trust_level = another_admin.reload.trust_level
+
+ another_admin.update!(trust_level: TrustLevel[4], manual_locked_trust_level: nil)
+
+ put "/admin/users/#{another_admin.id}/trust_level_lock.json", params: { locked: "true" }
+
+ trust_level_lock_status = response.status
+ trust_level_lock_errors = response.parsed_body["errors"] if response.body.present?
+ manual_locked_trust_level = another_admin.reload.manual_locked_trust_level
+
+ aggregate_failures do
+ expect(trust_level_status).to eq(422)
+ expect(trust_level_errors).to be_present
+ expect(trust_level).to eq(TrustLevel[4])
+ expect(trust_level_lock_status).to eq(403)
+ expect(trust_level_lock_errors).to be_present
+ expect(manual_locked_trust_level).to eq(nil)
+ end
+ end
end
context "when moderators_change_trust_levels setting is disabled" do