A platform for community discussion. Free, open, simple.
FEATURE: Upcoming change for anonymous & logged_in_users auto groups (#39517)
Martin Brennan9359227645bb
diff --git a/app/models/user.rb b/app/models/user.rbindex 1470f16ffb1..4e5c939a04b 100644--- a/app/models/user.rb+++ b/app/models/user.rb@@ -544,17 +544,28 @@ class User < ActiveRecord::Baseenddef in_any_groups?(group_ids)- # We can avoid looking up the user's actual groups- # for these global pseudogroups. In Guardian::AnonymousUser#in_any_groups?,- # we only return true if group_ids include the :anonymous auto group.- if group_ids.include?(Group::AUTO_GROUPS[:everyone]) ||- group_ids.include?(Group::AUTO_GROUPS[:logged_in_users])- return true- end+ # The :everyone short-circuit means any logged-in user matches a group_list+ # containing group id 0. This conflates "all logged-in users" with "everyone+ # including anon" and is gated behind the granular pseudogroups upcoming+ # change.+ everyone_shortcut =+ !SiteSetting.granular_anonymous_and_logged_in_groups_permissions &&+ group_ids.include?(Group::AUTO_GROUPS[:everyone])++ logged_in_shortcut = group_ids.include?(Group::AUTO_GROUPS[:logged_in_users])++ return true if everyone_shortcut || logged_in_shortcut# Sometimes the system user doesn't have their auto groups# from some strange edge case, this handles it.- if (is_system_user? && ((Group.auto_groups_between(:admins, :trust_level_4)) & group_ids).any?)+ if (+ is_system_user? &&+ (+ (+ Group.auto_groups_between(:admins, :trust_level_4) - [Group::AUTO_GROUPS[:anonymous]]+ ) & group_ids+ ).any?+ )return trueenddiff --git a/config/locales/server.en.yml b/config/locales/server.en.ymlindex 667cbbc9a58..c2d4b6273a7 100644--- a/config/locales/server.en.yml+++ b/config/locales/server.en.yml@@ -2820,6 +2820,7 @@ en:enable_simplified_category_creation: "Enables a simplified category creation flow with fewer options and a cleaner interface."modernize_foundation_theme: "This change introduces design modifcations to the Foundation theme in Discourse."reporting_improvements: "Improvements to navigation, design, and usability for Discourse's admin reports."+ granular_anonymous_and_logged_in_groups_permissions: "Makes group-based site setting permissions treat 'everyone' as 'all logged-in users', and enables the new 'anonymous' and 'logged_in_users' pseudogroups so admins can explicitly target anonymous visitors and authenticated users."dashboard_improvements: "Improvements to navigation, design, and usability for the Discourse admin dashboard."errors:diff --git a/config/site_settings.yml b/config/site_settings.ymlindex 6ba1530f804..9c2830846da 100644--- a/config/site_settings.yml+++ b/config/site_settings.yml@@ -4463,7 +4463,17 @@ experimental:upcoming_change:impact: "feature,all_members"status: "beta"- learn_more_url: "https://meta.discourse.org/t/modernizing-the-foundation-theme/395331"+ learn_more_url: "https://meta.discourse.org/t/-/395331"+ granular_anonymous_and_logged_in_groups_permissions:+ default: false+ client: true+ hidden: true+ area: "experimental"+ upcoming_change:+ status: "experimental"+ impact: "feature,all_members"+ learn_more_url: "https://meta.discourse.org/t/-/402273"+ disallow_enabled_for_groups: truedashboard_improvements:default: falsehidden: truediff --git a/lib/site_setting_extension.rb b/lib/site_setting_extension.rbindex df35d2a6db3..b08505a305f 100644--- a/lib/site_setting_extension.rb+++ b/lib/site_setting_extension.rb@@ -1128,10 +1128,32 @@ module SiteSettingExtension# Any group_list or category_list setting will have a getter defined with _map# on the end, e.g. personal_message_enabled_groups_map, to avoid having to# manually split and convert to integer for these settings.- if %i[group_list category_list].include?(type_supervisor.get_type(name))+ #+ # For group_list settings, while the granular_anonymous_and_logged_in_groups_permissions+ # upcoming change is enabled, stored `0` (the `:everyone` pseudogroup) is swapped to+ # `5` (the `:logged_in_users` pseudogroup) at read time. This preserves admins' intent+ # ("allow everyone logged in") without mutating the stored value, so disabling the+ # flag is a perfect revert. When the change graduates to stable, a data migration will+ # rewrite stored values and this swap can be removed.+ setting_type = type_supervisor.get_type(name)+ if setting_type == :category_listdefine_singleton_method("#{clean_name}_map") doself.public_send(clean_name).to_s.split("|").map(&:to_i)end+ elsif setting_type == :group_list+ define_singleton_method("#{clean_name}_map") do+ ids = self.public_send(clean_name).to_s.split("|").map(&:to_i)+ if SiteSetting.granular_anonymous_and_logged_in_groups_permissions &&+ ids.include?(Group::AUTO_GROUPS[:everyone])+ ids =+ ids+ .map do |id|+ id == Group::AUTO_GROUPS[:everyone] ? Group::AUTO_GROUPS[:logged_in_users] : id+ end+ .uniq+ end+ ids+ endend# Upcoming change settings have a supplemental array of group IDs that are used to opt-indiff --git a/spec/lib/site_setting_extension_spec.rb b/spec/lib/site_setting_extension_spec.rbindex 6d3bb71f208..e1e735b191d 100644--- a/spec/lib/site_setting_extension_spec.rb+++ b/spec/lib/site_setting_extension_spec.rb@@ -1749,6 +1749,43 @@ RSpec.describe SiteSettingExtension doexpect(SiteSetting.pm_tags_allowed_for_groups_map).to eq([])expect(SiteSetting.exclude_rel_nofollow_domains_map).to eq([])end++ describe "granular_anonymous_and_logged_in_groups_permissions read-time swap" do+ let(:everyone_id) { Group::AUTO_GROUPS[:everyone] }+ let(:logged_in_id) { Group::AUTO_GROUPS[:logged_in_users] }++ it "returns the stored ids unchanged when the upcoming change is disabled" do+ SiteSetting.granular_anonymous_and_logged_in_groups_permissions = false+ SiteSetting.experimental_new_new_view_groups = "#{everyone_id}|11"+ expect(SiteSetting.experimental_new_new_view_groups_map).to eq([everyone_id, 11])+ end++ it "swaps 0 for logged_in_users when the upcoming change is enabled" do+ SiteSetting.granular_anonymous_and_logged_in_groups_permissions = true+ SiteSetting.experimental_new_new_view_groups = "#{everyone_id}|11"+ expect(SiteSetting.experimental_new_new_view_groups_map).to eq([logged_in_id, 11])+ end++ it "dedups when logged_in_users is already stored alongside everyone" do+ SiteSetting.granular_anonymous_and_logged_in_groups_permissions = true+ SiteSetting.experimental_new_new_view_groups = "#{everyone_id}|#{logged_in_id}|1"+ expect(SiteSetting.experimental_new_new_view_groups_map).to eq([logged_in_id, 1])+ end++ it "leaves the stored database value untouched" do+ SiteSetting.experimental_new_new_view_groups = "#{everyone_id}|11"+ SiteSetting.granular_anonymous_and_logged_in_groups_permissions = true+ SiteSetting.experimental_new_new_view_groups_map # trigger getter++ expect(SiteSetting.experimental_new_new_view_groups).to eq("#{everyone_id}|11")+ end++ it "does not affect category_list settings" do+ SiteSetting.granular_anonymous_and_logged_in_groups_permissions = true+ SiteSetting.digest_suppress_categories = "#{everyone_id}|4"+ expect(SiteSetting.digest_suppress_categories_map).to eq([everyone_id, 4])+ end+ endenddescribe "keywords" dodiff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rbindex 4a5519ea055..e23bd4fbd84 100644--- a/spec/models/group_spec.rb+++ b/spec/models/group_spec.rb@@ -296,7 +296,7 @@ RSpec.describe Group do).to contain_exactly(10, 11, 12, 13)end- it "excludes the undefined groups between staff and TL0" do+ it "excludes the undefined and pseudo groups between staff and TL0" doexpect(described_class.auto_groups_between(:admins, :trust_level_0)).to contain_exactly(1,2,diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rbindex 05a3f5ddd91..638454a18df 100644--- a/spec/models/user_spec.rb+++ b/spec/models/user_spec.rb@@ -61,6 +61,44 @@ RSpec.describe User doexpect(Discourse.system_user.in_any_groups?([Group::AUTO_GROUPS[:trust_level_4]])).to eq(true)expect(Discourse.system_user.in_any_groups?([Group::AUTO_GROUPS[:admins]])).to eq(true)end++ it "returns true if any of the group IDs are the 'logged_in_users' auto group" do+ expect(user.in_any_groups?([Group::AUTO_GROUPS[:logged_in_users]])).to eq(true)+ end++ it "never returns true for the 'anonymous' auto group — logged-in users are not anonymous" do+ GroupUser.where(user_id: Discourse::SYSTEM_USER_ID).delete_all+ Discourse.system_user.reload+ expect(user.in_any_groups?([Group::AUTO_GROUPS[:anonymous]])).to eq(false)+ expect(Discourse.system_user.in_any_groups?([Group::AUTO_GROUPS[:anonymous]])).to eq(false)+ end++ context "with granular_anonymous_and_logged_in_groups_permissions enabled" do+ before { SiteSetting.granular_anonymous_and_logged_in_groups_permissions = true }++ it "stops returning true for the 'everyone' auto group" do+ expect(user.in_any_groups?([Group::AUTO_GROUPS[:everyone]])).to eq(false)+ end++ it "still returns true for the 'logged_in_users' auto group" do+ expect(user.in_any_groups?([Group::AUTO_GROUPS[:logged_in_users]])).to eq(true)+ end++ it "still returns true when the user is explicitly in a custom group" do+ group.add(user)+ user.reload+ expect(user.in_any_groups?([group.id])).to eq(true)+ end++ it "still returns true for system user against staff/TL auto groups" do+ GroupUser.where(user_id: Discourse::SYSTEM_USER_ID).delete_all+ Discourse.system_user.reload+ expect(Discourse.system_user.in_any_groups?([Group::AUTO_GROUPS[:admins]])).to eq(true)+ expect(Discourse.system_user.in_any_groups?([Group::AUTO_GROUPS[:trust_level_4]])).to eq(+ true,+ )+ end+ endenddescribe "Associations" do