Skip to content

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

FIX: Prevent editing permissions of pre-seeded categories (#44134)

Kris3b6713ef7768
diff --git a/app/models/category.rb b/app/models/category.rb
index 3c4e76d4515..b1e048f4c4e 100644
--- a/app/models/category.rb
+++ b/app/models/category.rb
@@ -123,6 +123,7 @@ class Category < ActiveRecord::Base
validate :email_in_validator
validate :ensure_slug
validate :permissions_compatibility_validator
+ validate :special_category_permissions_validator, on: :update
validate :posting_review_groups_validator
validates :default_slow_mode_seconds,
@@ -1094,6 +1095,15 @@ class Category < ActiveRecord::Base
].include? id
end
+ # Seeding resets these categories' permissions on every migration, so edits would be lost.
+ def special?
+ [
+ SiteSetting.meta_category_id,
+ SiteSetting.staff_category_id,
+ SiteSetting.uncategorized_category_id,
+ ].include? id
+ end
+
def full_slug(separator = "-")
start_idx = "#{Discourse.base_path}/c/".size
url[start_idx..-1].gsub("/", separator)
@@ -1235,6 +1245,15 @@ class Category < ActiveRecord::Base
end
end
+ def special_category_permissions_validator
+ return if !@permissions || !special?
+
+ current_permissions = category_groups.pluck(:group_id, :permission_type)
+ return if !read_restricted_changed? && @permissions.sort == current_permissions.sort
+
+ errors.add(:base, I18n.t("category.errors.special_category_permissions"))
+ end
+
def self.ensure_consistency!
sql = <<~SQL
SELECT t.id FROM topics t
diff --git a/app/serializers/category_serializer.rb b/app/serializers/category_serializer.rb
index cbe8964e45f..2137013d751 100644
--- a/app/serializers/category_serializer.rb
+++ b/app/serializers/category_serializer.rb
@@ -109,11 +109,7 @@ class CategorySerializer < SiteCategorySerializer
end
def include_is_special?
- [
- SiteSetting.meta_category_id,
- SiteSetting.staff_category_id,
- SiteSetting.uncategorized_category_id,
- ].include? object.id
+ object.special?
end
def is_special
diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml
index 94c4c2eff5d..32e79ede986 100644
--- a/config/locales/server.en.yml
+++ b/config/locales/server.en.yml
@@ -1080,6 +1080,7 @@ en:
description_too_long:
one: "Description is too long (maximum is %{count} character)."
other: "Description is too long (maximum is %{count} characters)."
+ special_category_permissions: "This is a pre-seeded category and the security settings cannot be edited. If you do not wish to use this category, delete it instead of repurposing it."
permission_conflict: "Any group that is allowed to access a subcategory must also be allowed to access the parent category. The following groups have access to one of the subcategories, but no access to parent category: %{group_names}."
disallowed_topic_tags: "This topic has tags not allowed by this category: '%{tags}'"
disallowed_tags_generic: "This topic has disallowed tags."
diff --git a/frontend/discourse/admin/components/upsert-category/general.gjs b/frontend/discourse/admin/components/upsert-category/general.gjs
index 03bb7a5d5a3..dfab7bcf52c 100644
--- a/frontend/discourse/admin/components/upsert-category/general.gjs
+++ b/frontend/discourse/admin/components/upsert-category/general.gjs
@@ -913,71 +913,86 @@ export default class UpsertCategoryGeneral extends Component {
</@form.Field>
{{/unless}}
- <@form.Container
- class="--radio-cards"
- @format="max"
- @title={{i18n "category.visibility.title"}}
- >
- <@form.ConditionalContent
- @activeName={{this.categoryVisibility}}
- @onChange={{this.onChangeVisibility}}
- as |cc|
+ {{#if @category.is_special}}
+ <@form.Container
+ @format="max"
+ @title={{i18n "category.visibility.title"}}
>
- <cc.Conditions as |Condition|>
- {{#if this.isParentRestricted}}
- <DTooltip
- @content={{i18n "category.subcategory_permissions_warning"}}
- >
- <:trigger>
- <Condition @disabled={{true}} @name="public">
- {{dIcon "ban"}}
- {{i18n this.publicVisibilityLabel}}
- </Condition>
- </:trigger>
- </DTooltip>
+ <@form.Alert @type="warning">
+ {{#if @category.isUncategorizedCategory}}
+ {{i18n "category.uncategorized_security_warning"}}
{{else}}
- <Condition @name="public">
- {{dIcon "check"}}
- {{i18n this.publicVisibilityLabel}}
- </Condition>
+ {{i18n "category.special_warning"}}
{{/if}}
- <Condition
- @locked={{this.privateVisibilityLocked}}
- @name="group_restricted"
- >
- {{#if this.privateVisibilityLocked}}
- {{dIcon "lock"}}
+ </@form.Alert>
+ </@form.Container>
+ {{else}}
+ <@form.Container
+ class="--radio-cards"
+ @format="max"
+ @title={{i18n "category.visibility.title"}}
+ >
+ <@form.ConditionalContent
+ @activeName={{this.categoryVisibility}}
+ @onChange={{this.onChangeVisibility}}
+ as |cc|
+ >
+ <cc.Conditions as |Condition|>
+ {{#if this.isParentRestricted}}
+ <DTooltip
+ @content={{i18n "category.subcategory_permissions_warning"}}
+ >
+ <:trigger>
+ <Condition @disabled={{true}} @name="public">
+ {{dIcon "ban"}}
+ {{i18n this.publicVisibilityLabel}}
+ </Condition>
+ </:trigger>
+ </DTooltip>
{{else}}
- {{dIcon "check"}}
+ <Condition @name="public">
+ {{dIcon "check"}}
+ {{i18n this.publicVisibilityLabel}}
+ </Condition>
{{/if}}
- {{i18n "category.visibility.group_restricted"}}
- </Condition>
- </cc.Conditions>
-
- <cc.Contents as |Content|>
- <Content @name="group_restricted">
- <@form.Container
- @format="max"
- @title={{i18n "category.visibility.which_groups_can_access"}}
+ <Condition
+ @locked={{this.privateVisibilityLocked}}
+ @name="group_restricted"
>
- <GroupChooser
- @content={{this.availableAccessGroups}}
- @onChange={{this.onChangeAccessGroups}}
- @options={{hash disabled=this.isParentRestricted}}
- @value={{this.accessGroups}}
- />
- {{! eslint-disable ember/template-no-invalid-interactive }}
- <span
- class="category-permission-hint"
- {{on "click" this.goToSecurityTab}}
+ {{#if this.privateVisibilityLocked}}
+ {{dIcon "lock"}}
+ {{else}}
+ {{dIcon "check"}}
+ {{/if}}
+ {{i18n "category.visibility.group_restricted"}}
+ </Condition>
+ </cc.Conditions>
+
+ <cc.Contents as |Content|>
+ <Content @name="group_restricted">
+ <@form.Container
+ @format="max"
+ @title={{i18n "category.visibility.which_groups_can_access"}}
>
- {{this.permissionHint}}
- </span>
- </@form.Container>
- </Content>
- </cc.Contents>
- </@form.ConditionalContent>
- </@form.Container>
+ <GroupChooser
+ @content={{this.availableAccessGroups}}
+ @onChange={{this.onChangeAccessGroups}}
+ @options={{hash disabled=this.isParentRestricted}}
+ @value={{this.accessGroups}}
+ />
+ {{! eslint-disable ember/template-no-invalid-interactive }}
+ <span
+ class="category-permission-hint"
+ {{on "click" this.goToSecurityTab}}
+ >
+ {{this.permissionHint}}
+ </span>
+ </@form.Container>
+ </Content>
+ </cc.Contents>
+ </@form.ConditionalContent>
+ </@form.Container>
+ {{/if}}
</@form.Section>
</template>
}
diff --git a/frontend/discourse/admin/components/upsert-category/security.gjs b/frontend/discourse/admin/components/upsert-category/security.gjs
index 98012b393a8..fc4e0d2f8be 100644
--- a/frontend/discourse/admin/components/upsert-category/security.gjs
+++ b/frontend/discourse/admin/components/upsert-category/security.gjs
@@ -189,18 +189,18 @@ export default class UpsertCategorySecurity extends Component {
</@form.Alert>
{{/if}}
- <@form.Alert @type="warning">
- {{#if this.everyonePermission}}
- {{i18n
- this.everyoneAccessMessageKey
- everyone_group=this.everyonePermission.group_name
- }}
- {{else}}
- {{i18n "category.permissions.specific_groups_have_access"}}
- {{/if}}
- </@form.Alert>
-
{{#unless @category.is_special}}
+ <@form.Alert @type="warning">
+ {{#if this.everyonePermission}}
+ {{i18n
+ this.everyoneAccessMessageKey
+ everyone_group=this.everyonePermission.group_name
+ }}
+ {{else}}
+ {{i18n "category.permissions.specific_groups_have_access"}}
+ {{/if}}
+ </@form.Alert>
+
<@form.Container @format="full">
<div class="category-permissions-table">
<div class="permission-row row-header">
diff --git a/spec/lib/guardian_spec.rb b/spec/lib/guardian_spec.rb
index d4c28a62da3..4e6fc03a786 100644
--- a/spec/lib/guardian_spec.rb
+++ b/spec/lib/guardian_spec.rb
@@ -1334,8 +1334,9 @@ RSpec.describe Guardian do
end
it "returns false when the category is read only" do
+ topic.update!(category: Fabricate(:category))
topic.category.set_permissions(everyone: :readonly)
- topic.category.save
+ topic.category.save!
expect(Guardian.new(trust_level_3).can_edit?(topic)).to eq(false)
@@ -1346,8 +1347,9 @@ RSpec.describe Guardian do
end
it "returns false for trust level 3 if category is secured" do
+ topic.update!(category: Fabricate(:category))
topic.category.set_permissions(everyone: :create_post, staff: :full)
- topic.category.save
+ topic.category.save!
expect(Guardian.new(trust_level_3).can_edit?(topic)).to eq(false)
expect(Guardian.new(admin).can_edit?(topic)).to eq(true)
diff --git a/spec/lib/seed_data/categories_spec.rb b/spec/lib/seed_data/categories_spec.rb
index 34080181a61..0eecb7b3b00 100644
--- a/spec/lib/seed_data/categories_spec.rb
+++ b/spec/lib/seed_data/categories_spec.rb
@@ -52,7 +52,7 @@ RSpec.describe SeedData::Categories do
it "overwrites permissions when permissions are forced" do
category = Category.last
category.set_permissions(everyone: :full)
- category.save!
+ category.save!(validate: false)
expect(category.category_groups.count).to eq(0)
@@ -66,7 +66,7 @@ RSpec.describe SeedData::Categories do
it "overwrites permissions even when subcategory has less restrictive permissions" do
category = Category.last
category.set_permissions(everyone: :full)
- category.save!
+ category.save!(validate: false)
group = Fabricate(:group)
diff --git a/spec/models/category_spec.rb b/spec/models/category_spec.rb
index a090e4c582d..2ddb2481c33 100644
--- a/spec/models/category_spec.rb
+++ b/spec/models/category_spec.rb
@@ -1334,6 +1334,43 @@ RSpec.describe Category do
end
end
+ describe "validate special category permissions" do
+ fab!(:group)
+ fab!(:staff_category) do
+ Fabricate(:category).tap do |category|
+ category.set_permissions(staff: :full)
+ category.save!
+ end
+ end
+
+ before { SiteSetting.staff_category_id = staff_category.id }
+
+ it "is invalid when a special category's permissions change" do
+ staff_category.set_permissions(everyone: :full)
+
+ expect(staff_category.valid?).to eq(false)
+ expect(staff_category.errors.full_messages).to contain_exactly(
+ I18n.t("category.errors.special_category_permissions"),
+ )
+ end
+
+ it "is valid when a special category's current permissions are resubmitted" do
+ staff_category.set_permissions(staff: :full)
+ uncategorized = Category.find(SiteSetting.uncategorized_category_id)
+ uncategorized.set_permissions(everyone: :full)
+
+ expect(staff_category.valid?).to eq(true)
+ expect(uncategorized.valid?).to eq(true)
+ end
+
+ it "is valid when a regular category's permissions change" do
+ category = Fabricate(:category)
+ category.set_permissions(group => :full)
+
+ expect(category.valid?).to eq(true)
+ end
+ end
+
describe "tree metrics" do
fab!(:category) { Category.create!(user: user, name: "foo") }
diff --git a/spec/requests/categories_controller_spec.rb b/spec/requests/categories_controller_spec.rb
index 4ee36ad0b4a..386e61a03b3 100644
--- a/spec/requests/categories_controller_spec.rb
+++ b/spec/requests/categories_controller_spec.rb
@@ -972,6 +972,37 @@ RSpec.describe CategoriesController do
expect(response).to be_forbidden
end
+ it "returns 422 when changing the permissions of a special category" do
+ category.set_permissions(staff: :full)
+ category.save!
+ SiteSetting.staff_category_id = category.id
+
+ put "/categories/#{category.id}.json", params: { permissions: { "everyone" => 1 } }
+
+ expect(response.status).to eq(422)
+ expect(response.parsed_body["errors"]).to contain_exactly(
+ I18n.t("category.errors.special_category_permissions"),
+ )
+ expect(category.reload.read_restricted).to eq(true)
+ end
+
+ it "updates a special category when its current permissions are resubmitted" do
+ category.set_permissions(staff: :full)
+ category.save!
+ SiteSetting.staff_category_id = category.id
+
+ put "/categories/#{category.id}.json",
+ params: {
+ name: "Renamed staff",
+ permissions: {
+ "staff" => 1,
+ },
+ }
+
+ expect(response.status).to eq(200)
+ expect(category.reload.name).to eq("Renamed staff")
+ end
+
it "returns errors on a duplicate category name" do
other_category = Fabricate(:category, name: "Other", user: admin)
put "/categories/#{category.id}.json",
diff --git a/spec/requests/onebox_controller_spec.rb b/spec/requests/onebox_controller_spec.rb
index 3ff01e6ae83..c74ec927bce 100644
--- a/spec/requests/onebox_controller_spec.rb
+++ b/spec/requests/onebox_controller_spec.rb
@@ -144,14 +144,14 @@ RSpec.describe OneboxController do
end
it "does not onebox when you have no permission on category" do
- post = create_post
+ post = create_post(category: Fabricate(:category))
url = Discourse.base_url + post.url
get "/onebox.json", params: { url: url, category_id: post.topic.category_id }
expect(response.body).to include("blockquote")
post.topic.category.set_permissions(staff: :full)
- post.topic.category.save
+ post.topic.category.save!
get "/onebox.json", params: { url: url, category_id: post.topic.category_id }
expect(response.body).not_to include("blockquote")
diff --git a/spec/system/simplified_category_creation_spec.rb b/spec/system/simplified_category_creation_spec.rb
index 0efc4ca2cfe..b3127fe810a 100644
--- a/spec/system/simplified_category_creation_spec.rb
+++ b/spec/system/simplified_category_creation_spec.rb
@@ -108,6 +108,27 @@ describe "Simplified Category Creation" do
expect(category.reload.category_groups.map(&:group_id)).to include(group.id)
end
+ it "shows a warning instead of visibility options for a special category" do
+ category.set_permissions(staff: :full)
+ category.save!
+ SiteSetting.staff_category_id = category.id
+
+ category_page.visit_general(category)
+
+ expect(page).to have_content(I18n.t("js.category.special_warning"))
+ expect(page).to have_no_css("input.form-kit__control-radio[value='group_restricted']")
+
+ form.field("name").fill_in("Renamed staff")
+ category_page.save_settings
+
+ expect(category.reload.name).to eq("Renamed staff")
+
+ category_page.visit_security(category)
+
+ expect(page).to have_content(I18n.t("js.category.special_warning"))
+ expect(page).to have_no_content(I18n.t("js.category.permissions.specific_groups_have_access"))
+ end
+
it "shows error when color is invalid" do
category_page.visit_general(category)