A platform for community discussion. Free, open, simple.
FIX: Prevent hidden Data Explorer queries leaking via bookmarks (#40327)
Samad96765bd55c
diff --git a/plugins/discourse-data-explorer/lib/discourse_data_explorer/query_group_bookmarkable.rb b/plugins/discourse-data-explorer/lib/discourse_data_explorer/query_group_bookmarkable.rbindex 7834bfcca61..b8a75141fba 100644--- a/plugins/discourse-data-explorer/lib/discourse_data_explorer/query_group_bookmarkable.rb+++ b/plugins/discourse-data-explorer/lib/discourse_data_explorer/query_group_bookmarkable.rb@@ -15,8 +15,9 @@ module DiscourseDataExplorerenddef self.list_query(user, guardian)+ admin = user.admin?group_ids = []- if !user.admin?+ if !admingroup_ids = user.visible_groups.pluck(:id)return if group_ids.empty?end@@ -30,7 +31,10 @@ module DiscourseDataExplorer.joins("LEFT JOIN data_explorer_queries ON data_explorer_queries.id = data_explorer_query_groups.query_id",)- query = query.where("data_explorer_query_groups.group_id IN (?)", group_ids) if !user.admin?+ if !admin+ query = query.where("data_explorer_query_groups.group_id IN (?)", group_ids)+ query = query.where("data_explorer_queries.hidden = false")+ endqueryend@@ -57,7 +61,7 @@ module DiscourseDataExplorerenddef self.reminder_conditions(bookmark)- bookmark.bookmarkable.present?+ bookmark.bookmarkable.present? && can_see?(bookmark.user.guardian, bookmark)enddef self.can_see?(guardian, bookmark)@@ -65,8 +69,11 @@ module DiscourseDataExplorerenddef self.can_see_bookmarkable?(guardian, bookmarkable)- return false if !bookmarkable.group- guardian.user_is_a_member_of_group?(bookmarkable.group)+ return false if bookmarkable.blank? || bookmarkable.group.blank? || bookmarkable.query.blank?+ return true if guardian.is_admin?++ !bookmarkable.query.hidden? &&+ guardian.group_and_user_can_access_query?(bookmarkable.group, bookmarkable.query)endendenddiff --git a/plugins/discourse-data-explorer/spec/requests/bookmarks_spec.rb b/plugins/discourse-data-explorer/spec/requests/bookmarks_spec.rbnew file mode 100644index 00000000000..3faf31e8183--- /dev/null+++ b/plugins/discourse-data-explorer/spec/requests/bookmarks_spec.rb@@ -0,0 +1,143 @@+# frozen_string_literal: true++RSpec.describe "Data Explorer bookmarks" do+ fab!(:admin_user, :admin)+ fab!(:user)+ fab!(:group)+ fab!(:query) do+ Fabricate(+ :query,+ name: "Private revenue report",+ description: "Secret revenue report description",+ sql: "SELECT 1",+ user: admin_user,+ )+ end++ before do+ SiteSetting.data_explorer_enabled = true+ group.add(user)+ register_test_bookmarkable(DiscourseDataExplorer::QueryGroupBookmarkable)+ end++ after { DiscoursePluginRegistry.reset_register!(:bookmarkables) }++ it "does not expose hidden query bookmark metadata in bookmark JSON or ICS responses" do+ query_group = Fabricate(:query_group, query: query, group: group)+ bookmark =+ Fabricate(+ :bookmark,+ user: user,+ bookmarkable: query_group,+ name: nil,+ reminder_at: 1.day.from_now,+ )++ sign_in(user)++ get "/u/#{user.username}/bookmarks.json"++ expect(response.status).to eq(200)+ expect(+ response+ .parsed_body+ .dig("user_bookmark_list", "bookmarks")+ .map { |bookmark_data| bookmark_data["id"] },+ ).to contain_exactly(bookmark.id)+ expect(response.body).to include(query.name)+ expect(response.body).to include(query.description)++ get "/u/#{user.username}/bookmarks.ics"++ expect(response.status).to eq(200)+ expect(response.body).to include(query.name)++ query.update!(hidden: true)++ get "/u/#{user.username}/bookmarks.json"++ expect(response.status).to eq(200)+ json_body = response.body++ get "/u/#{user.username}/bookmarks.ics"++ expect(response.status).to eq(200)+ ics_body = response.body++ aggregate_failures do+ expect(json_body).not_to include(query.name)+ expect(json_body).not_to include(query.description)+ expect(ics_body).not_to include(query.name)+ expect(ics_body).not_to include(query.description)+ end+ end++ it "keeps hidden query bookmarks visible to admins" do+ query_group = Fabricate(:query_group, query: query, group: group)+ Fabricate(+ :bookmark,+ user: admin_user,+ bookmarkable: query_group,+ name: nil,+ reminder_at: 1.day.from_now,+ )++ query.update!(hidden: true)++ sign_in(admin_user)++ get "/u/#{admin_user.username}/bookmarks.json"++ expect(response.status).to eq(200)+ expect(response.body).to include(query.name)+ expect(response.body).to include(query.description)++ get "/u/#{admin_user.username}/bookmarks.ics"++ expect(response.status).to eq(200)+ expect(response.body).to include(query.name)+ end++ it "does not expose detached query bookmark metadata in bookmark JSON or ICS responses" do+ query_group = Fabricate(:query_group, query: query, group: group)+ Fabricate(+ :bookmark,+ user: user,+ bookmarkable: query_group,+ name: nil,+ reminder_at: 1.day.from_now,+ )++ sign_in(user)++ get "/u/#{user.username}/bookmarks.json"++ expect(response.status).to eq(200)+ expect(response.body).to include(query.name)+ expect(response.body).to include(query.description)++ get "/u/#{user.username}/bookmarks.ics"++ expect(response.status).to eq(200)+ expect(response.body).to include(query.name)++ query_group.destroy!++ get "/u/#{user.username}/bookmarks.json"++ expect(response.status).to eq(200)+ json_body = response.body++ get "/u/#{user.username}/bookmarks.ics"++ expect(response.status).to eq(200)+ ics_body = response.body++ aggregate_failures do+ expect(json_body).not_to include(query.name)+ expect(json_body).not_to include(query.description)+ expect(ics_body).not_to include(query.name)+ expect(ics_body).not_to include(query.description)+ end+ end+end