A platform for community discussion. Free, open, simple.
SECURITY: Group timezone serialization leaks hidden group members (#40873)
David Taylorc80ccec92bab
diff --git a/plugins/discourse-calendar/plugin.rb b/plugins/discourse-calendar/plugin.rbindex 16f9221aab1..49f50a2f64b 100644--- a/plugins/discourse-calendar/plugin.rb+++ b/plugins/discourse-calendar/plugin.rb@@ -610,11 +610,18 @@ after_initialize dogroup_names = group_timezones["groups"] || []if group_names.present?+ visible_group_ids =+ Group+ .where(name: group_names)+ .visible_groups(scope.user)+ .members_visible_groups(scope.user)+ .select(:id)+users =User.human_users.joins(:groups, :user_option)- .where("groups.name": group_names)+ .where(groups: { id: visible_group_ids }).select("users.*", "groups.name AS group_name", "user_options.timezone")usernames_on_holiday = DiscourseCalendar.users_on_holidaydiff --git a/plugins/discourse-calendar/spec/models/calendar_event_spec.rb b/plugins/discourse-calendar/spec/models/calendar_event_spec.rbindex 880d2a109f2..5afcc280c85 100644--- a/plugins/discourse-calendar/spec/models/calendar_event_spec.rb+++ b/plugins/discourse-calendar/spec/models/calendar_event_spec.rb@@ -164,7 +164,7 @@ describe CalendarEvent doendit "includes group timezones detail" do- Fabricate(:admin, refresh_auto_groups: true)+ admin = Fabricate(:admin, refresh_auto_groups: true)timezones_post =create_post(@@ -173,7 +173,7 @@ describe CalendarEvent do)timezones_post.reload- json = PostSerializer.new(timezones_post, scope: Guardian.new).as_json+ json = PostSerializer.new(timezones_post, scope: admin.guardian).as_jsongroup_timezones = json[:post][:group_timezones]expect(group_timezones["admins"].count).to eq(1)diff --git a/plugins/discourse-calendar/spec/requests/group_timezones_spec.rb b/plugins/discourse-calendar/spec/requests/group_timezones_spec.rbnew file mode 100644index 00000000000..0538db59f85--- /dev/null+++ b/plugins/discourse-calendar/spec/requests/group_timezones_spec.rb@@ -0,0 +1,96 @@+# frozen_string_literal: true++describe "group timezones serialization" do+ fab!(:non_member, :user)+ fab!(:member, :user)+ fab!(:staff, :moderator)+ fab!(:admin)+ fab!(:public_group_user) { Fabricate(:user, username: "public_roster_user") }+ fab!(:members_group_user) { Fabricate(:user, username: "members_roster_user") }+ fab!(:hidden_group_user) { Fabricate(:user, username: "hidden_roster_user") }++ fab!(:public_group) do+ Fabricate(+ :group,+ name: "timezone-public",+ visibility_level: Group.visibility_levels[:public],+ members_visibility_level: Group.visibility_levels[:public],+ )+ end++ fab!(:members_group) do+ Fabricate(+ :group,+ name: "timezone-members",+ visibility_level: Group.visibility_levels[:public],+ members_visibility_level: Group.visibility_levels[:members],+ )+ end++ fab!(:hidden_group) do+ Fabricate(+ :group,+ name: "timezone-hidden",+ visibility_level: Group.visibility_levels[:owners],+ members_visibility_level: Group.visibility_levels[:public],+ )+ end++ before do+ Jobs.run_immediately!+ SiteSetting.calendar_enabled = true++ public_group.add(public_group_user)+ members_group.add(member)+ members_group.add(members_group_user)+ hidden_group.add(hidden_group_user)+ end++ it "serializes only groups with visible membership for each viewer" do+ [public_group_user, members_group_user, hidden_group_user].each do |group_user|+ group_user.user_option.update!(timezone: "America/New_York")+ end++ timezones_post = create_post(raw: <<~RAW)+ [timezones group="timezone-public"]+ [/timezones]++ [timezones group="timezone-members"]+ [/timezones]++ [timezones group="timezone-hidden"]+ [/timezones]+ RAW++ expect(timezones_post.reload.group_timezones).to eq(+ "groups" => [public_group.name, members_group.name, hidden_group.name],+ )++ cases = [+ { viewer: nil, visible_groups: [public_group.name] },+ { viewer: non_member, visible_groups: [public_group.name] },+ { viewer: member, visible_groups: [public_group.name, members_group.name] },+ { viewer: staff, visible_groups: [public_group.name, members_group.name] },+ { viewer: admin, visible_groups: [public_group.name, members_group.name, hidden_group.name] },+ ]++ cases.each do |test_case|+ viewer = test_case[:viewer]+ visible_groups = test_case[:visible_groups]++ sign_in(viewer) if viewer++ get "/t/#{timezones_post.topic.slug}/#{timezones_post.topic.id}.json"++ expect(response.status).to eq(200)+ group_timezones = response.parsed_body.dig("post_stream", "posts", 0, "group_timezones")+ expect(group_timezones.keys).to contain_exactly(*visible_groups)++ expect(response.body).to include(public_group_user.username)++ if visible_groups.exclude?(hidden_group.name)+ expect(response.body).not_to include(hidden_group_user.username)+ end+ end+ end+enddiff --git a/plugins/discourse-calendar/spec/serializers/post_serializer_spec.rb b/plugins/discourse-calendar/spec/serializers/post_serializer_spec.rbindex 0dbf5266996..1970e2f3152 100644--- a/plugins/discourse-calendar/spec/serializers/post_serializer_spec.rb+++ b/plugins/discourse-calendar/spec/serializers/post_serializer_spec.rb@@ -17,7 +17,7 @@ describe PostSerializer doendit "includes group timezones" do- Fabricate(:admin, refresh_auto_groups: true)+ admin = Fabricate(:admin, refresh_auto_groups: true)calendar_post =create_post(@@ -25,11 +25,24 @@ describe PostSerializer do"[timezones group=\"admins\"]\n[/timezones]\n\n[timezones group=\"trust_level_0\"]\n[/timezones]",)- json = PostSerializer.new(calendar_post.reload, scope: Guardian.new).as_json+ json = PostSerializer.new(calendar_post.reload, scope: admin.guardian).as_jsonexpect(json[:post][:group_timezones]["admins"].count).to eq(1)expect(json[:post][:group_timezones]["trust_level_0"].count).to eq(2)end+ it "excludes group timezones the viewer is not allowed to see" do+ Fabricate(:admin, refresh_auto_groups: true)++ calendar_post =+ create_post(+ raw:+ "[timezones group=\"admins\"]\n[/timezones]\n\n[timezones group=\"trust_level_0\"]\n[/timezones]",+ )++ json = PostSerializer.new(calendar_post.reload, scope: Guardian.new).as_json+ expect(json[:post][:group_timezones]).to eq({})+ end+it "groups calendar events correctly" douser = Fabricate(:user)user.upsert_custom_fields(DiscourseCalendar::REGION_CUSTOM_FIELD => "ar")