A platform for community discussion. Free, open, simple.
SECURITY: Private event invitee details leak through invitees list endpoint (#42109)
Bannon Tannerb5bef5838412
diff --git a/plugins/discourse-calendar/app/serializers/discourse_post_event/event_serializer.rb b/plugins/discourse-calendar/app/serializers/discourse_post_event/event_serializer.rbindex 211603c519f..ce534797af2 100644--- a/plugins/discourse-calendar/app/serializers/discourse_post_event/event_serializer.rb+++ b/plugins/discourse-calendar/app/serializers/discourse_post_event/event_serializer.rb@@ -175,35 +175,7 @@ module DiscoursePostEventdef can_display_invitee_details?return @can_display_invitee_details if defined?(@can_display_invitee_details)-- @can_display_invitee_details =- if !object.private? || scope.can_act_on_discourse_post_event?(object)- true- else- user = scope.current_user- if user && invited_user?(user)- true- else- visible_invited_groups?(user)- end- end- end-- def visible_invited_groups?(user)- raw_invitees = Array(object.raw_invitees).uniq- 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 invited_user?(user)- object.invitees.exists?(user_id: user.id) ||- user.groups.where(name: Array(object.raw_invitees)).exists?+ @can_display_invitee_details = scope.can_display_invitee_details?(object)enddef should_display_inviteesdiff --git a/plugins/discourse-calendar/app/services/discourse_post_event/list_invitees.rb b/plugins/discourse-calendar/app/services/discourse_post_event/list_invitees.rbindex 0670dff751e..731449f52e9 100644--- a/plugins/discourse-calendar/app/services/discourse_post_event/list_invitees.rb+++ b/plugins/discourse-calendar/app/services/discourse_post_event/list_invitees.rb@@ -27,7 +27,7 @@ module DiscoursePostEventenddef can_see_event(guardian:, event:)- guardian.can_see?(event.post)+ guardian.can_see?(event.post) && guardian.can_display_invitee_details?(event)enddef fetch_invitees(event:, params:)diff --git a/plugins/discourse-calendar/plugin.rb b/plugins/discourse-calendar/plugin.rbindex 7339125886c..e165279a071 100644--- a/plugins/discourse-calendar/plugin.rb+++ b/plugins/discourse-calendar/plugin.rb@@ -374,6 +374,26 @@ after_initialize douser && 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++ if user &&+ (event.invitees.exists?(user_id: user.id) || user.groups.where(name: raw_invitees).exists?)+ return true+ end++ return false if raw_invitees.blank?++ Group+ .visible_groups(user)+ .members_visible_groups(user)+ .where(name: raw_invitees)+ .distinct+ .count == raw_invitees.length+ end+add_class_method(:group, :discourse_post_event_allowed_groups) dowhere(id: SiteSetting.discourse_post_event_allowed_on_groups.split("|").compact)enddiff --git a/plugins/discourse-calendar/spec/requests/invitees_controller_spec.rb b/plugins/discourse-calendar/spec/requests/invitees_controller_spec.rbindex 090a653a4e6..b4312cd5ff4 100644--- a/plugins/discourse-calendar/spec/requests/invitees_controller_spec.rb+++ b/plugins/discourse-calendar/spec/requests/invitees_controller_spec.rb@@ -40,6 +40,44 @@ module DiscoursePostEventendend+ context "for a private event in a public topic" do+ fab!(:event_owner, :admin)+ fab!(:public_topic) { Fabricate(:topic, user: event_owner) }+ fab!(:public_post) { Fabricate(:post, user: event_owner, topic: public_topic) }+ fab!(:viewer, :user)+ fab!(:invitee_user, :user)+ fab!(:restricted_group) do+ Fabricate(+ :group,+ visibility_level: Group.visibility_levels[:owners],+ members_visibility_level: Group.visibility_levels[:owners],+ ).tap { |group| group.add(invitee_user) }+ end+ fab!(:private_event) do+ Fabricate(+ :event,+ post: public_post,+ status: DiscoursePostEvent::Event.statuses[:private],+ raw_invitees: [restricted_group.name],+ )+ end++ before do+ private_event.create_invitees(+ [{ user_id: invitee_user.id, status: Invitee.statuses[:going] }],+ )+ end++ it "does not disclose private event invitees to uninvited users" do+ sign_in(viewer)++ get "/discourse-post-event/events/#{private_event.id}/invitees.json"++ expect(response.body).not_to include(invitee_user.username)+ expect(response.status).to eq(403)+ end+ end+context "when params are included" dolet(:invitee1) { Fabricate(:user, username: "Francis", name: "Francis") }let(:invitee2) { Fabricate(:user, username: "Francisco", name: "Francisco") }@@ -410,5 +448,37 @@ module DiscoursePostEventdelete "/discourse-post-event/events/#{event.id}/invitees/#{invitee.id}.json"expect(response.status).to eq(403)end++ context "for a private event in a public topic" do+ fab!(:private_event_post) { Fabricate(:post, user: admin_user, topic: topic) }+ fab!(:restricted_group) do+ Fabricate(+ :group,+ visibility_level: Group.visibility_levels[:owners],+ members_visibility_level: Group.visibility_levels[:owners],+ ).tap { |group| group.add(invitee_user) }+ end+ fab!(:private_event) do+ Fabricate(+ :event,+ post: private_event_post,+ status: DiscoursePostEvent::Event.statuses[:private],+ raw_invitees: [restricted_group.name],+ )+ end++ before do+ private_event.create_invitees(+ [{ user_id: invitee_user.id, status: DiscoursePostEvent::Invitee.statuses[:going] }],+ )+ end++ it "does not disclose private event invitees to anonymous viewers" do+ get "/discourse-post-event/events/#{private_event.id}/invitees.json"++ expect(response.body).not_to include(invitee_user.username)+ expect(response.status).to eq(403)+ end+ endendend