A platform for community discussion. Free, open, simple.
FIX: Data Explorer post relations expose private post excerpts to group report users (#39819)
Same3f711855cf4
diff --git a/plugins/discourse-data-explorer/lib/discourse_data_explorer/data_explorer.rb b/plugins/discourse-data-explorer/lib/discourse_data_explorer/data_explorer.rbindex 5bd13b7d941..79454673f4b 100644--- a/plugins/discourse-data-explorer/lib/discourse_data_explorer/data_explorer.rb+++ b/plugins/discourse-data-explorer/lib/discourse_data_explorer/data_explorer.rb@@ -110,8 +110,18 @@ module DiscourseDataExplorer},post: {class: Post,- fields: %i[id topic_id post_number cooked user_id],- include: [:user],+ fields: %i[+ id+ topic_id+ post_number+ cooked+ user_id+ post_type+ deleted_at+ deleted_by_id+ hidden+ ],+ include: [:user, { topic: :category }],serializer: SmallPostWithExcerptSerializer,},topic: {@@ -151,7 +161,7 @@ module DiscourseDataExplorer.compactend- def self.add_extra_data(pg_result)+ def self.add_extra_data(pg_result, guardian: nil)needed_classes = {}ret = {}col_map = {}@@ -188,6 +198,7 @@ module DiscourseDataExplorercolumn_nums.each { |col_n| ids.merge(pg_result.column_values(col_n)) }ids.delete nilids.map! &:to_i+ ids = ids.take(SiteSetting.data_explorer_query_result_limit)object_class = support_info[:class]all_objs = object_class@@ -195,12 +206,26 @@ module DiscourseDataExplorerall_objs =all_objs.select(support_info[:fields])- .where(id: ids.to_a.sort)+ .where(id: ids.sort).includes(support_info[:include]).order(:id)+ if guardian+ all_objs =+ case cls+ when :post+ all_objs.select { |post| guardian.can_see_post?(post) }+ when :topic+ allowed_topic_ids = guardian.can_see_topic_ids(topic_ids: ids)+ all_objs.where(id: allowed_topic_ids)+ else+ all_objs+ end+ end+opts = { each_serializer: support_info[:serializer] }opts[:only] = support_info[:only] if support_info[:only]+ opts[:scope] = guardian if guardianret[cls] = ActiveModel::ArraySerializer.new(all_objs, **opts)end[ret, col_map]diff --git a/plugins/discourse-data-explorer/lib/discourse_data_explorer/query_runner.rb b/plugins/discourse-data-explorer/lib/discourse_data_explorer/query_runner.rbindex 1bab9b192f5..b47d441a57f 100644--- a/plugins/discourse-data-explorer/lib/discourse_data_explorer/query_runner.rb+++ b/plugins/discourse-data-explorer/lib/discourse_data_explorer/query_runner.rb@@ -12,7 +12,8 @@ module DiscourseDataExplorerreturn { error: result[:error], duration_secs: result[:duration_secs] } if result[:error]- result_json = ResultFormatConverter.convert(:json, result, query_params:, explain:)+ result_json =+ ResultFormatConverter.convert(:json, result, query_params:, explain:, current_user:)if cacheable?(query, explain:) && default_limit?(limit)cache_key_params = resolve_params(query, raw_params)diff --git a/plugins/discourse-data-explorer/lib/discourse_data_explorer/result_format_converter.rb b/plugins/discourse-data-explorer/lib/discourse_data_explorer/result_format_converter.rbindex be2ecd267f2..978376ac1b5 100644--- a/plugins/discourse-data-explorer/lib/discourse_data_explorer/result_format_converter.rb+++ b/plugins/discourse-data-explorer/lib/discourse_data_explorer/result_format_converter.rb@@ -44,7 +44,8 @@ module DiscourseDataExplorerjson[:explain] = result[:explain] if opts[:explain]if !opts[:download]- relations, colrender = DataExplorer.add_extra_data(pg_result)+ guardian = Guardian.new(opts[:current_user])+ relations, colrender = DataExplorer.add_extra_data(pg_result, guardian:)json[:relations] = relationsjson[:colrender] = colrenderenddiff --git a/plugins/discourse-data-explorer/spec/data_explorer_spec.rb b/plugins/discourse-data-explorer/spec/data_explorer_spec.rbindex a317800ca4a..1529771bfad 100644--- a/plugins/discourse-data-explorer/spec/data_explorer_spec.rb+++ b/plugins/discourse-data-explorer/spec/data_explorer_spec.rb@@ -139,6 +139,21 @@ describe DiscourseDataExplorer::DataExplorer doexpect(colrender).to eq({ 1 => "json" })end+ it "limits relation resolution to the query result limit per relation type" do+ SiteSetting.data_explorer_query_result_limit = 2+ topics = Fabricate.times(4, :topic)+ query = DiscourseDataExplorer::Query.create!(name: "some query", sql: <<~SQL)+ SELECT #{topics[0].id} AS topic_id, #{topics[2].id} AS related_topic_id+ UNION ALL+ SELECT #{topics[1].id} AS topic_id, #{topics[3].id} AS related_topic_id+ SQL++ pg_result = described_class.run_query(query)[:pg_result]+ relations, _ = DiscourseDataExplorer::DataExplorer.add_extra_data(pg_result)++ expect(relations[:topic].as_json.size).to eq(2)+ end+describe "serializing models to serializer" doit "serializes correctly to BasicTopicSerializer for topic relations" dotopic = Fabricate(:topic, locale: "ja")diff --git a/plugins/discourse-data-explorer/spec/requests/query_controller_spec.rb b/plugins/discourse-data-explorer/spec/requests/query_controller_spec.rbindex 292c3ee0acd..8ffcb48fdae 100644--- a/plugins/discourse-data-explorer/spec/requests/query_controller_spec.rb+++ b/plugins/discourse-data-explorer/spec/requests/query_controller_spec.rb@@ -782,6 +782,60 @@ describe DiscourseDataExplorer::QueryController doexpect(response.parsed_body["rows"]).to eq([[1828]])end+ it "does not include post relations the user cannot see" do+ private_post =+ Fabricate(+ :private_message_post,+ raw: "Ssshh! This hidden data explorer excerpt must not leak.",+ )+ visible_post = Fabricate(:post, raw: "Visible data explorer excerpt may render.")+ guardian = user.guardian+ expect(guardian.can_see_post?(private_post)).to eq(false)+ expect(guardian.can_see_post?(visible_post)).to eq(true)++ query_sql = <<~SQL+ SELECT #{private_post.id} AS post_id+ UNION ALL+ SELECT #{visible_post.id} AS post_id+ SQL+ query = make_query(query_sql, { name: "Posts" }, [group.id.to_s])++ post "/g/#{group.name}/reports/#{query.id}/run.json"++ expect(response.status).to eq(200)+ post_relations = response.parsed_body["relations"]["post"]+ expect(post_relations).to contain_exactly(include("id" => visible_post.id))+ expect(response.body).to include(visible_post.raw)+ expect(response.body).not_to include(private_post.raw)+ end++ it "does not include topic relations the user cannot see" do+ private_topic =+ Fabricate(+ :private_message_topic,+ title: "Ssshh this hidden data explorer topic must not leak",+ )+ visible_topic = Fabricate(:topic, title: "Visible data explorer topic may render")+ guardian = user.guardian+ expect(guardian.can_see_topic?(private_topic)).to eq(false)+ expect(guardian.can_see_topic?(visible_topic)).to eq(true)++ query_sql = <<~SQL+ SELECT #{private_topic.id} AS topic_id+ UNION ALL+ SELECT #{visible_topic.id} AS topic_id+ SQL+ query = make_query(query_sql, { name: "Topics" }, [group.id.to_s])++ post "/g/#{group.name}/reports/#{query.id}/run.json"++ expect(response.status).to eq(200)+ topic_relations = response.parsed_body["relations"]["topic"]+ expect(topic_relations).to contain_exactly(include("id" => visible_topic.id))+ expect(response.body).to include(visible_topic.title)+ expect(response.body).not_to include(private_topic.title)+ end+it "can accept parameters as a hash" doquery_string = <<~SQL-- [params]