A platform for community discussion. Free, open, simple.
FIX: can_create_discourse_post_event? not checking user groups correctly (#42284)
Martin Brennan57779cc4be03
diff --git a/app/models/group.rb b/app/models/group.rbindex 5e19f831eca..ec0919f99c7 100644--- a/app/models/group.rb+++ b/app/models/group.rb@@ -806,6 +806,32 @@ class Group < ActiveRecord::Basetrust_group_ids.keep_if { |id| id == AUTO_GROUPS[:trust_level_0] || (trust_level + 10) >= id }end+ def self.refresh_automatic_groups_for_user!(user)+ automatic_group_ids = auto_groups_between(:admins, :trust_level_4)+ groups_by_id = automatic_group_ids.index_with { |group_id| self[AUTO_GROUP_IDS[group_id]] }++ desired_group_ids = desired_trust_level_groups(user.trust_level)+ desired_group_ids << AUTO_GROUPS[:admins] if user.admin?+ desired_group_ids << AUTO_GROUPS[:moderators] if user.moderator?+ desired_group_ids << AUTO_GROUPS[:staff] if user.staff?++ current_group_ids =+ GroupUser.where(user_id: user.id, group_id: automatic_group_ids).pluck(:group_id)++ Group.transaction do+ (current_group_ids - desired_group_ids).each do |group_id|+ GroupUser.find_by!(user_id: user.id, group_id:).destroy!+ groups_by_id[group_id].trigger_user_removed_event(user)+ end+ (desired_group_ids - current_group_ids).each do |group_id|+ groups_by_id[group_id].group_users.create!(user:)+ groups_by_id[group_id].trigger_user_added_event(user, true)+ end+ end++ user.reload+ end+def self.user_trust_level_change!(user_id, trust_level)desired = desired_trust_level_groups(trust_level)undesired = trust_group_ids - desireddiff --git a/plugins/discourse-calendar/config/settings.yml b/plugins/discourse-calendar/config/settings.ymlindex 5deb0abea57..0d5ed067e25 100644--- a/plugins/discourse-calendar/config/settings.yml+++ b/plugins/discourse-calendar/config/settings.yml@@ -79,6 +79,7 @@ discourse_calendar:default: ""allow_any: falserefresh: true+ mandatory_values: "1|2" # admins, moderatorsdisplayed_invitees_limit:default: 10client: falsediff --git a/plugins/discourse-calendar/lib/discourse_post_event/event_validator.rb b/plugins/discourse-calendar/lib/discourse_post_event/event_validator.rbindex 233334d45a5..deafca2c811 100644--- a/plugins/discourse-calendar/lib/discourse_post_event/event_validator.rb+++ b/plugins/discourse-calendar/lib/discourse_post_event/event_validator.rb@@ -38,7 +38,7 @@ module DiscoursePostEventreturn false unless can_invite_groups?(extracted_event)if @post.acting_user && @post.event- if [email protected]_user.can_act_on_discourse_post_event?(@post.event)+ if [email protected]_user.guardian.can_act_on_discourse_post_event?(@post.event)@post.errors.add(:base,I18n.t(@@ -48,7 +48,7 @@ module DiscoursePostEventreturn falseendelse- if [email protected]_user || [email protected]_user.can_create_discourse_post_event?+ if [email protected]_user.guardian.can_create_discourse_post_event?@post.errors.add(:base,I18n.t(@@ -140,7 +140,6 @@ module DiscoursePostEventprivatedef can_invite_groups?(event)- guardian = Guardian.new(@post.acting_user)return true unless event[:"allowed-groups"]event[:"allowed-groups"]@@ -153,7 +152,7 @@ module DiscoursePostEventnilend- if !group || !guardian.can_see_group?(group)+ if !group || [email protected]_user.guardian.can_see_group?(group)@post.errors.add(:base,I18n.t("discourse_post_event.errors.models.event.invalid_allowed_groups"),@@ -161,7 +160,7 @@ module DiscoursePostEventreturn falseend- if !guardian.can_see_group_members?(group)+ if [email protected]_user.guardian.can_see_group_members?(group)@post.errors.add(:base,I18n.t(diff --git a/plugins/discourse-calendar/lib/discourse_post_event/export_csv_file_extension.rb b/plugins/discourse-calendar/lib/discourse_post_event/export_csv_file_extension.rbindex 10cb5bca6c8..41c7cbf8db9 100644--- a/plugins/discourse-calendar/lib/discourse_post_event/export_csv_file_extension.rb+++ b/plugins/discourse-calendar/lib/discourse_post_event/export_csv_file_extension.rb@@ -34,19 +34,4 @@ module DiscoursePostEventendendend-- module GuardianExtension- def can_export_entity?(entity, entity_id = nil, args = nil)- if entity == "post_event"- return false if !SiteSetting.discourse_post_event_enabled-- event_id = args&.[](:id) || args&.[]("id")- event = DiscoursePostEvent::Event.find_by(id: event_id)-- return event.present? && can_act_on_discourse_post_event?(event)- end-- super- end- endenddiff --git a/plugins/discourse-calendar/lib/discourse_post_event/guardian_extensions.rb b/plugins/discourse-calendar/lib/discourse_post_event/guardian_extensions.rbnew file mode 100644index 00000000000..9aa7c1a69ab--- /dev/null+++ b/plugins/discourse-calendar/lib/discourse_post_event/guardian_extensions.rb@@ -0,0 +1,50 @@+# frozen_string_literal: true++module DiscoursePostEvent+ module GuardianExtensions+ def can_act_on_invitee?(invitee)+ return false if anonymous?+ user.id == invitee.user_id || can_act_on_discourse_post_event?(invitee.event)+ end++ def can_create_discourse_post_event?+ return false if anonymous?+ @can_create_discourse_post_event ||=+ user.in_any_groups?(SiteSetting.discourse_post_event_allowed_on_groups_map)+ end++ def can_act_on_discourse_post_event?(event)+ return false if anonymous?+ can_create_discourse_post_event? && can_edit_post?(event.post)+ end++ def can_display_invitee_details?(event)+ return true if !event.private? || can_act_on_discourse_post_event?(event)++ raw_invitees = Array(event.raw_invitees).uniq++ return true if user && event.user_in_invited_group?(user)+ return false if raw_invitees.blank?++ Group+ .visible_groups(user)+ .members_visible_groups(user)+ .where(name: raw_invitees)+ .distinct+ .count == raw_invitees.length+ end++ def can_export_entity?(entity, entity_id = nil, args = nil)+ if entity == "post_event"+ return false if !SiteSetting.discourse_post_event_enabled++ event_id = args&.[](:id) || args&.[]("id")+ event = DiscoursePostEvent::Event.find_by(id: event_id)++ return event.present? && can_act_on_discourse_post_event?(event)+ end++ super+ end+ end+enddiff --git a/plugins/discourse-calendar/plugin.rb b/plugins/discourse-calendar/plugin.rbindex 29bf67cf7e2..f348d514fa7 100644--- a/plugins/discourse-calendar/plugin.rb+++ b/plugins/discourse-calendar/plugin.rb@@ -280,6 +280,7 @@ after_initialize dorequire_relative "lib/discourse_post_event/event_validator"require_relative "lib/discourse_post_event/export_csv_controller_extension"require_relative "lib/discourse_post_event/export_csv_file_extension"+ require_relative "lib/discourse_post_event/guardian_extensions"require_relative "lib/discourse_post_event/post_extension"require_relative "lib/discourse_post_event/topic_extension"require_relative "lib/discourse_post_event/rrule_generator"@@ -320,7 +321,7 @@ after_initialize doreloadable_patch doExportCsvController.prepend(DiscoursePostEvent::ExportCsvControllerExtension)Jobs::ExportCsvFile.prepend(DiscoursePostEvent::ExportPostEventCsvReportExtension)- Guardian.prepend(DiscoursePostEvent::GuardianExtension)+ Guardian.prepend(DiscoursePostEvent::GuardianExtensions)Post.prepend(DiscoursePostEvent::PostExtension)::WebHook.prepend(DiscoursePostEvent::WebHookExtension)Topic.prepend(DiscoursePostEvent::TopicExtension)@@ -328,64 +329,12 @@ after_initialize doChat::Channel.prepend(DiscourseCalendar::Livestream::ChatChannelExtension)end- add_to_class(:user, :can_create_discourse_post_event?) do- return @can_create_discourse_post_event if defined?(@can_create_discourse_post_event)- @can_create_discourse_post_event =- begin- return true if staff?- allowed_groups = SiteSetting.discourse_post_event_allowed_on_groups.to_s.split("|").compact- allowed_groups.present? &&- (- allowed_groups.include?(Group::AUTO_GROUPS[:everyone].to_s) ||- groups.where(id: allowed_groups).exists?- )- rescue StandardError- false- end- end-- add_to_class(:guardian, :can_act_on_invitee?) do |invitee|- user && (user.id == invitee.user_id || can_act_on_discourse_post_event?(invitee.event))- end-- add_to_class(:guardian, :can_create_discourse_post_event?) do- user && user.can_create_discourse_post_event?- end-add_to_serializer(:current_user, :can_create_discourse_post_event) do- object.can_create_discourse_post_event?- end-- add_to_class(:user, :can_act_on_discourse_post_event?) do |event|- return true if staff?- can_create_discourse_post_event? && Guardian.new(self).can_edit_post?(event.post)- rescue StandardError- false- end-- add_to_class(:guardian, :can_act_on_discourse_post_event?) do |event|- user && user.can_act_on_discourse_post_event?(event)- end-- add_to_class(:guardian, :can_display_invitee_details?) do |event|- return true if !event.private? || can_act_on_discourse_post_event?(event)-- raw_invitees = Array(event.raw_invitees).uniq-- return true if user && event.user_in_invited_group?(user)-- return false if raw_invitees.blank?-- Group- .visible_groups(user)- .members_visible_groups(user)- .where(name: raw_invitees)- .distinct- .count == raw_invitees.length+ scope.can_create_discourse_post_event?endadd_class_method(:group, :discourse_post_event_allowed_groups) do- where(id: SiteSetting.discourse_post_event_allowed_on_groups.split("|").compact)+ where(id: SiteSetting.discourse_post_event_allowed_on_groups_map)endTopicView.on_preload do |topic_view|diff --git a/plugins/discourse-calendar/spec/integration/allowed_custom_fields_setting_spec.rb b/plugins/discourse-calendar/spec/integration/allowed_custom_fields_setting_spec.rbindex c12ff4c7fe0..0e10652e99a 100644--- a/plugins/discourse-calendar/spec/integration/allowed_custom_fields_setting_spec.rb+++ b/plugins/discourse-calendar/spec/integration/allowed_custom_fields_setting_spec.rb@@ -1,7 +1,7 @@# frozen_string_literal: truedescribe "discourse_post_event_allowed_custom_fields" do- let(:user_1) { Fabricate(:user, admin: true) }+ let(:user_1) { Fabricate(:user, admin: true, refresh_auto_groups: true) }let(:topic_1) { Fabricate(:topic, user: user_1) }let(:post_1) { Fabricate(:post, topic: topic_1) }let(:post_event_1) { Fabricate(:event, post: post_1) }diff --git a/plugins/discourse-calendar/spec/integration/invitee_spec.rb b/plugins/discourse-calendar/spec/integration/invitee_spec.rbindex 19b8e8f1d79..d23b6a58410 100644--- a/plugins/discourse-calendar/spec/integration/invitee_spec.rb+++ b/plugins/discourse-calendar/spec/integration/invitee_spec.rb@@ -8,7 +8,7 @@ describe DiscoursePostEvent::Invitee doSiteSetting.discourse_post_event_enabled = trueend- let(:user) { Fabricate(:user, admin: true) }+ let(:user) { Fabricate(:user, admin: true, refresh_auto_groups: true) }let(:user_1) { Fabricate(:user) }let(:topic) { Fabricate(:topic, user: user) }let(:post1) { Fabricate(:post, topic: topic) }diff --git a/plugins/discourse-calendar/spec/integration/recurrence_spec.rb b/plugins/discourse-calendar/spec/integration/recurrence_spec.rbindex e6206866af0..51d4c0fe359 100644--- a/plugins/discourse-calendar/spec/integration/recurrence_spec.rb+++ b/plugins/discourse-calendar/spec/integration/recurrence_spec.rb@@ -1,7 +1,7 @@# frozen_string_literal: truedescribe "discourse_post_event_recurrence" do- let(:user_1) { Fabricate(:user, admin: true) }+ let(:user_1) { Fabricate(:user, admin: true, refresh_auto_groups: true) }let(:topic_1) { Fabricate(:topic, user: user_1) }let(:post_1) { Fabricate(:post, topic: topic_1) }let(:starts_at) { Time.zone.parse("2020-09-10 19:00") }diff --git a/plugins/discourse-calendar/spec/jobs/export_post_event_report_csv_spec.rb b/plugins/discourse-calendar/spec/jobs/export_post_event_report_csv_spec.rbindex b716d723da9..d4ad91e3135 100644--- a/plugins/discourse-calendar/spec/jobs/export_post_event_report_csv_spec.rb+++ b/plugins/discourse-calendar/spec/jobs/export_post_event_report_csv_spec.rb@@ -10,9 +10,9 @@ describe Jobs::ExportCsvFile dodescribe "#execute" docontext "when the requesting user is admin" do- let(:user) { Fabricate(:user, admin: true) }- let(:user_1) { Fabricate(:user) }- let(:user_2) { Fabricate(:user) }+ let(:user) { Fabricate(:user, admin: true, refresh_auto_groups: true) }+ let(:user_1) { Fabricate(:user, refresh_auto_groups: true) }+ let(:user_2) { Fabricate(:user, refresh_auto_groups: true) }let(:topic) { Fabricate(:topic, user: user) }let(:post1) { Fabricate(:post, topic: topic) }let(:post_event) { Fabricate(:event, post: post1) }diff --git a/plugins/discourse-calendar/spec/jobs/regular/discourse_post_event/bulk_invite_spec.rb b/plugins/discourse-calendar/spec/jobs/regular/discourse_post_event/bulk_invite_spec.rbindex 9e250a12a2c..7f880631b83 100644--- a/plugins/discourse-calendar/spec/jobs/regular/discourse_post_event/bulk_invite_spec.rb+++ b/plugins/discourse-calendar/spec/jobs/regular/discourse_post_event/bulk_invite_spec.rb@@ -1,7 +1,7 @@# frozen_string_literal: truedescribe Jobs::DiscoursePostEventBulkInvite do- let(:user_1) { Fabricate(:user, admin: true) }+ let(:user_1) { Fabricate(:user, admin: true, refresh_auto_groups: true) }let(:topic_1) { Fabricate(:topic, user: user_1) }let(:post_1) { Fabricate(:post, topic: topic_1) }let(:post_event_1) { Fabricate(:event, post: post_1, status: "private") }diff --git a/plugins/discourse-calendar/spec/jobs/regular/discourse_post_event/bump_topic_spec.rb b/plugins/discourse-calendar/spec/jobs/regular/discourse_post_event/bump_topic_spec.rbindex 837a378767e..1dcf8eefb95 100644--- a/plugins/discourse-calendar/spec/jobs/regular/discourse_post_event/bump_topic_spec.rb+++ b/plugins/discourse-calendar/spec/jobs/regular/discourse_post_event/bump_topic_spec.rb@@ -1,7 +1,7 @@# frozen_string_literal: truedescribe Jobs::DiscoursePostEventBumpTopic do- let(:admin_1) { Fabricate(:user, admin: true) }+ let(:admin_1) { Fabricate(:user, admin: true, refresh_auto_groups: true) }let(:topic_1) { Fabricate(:topic, user: admin_1) }before dodiff --git a/plugins/discourse-calendar/spec/jobs/regular/discourse_post_event/send_reminder_spec.rb b/plugins/discourse-calendar/spec/jobs/regular/discourse_post_event/send_reminder_spec.rbindex 3cc74b4552b..1fd6fa3bd97 100644--- a/plugins/discourse-calendar/spec/jobs/regular/discourse_post_event/send_reminder_spec.rb+++ b/plugins/discourse-calendar/spec/jobs/regular/discourse_post_event/send_reminder_spec.rb@@ -1,7 +1,7 @@# frozen_string_literal: truedescribe Jobs::DiscoursePostEventSendReminder do- let(:admin_1) { Fabricate(:user, admin: true) }+ let(:admin_1) { Fabricate(:user, admin: true, refresh_auto_groups: true) }let(:going_user) { Fabricate(:user) }let(:interested_user) { Fabricate(:user) }let(:visited_going_user) { Fabricate(:user) }diff --git a/plugins/discourse-calendar/spec/lib/discourse_post_event/event_onebox_data_spec.rb b/plugins/discourse-calendar/spec/lib/discourse_post_event/event_onebox_data_spec.rbindex 68fddca0346..8ff521d2179 100644--- a/plugins/discourse-calendar/spec/lib/discourse_post_event/event_onebox_data_spec.rb+++ b/plugins/discourse-calendar/spec/lib/discourse_post_event/event_onebox_data_spec.rb@@ -1,7 +1,7 @@# frozen_string_literal: truedescribe DiscoursePostEvent::EventOneboxData do- fab!(:author, :user) { Fabricate(:user, admin: true) }+ fab!(:author, :user) { Fabricate(:user, admin: true, refresh_auto_groups: true) }fab!(:reader, :user)before dodiff --git a/plugins/discourse-calendar/spec/lib/discourse_post_event/guardian_extensions_spec.rb b/plugins/discourse-calendar/spec/lib/discourse_post_event/guardian_extensions_spec.rbnew file mode 100644index 00000000000..c9ee9c62cfc--- /dev/null+++ b/plugins/discourse-calendar/spec/lib/discourse_post_event/guardian_extensions_spec.rb@@ -0,0 +1,185 @@+# frozen_string_literal: true++RSpec.describe DiscoursePostEvent::GuardianExtensions do+ fab!(:user) { Fabricate(:user, refresh_auto_groups: true) }+ fab!(:other_user, :user)+ fab!(:allowed_group) do+ Fabricate(:group).tap do |group|+ group.add(user)+ group.save!+ end+ end+ fab!(:own_post) { Fabricate(:post, user:, topic: Fabricate(:topic, user:)) }+ fab!(:own_event) { Fabricate(:event, post: own_post) }+ fab!(:other_post) do+ Fabricate(:post, user: other_user, topic: Fabricate(:topic, user: other_user))+ end+ fab!(:other_event) { Fabricate(:event, post: other_post) }++ let(:guardian) { user.guardian }++ before do+ SiteSetting.calendar_enabled = true+ SiteSetting.discourse_post_event_enabled = true+ SiteSetting.discourse_post_event_allowed_on_groups = allowed_group.id+ end++ describe "#can_create_discourse_post_event?" do+ it "allows staff, members of an allowed group, and everyone when configured" do+ expect(Fabricate(:admin).guardian.can_create_discourse_post_event?).to eq(true)+ expect(guardian.can_create_discourse_post_event?).to eq(true)++ # TODO: Remove this when everyone pseudogroup is no longer valid after+ # granular_anonymous_and_logged_in_groups_permissions is permanent+ SiteSetting.discourse_post_event_allowed_on_groups = Group::AUTO_GROUPS[:everyone]+ expect(other_user.guardian.can_create_discourse_post_event?).to eq(true)+ end++ it "denies anonymous users and users outside the allowed groups" do+ expect(Guardian.new.can_create_discourse_post_event?).to be_falsey+ expect(other_user.guardian.can_create_discourse_post_event?).to eq(false)+ end++ it "allows logged_in_users when configured" do+ SiteSetting.discourse_post_event_allowed_on_groups = Group::AUTO_GROUPS[:logged_in_users]+ expect(other_user.guardian.can_create_discourse_post_event?).to eq(true)+ end+ end++ describe "#can_act_on_discourse_post_event?" do+ it "allows staff and an allowed event author" do+ expect(Fabricate(:admin).guardian.can_act_on_discourse_post_event?(other_event)).to eq(true)+ expect(guardian.can_act_on_discourse_post_event?(own_event)).to eq(true)+ end++ it "allows an allowed user who can edit someone else's post" do+ user.update!(trust_level: TrustLevel[4])+ Group.refresh_automatic_groups!++ expect(guardian.can_act_on_discourse_post_event?(other_event)).to eq(true)+ end++ it "denies an allowed user who cannot edit the event post" do+ expect(guardian.can_act_on_discourse_post_event?(other_event)).to eq(false)+ end++ it "denies an event author outside the allowed groups" do+ expect(other_user.guardian.can_act_on_discourse_post_event?(other_event)).to eq(false)+ end++ it "does not reuse the result from another event" do+ expect(guardian.can_act_on_discourse_post_event?(own_event)).to eq(true)+ expect(guardian.can_act_on_discourse_post_event?(other_event)).to eq(false)+ expect(guardian.can_act_on_discourse_post_event?(own_event)).to eq(true)+ end+ end++ describe "#can_act_on_invitee?" do+ it "allows an invitee to act on their own attendance" do+ invitee =+ Fabricate(+ :invitee,+ event: other_event,+ user:,+ status: DiscoursePostEvent::Invitee.statuses[:going],+ )++ expect(guardian.can_act_on_invitee?(invitee)).to eq(true)+ end++ it "allows an event manager and denies an unrelated user" do+ invitee =+ Fabricate(+ :invitee,+ event: own_event,+ user: other_user,+ status: DiscoursePostEvent::Invitee.statuses[:going],+ )++ expect(guardian.can_act_on_invitee?(invitee)).to eq(true)+ expect(Fabricate(:user).guardian.can_act_on_invitee?(invitee)).to eq(false)+ end+ end++ describe "#can_display_invitee_details?" do+ it "allows anyone to see invitee details for a public event" do+ expect(Guardian.new.can_display_invitee_details?(other_event)).to eq(true)+ end++ it "allows an event manager to see invitee details for a private event" do+ own_event.update!(status: DiscoursePostEvent::Event.statuses[:private])++ expect(guardian.can_display_invitee_details?(own_event)).to eq(true)+ end++ it "allows an invited group member even when the group's details are hidden" do+ hidden_group =+ Fabricate(+ :group,+ visibility_level: Group.visibility_levels[:owners],+ members_visibility_level: Group.visibility_levels[:owners],+ )+ hidden_group.add(user)+ other_event.update!(+ status: DiscoursePostEvent::Event.statuses[:private],+ raw_invitees: [hidden_group.name],+ )++ expect(guardian.can_display_invitee_details?(other_event)).to eq(true)+ end++ it "allows a user who can see every invited group and its members" do+ visible_group =+ Fabricate(+ :group,+ visibility_level: Group.visibility_levels[:public],+ members_visibility_level: Group.visibility_levels[:public],+ )+ other_event.update!(+ status: DiscoursePostEvent::Event.statuses[:private],+ raw_invitees: [visible_group.name],+ )++ expect(guardian.can_display_invitee_details?(other_event)).to eq(true)+ end++ it "denies a user when an invited group or its members are hidden" do+ hidden_group =+ Fabricate(+ :group,+ visibility_level: Group.visibility_levels[:owners],+ members_visibility_level: Group.visibility_levels[:owners],+ )+ other_event.update!(+ status: DiscoursePostEvent::Event.statuses[:private],+ raw_invitees: [hidden_group.name],+ )++ expect(guardian.can_display_invitee_details?(other_event)).to eq(false)+ end++ it "denies a user when a private event has no invited groups" do+ other_event.update!(status: DiscoursePostEvent::Event.statuses[:private], raw_invitees: [])++ expect(guardian.can_display_invitee_details?(other_event)).to eq(false)+ end+ end++ describe "#can_export_entity?" do+ it "allows an event manager to export the event" do+ expect(guardian.can_export_entity?("post_event", nil, id: own_event.id)).to eq(true)+ end++ it "denies the export when events are disabled or the event does not exist" do+ SiteSetting.discourse_post_event_enabled = false+ expect(guardian.can_export_entity?("post_event", nil, id: own_event.id)).to eq(false)++ SiteSetting.discourse_post_event_enabled = true+ expect(guardian.can_export_entity?("post_event", nil, id: -1)).to eq(false)+ end++ it "preserves core export permissions for other entity types" do+ expect(Fabricate(:admin).guardian.can_export_entity?("user_list")).to eq(true)+ end+ end+enddiff --git a/plugins/discourse-calendar/spec/lib/discourse_post_event/pretty_text_spec.rb b/plugins/discourse-calendar/spec/lib/discourse_post_event/pretty_text_spec.rbindex 3ee2545d7a6..d8483bce966 100644--- a/plugins/discourse-calendar/spec/lib/discourse_post_event/pretty_text_spec.rb+++ b/plugins/discourse-calendar/spec/lib/discourse_post_event/pretty_text_spec.rb@@ -325,7 +325,7 @@ describe PrettyText doenddescribe "An event is summarized in an excerpt (used by oneboxes)" do- fab!(:user_1, :user) { Fabricate(:user, admin: true) }+ fab!(:user_1, :user) { Fabricate(:user, admin: true, refresh_auto_groups: true) }def excerpt_for(post)PrettyText.excerpt(post.cooked, SiteSetting.post_onebox_maxlength, post: post)diff --git a/plugins/discourse-calendar/spec/models/discourse_post_event/event_date_spec.rb b/plugins/discourse-calendar/spec/models/discourse_post_event/event_date_spec.rbindex 91c6ba3c408..426a5480020 100644--- a/plugins/discourse-calendar/spec/models/discourse_post_event/event_date_spec.rb+++ b/plugins/discourse-calendar/spec/models/discourse_post_event/event_date_spec.rb@@ -1,7 +1,7 @@# frozen_string_literal: truedescribe DiscoursePostEvent::EventDate do- let(:user) { Fabricate(:user, admin: true) }+ let(:user) { Fabricate(:user, admin: true, refresh_auto_groups: true) }let(:topic) { Fabricate(:topic, user: user) }let!(:first_post) { Fabricate(:post, topic: topic) }let!(:second_post) { Fabricate(:post, topic: topic) }diff --git a/plugins/discourse-calendar/spec/models/discourse_post_event/event_spec.rb b/plugins/discourse-calendar/spec/models/discourse_post_event/event_spec.rbindex 4ccf33b64cf..287b4647eb7 100644--- a/plugins/discourse-calendar/spec/models/discourse_post_event/event_spec.rb+++ b/plugins/discourse-calendar/spec/models/discourse_post_event/event_spec.rb@@ -238,7 +238,7 @@ describe DiscoursePostEvent::Event doenddescribe "#raw_invitees_are_groups" do- fab!(:user) { Fabricate(:user, admin: true) }+ fab!(:user) { Fabricate(:user, admin: true, refresh_auto_groups: true) }fab!(:topic) { Fabricate(:topic, user: user) }fab!(:post) { Fabricate(:post, topic: topic) }@@ -276,7 +276,7 @@ describe DiscoursePostEvent::Event doenddescribe "topic custom fields callback" do- let(:user) { Fabricate(:user, admin: true) }+ let(:user) { Fabricate(:user, admin: true, refresh_auto_groups: true) }let!(:notified_user) { Fabricate(:user) }let(:topic) { Fabricate(:topic, user: user) }let!(:first_post) { Fabricate(:post, topic: topic) }@@ -546,7 +546,7 @@ describe DiscoursePostEvent::Event doenddescribe "#ongoing?" do- let(:user) { Fabricate(:user, admin: true) }+ let(:user) { Fabricate(:user, admin: true, refresh_auto_groups: true) }let(:topic) { Fabricate(:topic, user: user) }let!(:first_post) { Fabricate(:post, topic: topic) }@@ -626,7 +626,7 @@ describe DiscoursePostEvent::Event doenddescribe "#currently_within_event_timeframe?" do- let(:user) { Fabricate(:user, admin: true) }+ let(:user) { Fabricate(:user, admin: true, refresh_auto_groups: true) }let(:topic) { Fabricate(:topic, user: user) }let!(:first_post) { Fabricate(:post, topic: topic) }@@ -704,7 +704,7 @@ describe DiscoursePostEvent::Event doenddescribe "#expired?" do- let(:user) { Fabricate(:user, admin: true) }+ let(:user) { Fabricate(:user, admin: true, refresh_auto_groups: true) }let(:topic) { Fabricate(:topic, user: user) }let!(:first_post) { Fabricate(:post, topic: topic) }@@ -1165,7 +1165,7 @@ describe DiscoursePostEvent::Event doenddescribe "syncing from raw" do- fab!(:user) { Fabricate(:user, admin: true) }+ fab!(:user) { Fabricate(:user, admin: true, refresh_auto_groups: true) }fab!(:topic) { Fabricate(:topic, user: user) }fab!(:post) { Fabricate(:post, topic: topic, user: user) }fab!(:upload)@@ -1326,7 +1326,7 @@ describe DiscoursePostEvent::Event doenddescribe "post/topic image_upload_id sync on post_edited" do- fab!(:user) { Fabricate(:user, admin: true) }+ fab!(:user) { Fabricate(:user, admin: true, refresh_auto_groups: true) }fab!(:topic) { Fabricate(:topic, user: user) }fab!(:post) { Fabricate(:post, topic: topic, user: user, post_number: 1) }fab!(:upload)diff --git a/plugins/discourse-calendar/spec/models/discourse_post_event/user_spec.rb b/plugins/discourse-calendar/spec/models/discourse_post_event/user_spec.rbdeleted file mode 100644index b396b854c34..00000000000--- a/plugins/discourse-calendar/spec/models/discourse_post_event/user_spec.rb+++ /dev/null@@ -1,120 +0,0 @@-# frozen_string_literal: true--describe User do- Event = DiscoursePostEvent::Event-- before do- freeze_time DateTime.parse("2020-04-24 14:10")- Jobs.run_immediately!- SiteSetting.calendar_enabled = true- SiteSetting.discourse_post_event_enabled = true- end-- describe "#can_act_on_discourse_post_event?" do- context "when user is staff" do- let(:user_1) { Fabricate(:user, admin: true) }- let(:user_2) { Fabricate(:user, admin: true) }- let(:topic_1) { Fabricate(:topic, user: user_2) }- let(:post_1) { Fabricate(:post, topic: topic_1, user: user_2) }- let(:post_event_1) { Fabricate(:event, post: post_1) }-- it "can act on the event" do- expect(user_1.can_act_on_discourse_post_event?(post_event_1)).to eq(true)- end- end-- context "when user is not staff" do- let(:user_1) { Fabricate(:user, refresh_auto_groups: true) }-- context "when user is in list of allowed groups" do- let(:group_1) do- Fabricate(:group).tap do |g|- g.add(user_1)- g.save!- end- end-- before { SiteSetting.discourse_post_event_allowed_on_groups = group_1.id }-- context "when user created the event" do- let(:topic_1) { Fabricate(:topic, user: user_1) }- let(:post_1) { Fabricate(:post, topic: topic_1, user: user_1) }- let(:post_event_1) { Fabricate(:event, post: post_1) }-- it "can act on the event" do- expect(user_1.can_act_on_discourse_post_event?(post_event_1)).to eq(true)- end- end-- context "when allowed group is 'everyone'" do- let(:topic_1) { Fabricate(:topic, user: user_1) }- let(:post_1) { Fabricate(:post, topic: topic_1, user: user_1) }- let(:post_event_1) { Fabricate(:event, post: post_1) }-- it "can act on the event" do- SiteSetting.discourse_post_event_allowed_on_groups = Group::AUTO_GROUPS[:everyone]- expect(user_1.can_act_on_discourse_post_event?(post_event_1)).to eq(true)- end- end-- context "when user didn’t create the event" do- let(:user_2) { Fabricate(:user) }- let(:topic_1) { Fabricate(:topic, user: user_2) }- let(:post_1) { Fabricate(:post, topic: topic_1, user: user_2) }- let(:post_event_1) { Fabricate(:event, post: post_1) }-- it "cannot act on the event" do- expect(user_1.can_act_on_discourse_post_event?(post_event_1)).to eq(false)- end- end-- context "when user didn’t create the event, but is allowed to edit the post" do- let(:user_2) { Fabricate(:user) }- let(:topic_1) { Fabricate(:topic, user: user_2) }- let(:post_1) { Fabricate(:post, topic: topic_1, user: user_2) }- let(:post_event_1) { Fabricate(:event, post: post_1) }- before do- user_1.update(trust_level: 4)- Group.refresh_automatic_groups!- end-- it "can act on the event" do- expect(user_1.can_act_on_discourse_post_event?(post_event_1)).to eq(true)- end- end-- context "with multiple events in the same request" do- let(:user_2) { Fabricate(:user) }-- let(:own_topic) { Fabricate(:topic, user: user_1) }- let(:own_post) { Fabricate(:post, topic: own_topic, user: user_1) }- let(:own_event) { Fabricate(:event, post: own_post) }-- let(:other_topic) { Fabricate(:topic, user: user_2) }- let(:other_post) { Fabricate(:post, topic: other_topic, user: user_2) }- let(:other_event) { Fabricate(:event, post: other_post) }-- it "does not leak the answer from one event to another" do- expect(user_1.can_act_on_discourse_post_event?(own_event)).to eq(true)- expect(user_1.can_act_on_discourse_post_event?(other_event)).to eq(false)- end-- it "does not leak a negative answer either" do- expect(user_1.can_act_on_discourse_post_event?(other_event)).to eq(false)- expect(user_1.can_act_on_discourse_post_event?(own_event)).to eq(true)- end- end- end-- context "when user is not in list of allowed groups" do- let(:topic_1) { Fabricate(:topic, user: user_1) }- let(:post_1) { Fabricate(:post, topic: topic_1, user: user_1) }- let(:post_event_1) { Fabricate(:event, post: post_1) }-- it "cannot act on the event" do- expect(user_1.can_act_on_discourse_post_event?(post_event_1)).to eq(false)- end- end- end- end-enddiff --git a/plugins/discourse-calendar/spec/models/topic_query_spec.rb b/plugins/discourse-calendar/spec/models/topic_query_spec.rbindex 757a63babaf..c7cfe229cf7 100644--- a/plugins/discourse-calendar/spec/models/topic_query_spec.rb+++ b/plugins/discourse-calendar/spec/models/topic_query_spec.rb@@ -2,7 +2,7 @@describe TopicQuery dodescribe "sorts events" do- fab!(:user) { Fabricate(:user, admin: true) }+ fab!(:user) { Fabricate(:user, admin: true, refresh_auto_groups: true) }fab!(:notified_user, :user)fab!(:topic_1) { Fabricate(:topic, user: user) }fab!(:topic_2) { Fabricate(:topic, user: user) }diff --git a/plugins/discourse-calendar/spec/requests/admin/admin_holidays_controller_spec.rb b/plugins/discourse-calendar/spec/requests/admin/admin_holidays_controller_spec.rbindex 98d01a3128c..a0d7c9acdf4 100644--- a/plugins/discourse-calendar/spec/requests/admin/admin_holidays_controller_spec.rb+++ b/plugins/discourse-calendar/spec/requests/admin/admin_holidays_controller_spec.rb@@ -2,7 +2,7 @@module Admin::DiscourseCalendardescribe AdminHolidaysController do- fab!(:admin) { Fabricate(:user, admin: true) }+ fab!(:admin) { Fabricate(:user, admin: true, refresh_auto_groups: true) }fab!(:member, :user)before { SiteSetting.calendar_enabled = calendar_enabled }diff --git a/plugins/discourse-calendar/spec/requests/events_controller_spec.rb b/plugins/discourse-calendar/spec/requests/events_controller_spec.rbindex 9b4b13a25f4..5bd29eacab1 100644--- a/plugins/discourse-calendar/spec/requests/events_controller_spec.rb+++ b/plugins/discourse-calendar/spec/requests/events_controller_spec.rb@@ -469,7 +469,7 @@ module DiscoursePostEventendcontext "with an existing post" do- let(:user) { Fabricate(:user, admin: true) }+ let(:user) { Fabricate(:user, admin: true, refresh_auto_groups: true) }let(:topic) { Fabricate(:topic, user: user, category: Fabricate(:category)) }let(:post1) { Fabricate(:post, user: user, topic: topic) }let(:invitee1) { Fabricate(:user) }@@ -621,11 +621,14 @@ module DiscoursePostEventit "destroys a event" doexpect(event_1.persisted?).to be(true)+ channel = "/discourse-post-event/#{event_1.post.topic_id}"messages =- MessageBus.track_publish { delete "/discourse-post-event/events/#{event_1.id}.json" }+ MessageBus+ .track_publish { delete "/discourse-post-event/events/#{event_1.id}.json" }+ .select { |message| message.channel == channel }expect(messages.count).to eq(1)message = messages.first- expect(message.channel).to eq("/discourse-post-event/#{event_1.post.topic_id}")+ expect(message.channel).to eq(channel)expect(message.data[:id]).to eq(event_1.id)expect(response.status).to eq(200)expect(Event).to_not exist(id: event_1.id)@@ -680,7 +683,7 @@ module DiscoursePostEventfab!(:private_event_post) doFabricate(:post,- user: Fabricate(:user, admin: true),+ user: Fabricate(:user, admin: true, refresh_auto_groups: true),topic: Fabricate(:topic, category: Fabricate(:category)),)end@@ -899,7 +902,7 @@ module DiscoursePostEventSiteSetting.discourse_post_event_enabled = trueend- let(:user) { Fabricate(:user, admin: true) }+ let(:user) { Fabricate(:user, admin: true, refresh_auto_groups: true) }let(:topic) { Fabricate(:topic, user: user) }let(:post1) { Fabricate(:post, user: user, topic: topic) }let!(:event) { Fabricate(:event, post: post1, max_attendees: 1) }@@ -941,7 +944,7 @@ module DiscoursePostEventSiteSetting.discourse_post_event_enabled = trueend- fab!(:admin_user) { Fabricate(:user, admin: true) }+ fab!(:admin_user) { Fabricate(:user, admin: true, refresh_auto_groups: true) }fab!(:category)fab!(:topic) { Fabricate(:topic, user: admin_user, category: category) }fab!(:post_1) { Fabricate(:post, user: admin_user, topic: topic) }@@ -1014,7 +1017,7 @@ module DiscoursePostEventSiteSetting.discourse_post_event_enabled = trueend- fab!(:admin_user) { Fabricate(:user, admin: true) }+ fab!(:admin_user) { Fabricate(:user, admin: true, refresh_auto_groups: true) }fab!(:topic) { Fabricate(:topic, user: admin_user) }fab!(:post_1) { Fabricate(:post, user: admin_user, topic: topic) }fab!(:event) { Fabricate(:event, post: post_1) }diff --git a/plugins/discourse-calendar/spec/requests/invitees_controller_spec.rb b/plugins/discourse-calendar/spec/requests/invitees_controller_spec.rbindex b4312cd5ff4..4c572fd4c85 100644--- a/plugins/discourse-calendar/spec/requests/invitees_controller_spec.rb+++ b/plugins/discourse-calendar/spec/requests/invitees_controller_spec.rb@@ -9,7 +9,7 @@ module DiscoursePostEventsign_in(user)end- let(:user) { Fabricate(:user, admin: true) }+ let(:user) { Fabricate(:user, admin: true, refresh_auto_groups: true) }let(:topic_1) { Fabricate(:topic, user: user) }let(:post_1) { Fabricate(:post, user: user, topic: topic_1) }@@ -411,7 +411,7 @@ module DiscoursePostEventSiteSetting.discourse_post_event_enabled = trueend- fab!(:admin_user) { Fabricate(:user, admin: true) }+ fab!(:admin_user) { Fabricate(:user, admin: true, refresh_auto_groups: true) }fab!(:topic) { Fabricate(:topic, user: admin_user) }fab!(:post_1) { Fabricate(:post, user: admin_user, topic: topic) }fab!(:event) { Fabricate(:event, post: post_1) }diff --git a/plugins/discourse-calendar/spec/serializers/discourse_post_event/post_serializer_spec.rb b/plugins/discourse-calendar/spec/serializers/discourse_post_event/post_serializer_spec.rbindex 20a0a2a642c..2577d89db2d 100644--- a/plugins/discourse-calendar/spec/serializers/discourse_post_event/post_serializer_spec.rb+++ b/plugins/discourse-calendar/spec/serializers/discourse_post_event/post_serializer_spec.rb@@ -8,7 +8,7 @@ describe PostSerializer doendcontext "when post has an event" do- let(:user) { Fabricate(:user, admin: true) }+ let(:user) { Fabricate(:user, admin: true, refresh_auto_groups: true) }let(:topic_1) { Fabricate(:topic, user: user) }let(:post_1) { Fabricate(:post, topic: topic_1) }let!(:post_event_1) { Fabricate(:event, post: post_1) }diff --git a/spec/fabricators/user_fabricator.rb b/spec/fabricators/user_fabricator.rbindex f08d2f92ddc..2a3cc6eb0a3 100644--- a/spec/fabricators/user_fabricator.rb+++ b/spec/fabricators/user_fabricator.rb@@ -20,7 +20,7 @@ Fabricator(:user, class_name: :user) doafter_create do |user, transients|if transients[:refresh_auto_groups] || transients[:trust_level]- Group.user_trust_level_change!(user.id, user.trust_level)+ Group.refresh_automatic_groups_for_user!(user)endSearchIndexer.disable if transients[:search_index]@@ -75,11 +75,7 @@ Fabricator(:moderator, from: :user) dousername { sequence(:username) { |i| "moderator#{i}" } }email { sequence(:email) { |i| "moderator#{i}@discourse.org" } }moderator true-- after_create do |user|- user.group_users << Fabricate(:group_user, user: user, group: Group[:moderators])- user.group_users << Fabricate(:group_user, user: user, group: Group[:staff])- end+ refresh_auto_groups trueendFabricator(:admin, from: :user) do@@ -88,11 +84,7 @@ Fabricator(:admin, from: :user) doemail { sequence(:email) { |i| "anne#{i}@discourse.org" } }admin truetrust_level TrustLevel[4]-- after_create do |user|- user.group_users << Fabricate(:group_user, user: user, group: Group[:admins])- user.group_users << Fabricate(:group_user, user: user, group: Group[:staff])- end+ refresh_auto_groups trueendFabricator(:newuser, from: :user) dodiff --git a/spec/lib/post_creator_spec.rb b/spec/lib/post_creator_spec.rbindex ca63bd930f0..315635dac0b 100644--- a/spec/lib/post_creator_spec.rb+++ b/spec/lib/post_creator_spec.rb@@ -205,9 +205,9 @@ RSpec.describe PostCreator doJobs.run_immediately!UserActionManager.enable- admin = Fabricate(:user)+ admin = Fabricate(:user, refresh_auto_groups: true)admin.grant_admin!- other_admin = Fabricate(:user)+ other_admin = Fabricate(:user, refresh_auto_groups: true)other_admin.grant_admin!cat = Fabricate(:category)diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rbindex a8e8aa9e181..a28394028de 100644--- a/spec/models/group_spec.rb+++ b/spec/models/group_spec.rb@@ -821,6 +821,95 @@ RSpec.describe Group doexpect(Group.desired_trust_level_groups(2)).to contain_exactly(10, 11, 12)end+ describe ".refresh_automatic_groups_for_user!" do+ def automatic_group_ids_for(user)+ GroupUser.where(user:, group_id: Group.auto_groups_between(:admins, :trust_level_4)).pluck(+ :group_id,+ )+ end++ it "adds the cumulative trust level groups without materializing implicit pseudogroups" do+ user = Fabricate(:user)+ user.update_column(:trust_level, TrustLevel[3])++ described_class.refresh_automatic_groups_for_user!(user)++ expect(automatic_group_ids_for(user)).to contain_exactly(+ *Group::AUTO_GROUPS.values_at(+ :trust_level_0,+ :trust_level_1,+ :trust_level_2,+ :trust_level_3,+ ),+ )+ expect(+ GroupUser.where(+ user:,+ group_id: Group::AUTO_GROUPS.values_at(:everyone, :anonymous_users, :logged_in_users),+ ),+ ).to be_empty+ end++ it "adds the automatic groups matching the user's staff roles" do+ admin = Fabricate(:user)+ admin.update_columns(admin: true, trust_level: TrustLevel[4])+ moderator = Fabricate(:user)+ moderator.update_column(:moderator, true)++ described_class.refresh_automatic_groups_for_user!(admin)+ described_class.refresh_automatic_groups_for_user!(moderator)++ expect(automatic_group_ids_for(admin)).to contain_exactly(+ *Group::AUTO_GROUPS.values_at(+ :admins,+ :staff,+ :trust_level_0,+ :trust_level_1,+ :trust_level_2,+ :trust_level_3,+ :trust_level_4,+ ),+ )+ expect(automatic_group_ids_for(moderator)).to contain_exactly(+ *Group::AUTO_GROUPS.values_at(:moderators, :staff, :trust_level_0, :trust_level_1),+ )+ end++ it "removes stale automatic memberships while preserving custom groups" do+ user = Fabricate(:user)+ custom_group = Fabricate(:group)+ custom_group.add(user)+ user.update_columns(admin: true, trust_level: TrustLevel[4])+ described_class.refresh_automatic_groups_for_user!(user)++ user.update_columns(admin: false, trust_level: TrustLevel[0])+ described_class.refresh_automatic_groups_for_user!(user)+ described_class.refresh_automatic_groups_for_user!(user)++ expect(automatic_group_ids_for(user)).to contain_exactly(Group::AUTO_GROUPS[:trust_level_0])+ expect(user.groups).to include(custom_group)+ end++ it "adds automatic memberships to staged users" do+ user = Fabricate(:staged)+ user.update_columns(admin: true, moderator: true, trust_level: TrustLevel[4])+ described_class.refresh_automatic_groups_for_user!(user)++ expect(automatic_group_ids_for(user)).to contain_exactly(+ *Group::AUTO_GROUPS.values_at(+ :admins,+ :moderators,+ :staff,+ :trust_level_0,+ :trust_level_1,+ :trust_level_2,+ :trust_level_3,+ :trust_level_4,+ ),+ )+ end+ end+it "correctly handles trust level changes" douser = Fabricate(:user, trust_level: 2)Group.user_trust_level_change!(user.id, 2)