Skip to content

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

FIX: prevent non-admin group owners from clearing group title (#39043)

Keegan Georgecbff75e68751
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index f58a4eb073b..86ea757438d 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -809,7 +809,6 @@ class GroupsController < ApplicationController
if !automatic
attributes.push(
- :title,
:allow_membership_requests,
:full_name,
:public_exit,
@@ -832,6 +831,7 @@ class GroupsController < ApplicationController
:email_username,
:email_password,
:email_from_alias,
+ :title,
:primary_group,
:name,
:grant_trust_level,
diff --git a/spec/requests/groups_controller_spec.rb b/spec/requests/groups_controller_spec.rb
index 7f653be2022..86a51716851 100644
--- a/spec/requests/groups_controller_spec.rb
+++ b/spec/requests/groups_controller_spec.rb
@@ -1038,7 +1038,7 @@ RSpec.describe GroupsController do
},
update_existing_users: false,
}
- end.to change { GroupHistory.count }.by(13)
+ end.to change { GroupHistory.count }.by(12)
expect(response.status).to eq(200)
@@ -1059,7 +1059,7 @@ RSpec.describe GroupsController do
expect(group.messageable_level).to eq(1)
expect(group.default_notification_level).to eq(1)
expect(group.automatic_membership_email_domains).to eq(nil)
- expect(group.title).to eq("haha")
+ expect(group.title).to eq(nil)
expect(group.primary_group).to eq(false)
expect(group.incoming_email).to eq(nil)
expect(group.grant_trust_level).to eq(0)
@@ -1067,6 +1067,43 @@ RSpec.describe GroupsController do
expect(group.group_tag_notification_defaults.first&.tag).to eq(tag)
end
+ it "should not clear group title when owner updates other settings" do
+ group.update!(title: "Original Title")
+
+ put "/groups/#{group.id}.json",
+ params: {
+ group: {
+ flair_bg_color: "FFF",
+ flair_color: "BBB",
+ flair_icon: "fa-circle-half-stroke",
+ },
+ }
+
+ expect(response.status).to eq(200)
+
+ group.reload
+ expect(group.title).to eq("Original Title")
+ expect(group.flair_bg_color).to eq("FFF")
+ end
+
+ it "should not allow group owner to modify the group title" do
+ group.update!(title: "Original Title")
+
+ put "/groups/#{group.id}.json",
+ params: {
+ group: {
+ title: "Hacked Title",
+ flair_bg_color: "FFF",
+ },
+ }
+
+ expect(response.status).to eq(200)
+
+ group.reload
+ expect(group.title).to eq("Original Title")
+ expect(group.flair_bg_color).to eq("FFF")
+ end
+
it "should not be allowed to update automatic groups" do
group = Group.find(Group::AUTO_GROUPS[:admins])
@@ -1090,6 +1127,7 @@ RSpec.describe GroupsController do
incoming_email: "[email protected]",
primary_group: true,
automatic_membership_email_domains: "test.org",
+ title: "Admin Title",
grant_trust_level: 2,
visibility_level: 1,
members_visibility_level: 3,
@@ -1106,6 +1144,7 @@ RSpec.describe GroupsController do
expect(group.name).to eq("testing")
expect(group.incoming_email).to eq("[email protected]")
expect(group.primary_group).to eq(true)
+ expect(group.title).to eq("Admin Title")
expect(group.visibility_level).to eq(1)
expect(group.members_visibility_level).to eq(3)
expect(group.automatic_membership_email_domains).to eq("test.org")