github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 22:43:33 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Check for category conflicts in SiteSetting validations (#8137)

Browse Source 
It was possible to add a category to more than one default group, e.g. "default categories muted" and "default categories watching first post".

The bug was caused by category validations inadvertently comparing strings and numbers.
This commit is contained in:
Jarek Radosz
2019-10-06 20:50:07 +02:00
committed by GitHub
parent 87be6fe98c
commit bfe0bc0cbd
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/site_settings/validations.rb
View File

@ -24,7 +24,7 @@ module SiteSettings::Validations
SiteSetting.default_categories_tracking.split("|"), SiteSetting.default_categories_tracking.split("|"),
SiteSetting.default_categories_muted.split("|"), SiteSetting.default_categories_muted.split("|"),
SiteSetting.default_categories_watching_first_post.split("|") SiteSetting.default_categories_watching_first_post.split("|")
].flatten.to_set ].flatten.map(&:to_i).to_set
validate_default_categories(category_ids, default_categories_selected) validate_default_categories(category_ids, default_categories_selected)
end end
@ -36,7 +36,7 @@ module SiteSettings::Validations
SiteSetting.default_categories_watching.split("|"), SiteSetting.default_categories_watching.split("|"),
SiteSetting.default_categories_muted.split("|"), SiteSetting.default_categories_muted.split("|"),
SiteSetting.default_categories_watching_first_post.split("|") SiteSetting.default_categories_watching_first_post.split("|")
].flatten.to_set ].flatten.map(&:to_i).to_set
validate_default_categories(category_ids, default_categories_selected) validate_default_categories(category_ids, default_categories_selected)
end end
@ -48,7 +48,7 @@ module SiteSettings::Validations
SiteSetting.default_categories_watching.split("|"), SiteSetting.default_categories_watching.split("|"),
SiteSetting.default_categories_tracking.split("|"), SiteSetting.default_categories_tracking.split("|"),
SiteSetting.default_categories_watching_first_post.split("|") SiteSetting.default_categories_watching_first_post.split("|")
].flatten.to_set ].flatten.map(&:to_i).to_set
validate_default_categories(category_ids, default_categories_selected) validate_default_categories(category_ids, default_categories_selected)
end end
@ -60,7 +60,7 @@ module SiteSettings::Validations
SiteSetting.default_categories_watching.split("|"), SiteSetting.default_categories_watching.split("|"),
SiteSetting.default_categories_tracking.split("|"), SiteSetting.default_categories_tracking.split("|"),
SiteSetting.default_categories_muted.split("|") SiteSetting.default_categories_muted.split("|")
].flatten.to_set ].flatten.map(&:to_i).to_set
validate_default_categories(category_ids, default_categories_selected) validate_default_categories(category_ids, default_categories_selected)
end end

8
spec/lib/site_settings/validations_spec.rb
View File

@ -22,6 +22,14 @@ describe SiteSettings::Validations do
subject.validate_default_categories_watching("#{category.id}|12312323") subject.validate_default_categories_watching("#{category.id}|12312323")
}.to raise_error(Discourse::InvalidParameters) }.to raise_error(Discourse::InvalidParameters)
end end
it "prevents using the same category in more than one default group" do
SiteSetting.default_categories_watching = "#{category.id}"
expect {
SiteSetting.default_categories_tracking = "#{category.id}"
}.to raise_error(Discourse::InvalidParameters)
end
end end
context "s3 buckets reusage" do context "s3 buckets reusage" do