A platform for community discussion. Free, open, simple.
SECURITY: Filter private topic metadata from board cards (#44052)
Chris Albertif7327f7a6ce7
diff --git a/plugins/boards/app/controllers/boards/api/boards_controller.rb b/plugins/boards/app/controllers/boards/api/boards_controller.rbindex 3f1b456f4e8..5f1803264b6 100644--- a/plugins/boards/app/controllers/boards/api/boards_controller.rb+++ b/plugins/boards/app/controllers/boards/api/boards_controller.rb@@ -106,7 +106,7 @@ module Boardsassignments_by_topic = preload_all_assignments(cards, visible_topic_ids)topic_users_by_topic = preload_topic_users(cards, visible_topic_ids)- tags_by_id = preload_floater_card_tags(cards)+ tags_by_id = preload_visible_card_tags(cards, visible_topic_ids)tag_name_map = build_tag_name_map(@board)board_columns = @board.columns.to_a@@ -384,10 +384,20 @@ module BoardsTopicUser.lookup_for(current_user, topics)end- def preload_floater_card_tags(cards)+ def preload_visible_card_tags(cards, visible_topic_ids)return {} unless SiteSetting.tagging_enabled- tag_ids = cards.reject(&:topic?).flat_map(&:tag_ids).uniq+ tag_ids =+ cards+ .flat_map do |card|+ if card.topic?+ visible_topic_ids.include?(card.topic_id) ? card.topic&.tags&.map(&:id) : []+ else+ card.tag_ids+ end+ end+ .compact+ .uniqreturn {} if tag_ids.empty?DiscourseTagging.filter_visible(Tag.where(id: tag_ids), guardian).index_by(&:id)diff --git a/plugins/boards/app/controllers/boards/api/cards_controller.rb b/plugins/boards/app/controllers/boards/api/cards_controller.rbindex d3bdcdeb22d..5147f686076 100644--- a/plugins/boards/app/controllers/boards/api/cards_controller.rb+++ b/plugins/boards/app/controllers/boards/api/cards_controller.rb@@ -68,6 +68,7 @@ module BoardsPublisher.publish_card_deleted!(board,adopted_floater_id,+ topic: false,client_id: message_bus_client_id,)Publisher.publish_card_created!(@@ -153,7 +154,12 @@ module Boardsservice_params.deep_merge(params: { board_id: params[:board_id], id: params[:id] }),) doon_success do |card:, board:|- Publisher.publish_card_deleted!(board, card.id, client_id: message_bus_client_id)+ Publisher.publish_card_deleted!(+ board,+ card.id,+ topic: card.topic?,+ client_id: message_bus_client_id,+ )if card.topic.present?Publisher.publish_topic_memberships_changed!(diff --git a/plugins/boards/app/serializers/boards/card_serializer.rb b/plugins/boards/app/serializers/boards/card_serializer.rbindex 8e33460cf1c..edbacd0f2bf 100644--- a/plugins/boards/app/serializers/boards/card_serializer.rb+++ b/plugins/boards/app/serializers/boards/card_serializer.rb@@ -80,15 +80,19 @@ module Boardsdef ordered_tagsreturn [] unless SiteSetting.tagging_enabled- tag_ids = visible_tag_ids(object.tag_ids)+ tag_ids = normalized_tag_ids(object.tag_ids)tags_by_id = @options[:tags_by_id]- return Card.ordered_tags(tag_ids) if tags_by_id.blank?+ return tag_ids.filter_map { |tag_id| tags_by_id[tag_id] } unless tags_by_id.nil?- tag_ids.filter_map { |tag_id| tags_by_id[tag_id] }+ Card.ordered_tags(visible_tag_ids(tag_ids))+ end++ def normalized_tag_ids(tag_ids)+ Array(tag_ids).compact_blank.map(&:to_i).reject(&:zero?).uniqenddef visible_tag_ids(tag_ids)- normalized_tag_ids = Array(tag_ids).compact_blank.map(&:to_i).reject(&:zero?).uniq+ normalized_tag_ids = normalized_tag_ids(tag_ids)guardian = scope || Guardian.newreturn normalized_tag_ids if normalized_tag_ids.blank? || guardian.is_admin?diff --git a/plugins/boards/app/serializers/boards/card_topic_serializer.rb b/plugins/boards/app/serializers/boards/card_topic_serializer.rbindex 0976f1e657c..20e278e06f8 100644--- a/plugins/boards/app/serializers/boards/card_topic_serializer.rb+++ b/plugins/boards/app/serializers/boards/card_topic_serializer.rb@@ -26,7 +26,12 @@ module Boardsenddef tags- object.tags.map(&:name)+ tags_by_id = @options[:tags_by_id]+ return object.tags.filter_map { |tag| tags_by_id[tag.id]&.name } unless tags_by_id.nil?++ return [] unless SiteSetting.tagging_enabled++ DiscourseTagging.filter_visible(object.tags, scope).pluck(:name)enddef highest_post_numberdiff --git a/plugins/boards/app/services/boards/publisher.rb b/plugins/boards/app/services/boards/publisher.rbindex 6cd188c4e02..d9085e18136 100644--- a/plugins/boards/app/services/boards/publisher.rb+++ b/plugins/boards/app/services/boards/publisher.rb@@ -26,8 +26,12 @@ module Boardspublish_card_event!(board, "card_moved", card_payload, client_id:)end- def self.publish_card_deleted!(board, card_id, client_id:)- publish!(board, { type: "card_deleted", client_id: client_id, card_id: card_id })+ def self.publish_card_deleted!(board, card_id, topic:, client_id:)+ if topic+ publish_board_updated!(board, client_id:)+ else+ publish!(board, { type: "card_deleted", client_id: client_id, card_id: card_id })+ endenddef self.publish_column_cleared!(board, column_id, client_id:)@@ -61,12 +65,11 @@ module Boardsenddef self.publish_card_event!(board, type, card_payload, client_id:)- # Strip topic data from broadcast payloads to prevent leaking- # private topic details to board readers who lack category access.- # Clients merge with existing state or refetch through the- # authorized show endpoint.- safe_payload = card_payload.except("topic", :topic)- publish!(board, { type: type, client_id: client_id, card: safe_payload })+ if card_payload[:card_type] == "topic" || card_payload["card_type"] == "topic"+ publish_board_updated!(board, client_id:)+ else+ publish!(board, { type: type, client_id: client_id, card: card_payload })+ endendprivate_class_method :publish_card_event!diff --git a/plugins/boards/app/services/boards/topic_sync.rb b/plugins/boards/app/services/boards/topic_sync.rbindex 1266aa09c44..7d5061b0dea 100644--- a/plugins/boards/app/services/boards/topic_sync.rb+++ b/plugins/boards/app/services/boards/topic_sync.rb@@ -359,16 +359,8 @@ module Boardsarchived_ids = Board.where(id: board_groups.keys, archived: true).pluck(:id)board_groups = board_groups.except(*archived_ids)- deleted_by_board.each do |board_id, card_ids|- card_ids.each do |card_id|- publish_to_board(board_groups, board_id, type: "card_deleted", card_id: card_id)- end- end-- created_cards.each do |card|- payload = CardSerializer.new(card, root: false).as_json.except("topic", :topic)- publish_to_board(board_groups, card.board_id, type: "card_created", card: payload)- end+ board_ids = (deleted_by_board.keys + created_cards.map(&:board_id)).uniq+ board_ids.each { |board_id| publish_to_board(board_groups, board_id, type: "board_updated") }endprivate_class_method :publish_sync_changesdiff --git a/plugins/boards/spec/requests/boards/boards_controller_spec.rb b/plugins/boards/spec/requests/boards/boards_controller_spec.rbindex 0d732aea83f..cf707c2467f 100644--- a/plugins/boards/spec/requests/boards/boards_controller_spec.rb+++ b/plugins/boards/spec/requests/boards/boards_controller_spec.rb@@ -246,6 +246,75 @@ RSpec.describe Boards::Api::BoardsController doexpect(response.body).not_to include(hidden_tag.name)end+ it "hides restricted tags attached to topic cards from anonymous board readers" do+ hidden_tag = Fabricate(:tag, name: "staff-topic")+ visible_tag = Fabricate(:tag, name: "public-topic")+ Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [hidden_tag.name])+ topic = Fabricate(:topic, category:, tags: [hidden_tag, visible_tag])+ board =+ Fabricate(+ :boards_board,+ name: "Public Roadmap",+ slug: "public-roadmap-topics",+ created_by: admin,+ )+ Fabricate(+ :access_control_list,+ target: board,+ permission: "view",+ allowed_group_ids: [Group::AUTO_GROUPS[:anonymous_users]],+ )+ column = board.columns.create!(title: "Visible", position: 0)+ board.cards.create!(card_type: :topic, topic:, column:, position: 0, created_by: admin)++ get "/boards/api/boards/#{board.id}.json"++ expect(response.status).to eq(200)+ topic_data = response.parsed_body["columns"].first["cards"].first["topic"]+ expect(topic_data["tags"]).to contain_exactly(visible_tag.name)+ expect(response.body).not_to include(hidden_tag.name)+ end++ it "uses one tag visibility query for all topic cards" do+ hidden_tag = Fabricate(:tag, name: "staff-topic")+ visible_tag = Fabricate(:tag, name: "public-topic")+ other_visible_tag = Fabricate(:tag, name: "another-public-topic")+ Fabricate(:tag_group, permissions: { "staff" => 1 }, tag_names: [hidden_tag.name])+ board =+ Fabricate(+ :boards_board,+ name: "Public Roadmap",+ slug: "public-roadmap-topic-tags",+ created_by: admin,+ )+ Fabricate(+ :access_control_list,+ target: board,+ permission: "view",+ allowed_group_ids: [Group::AUTO_GROUPS[:anonymous_users]],+ )+ column = board.columns.create!(title: "Visible", position: 0)+ [visible_tag, other_visible_tag].each do |tag|+ topic = Fabricate(:topic, category:, tags: [hidden_tag, tag])+ board.cards.create!(+ card_type: :topic,+ topic:,+ column:,+ position: board.cards.count,+ created_by: admin,+ )+ end++ queries = track_sql_queries { get "/boards/api/boards/#{board.id}.json" }+ visibility_queries = queries.grep(/"tag_group_memberships"/)+ topic_tags =+ response.parsed_body["columns"].first["cards"].map { |card| card["topic"]["tags"] }++ expect(response.status).to eq(200)+ expect(topic_tags).to contain_exactly([visible_tag.name], [other_visible_tag.name])+ expect(visibility_queries.size).to eq(1)+ end+it "hides restricted tags attached to floater cards from users who can read the board" dohidden_tag = Fabricate(:tag, name: "staff-floater")visible_tag = Fabricate(:tag, name: "public-floater")diff --git a/plugins/boards/spec/requests/boards/cards_controller_spec.rb b/plugins/boards/spec/requests/boards/cards_controller_spec.rbindex c6ac0efdafd..15618d8e5bb 100644--- a/plugins/boards/spec/requests/boards/cards_controller_spec.rb+++ b/plugins/boards/spec/requests/boards/cards_controller_spec.rb@@ -155,6 +155,42 @@ RSpec.describe Boards::Api::CardsController doexpect(messages.first.data).to eq(reload_topic: true, client_id: "test-client")end+ it "publishes a metadata-free update for a restricted topic card" do+ private_category = Fabricate(:private_category, group: Fabricate(:group))+ private_topic = Fabricate(:topic, category: private_category)++ sign_in(admin)+ messages =+ MessageBus.track_publish("/boards/#{board.id}") do+ post "/boards/api/boards/#{board.id}/cards.json",+ params: {+ card: {+ column_id: col_todo.id,+ topic_id: private_topic.id,+ },+ }+ end++ expect(response.status).to eq(201)+ expect(response.parsed_body.dig("card", "topic_id")).to eq(private_topic.id)+ expect(messages).to contain_exactly(+ have_attributes(+ data: {+ type: "board_updated",+ client_id: nil,+ },+ group_ids: contain_exactly(write_group.id, read_group.id),+ ),+ )++ sign_in(reader)+ get "/boards/api/boards/#{board.id}.json"++ expect(response.status).to eq(200)+ expect(response.parsed_body.dig("columns", 0, "cards")).to eq([])+ expect(response.body).not_to include(private_topic.title)+ end+it "allows topic cards in different columns when another insert races" doinserted_competitor = falseallow(Boards::CardOrdering).to receive(@@ -1026,7 +1062,7 @@ RSpec.describe Boards::Api::CardsController doexpect(body["card"]["topic_id"]).to eq(topic.id)end- it "publishes card_deleted + card_created events for adoption" do+ it "publishes card_deleted + board_updated events for adoption" doexisting_topic_card =board.cards.create!(card_type: :topic,@@ -1059,7 +1095,7 @@ RSpec.describe Boards::Api::CardsController doexpect(response.status).to eq(200)types = messages.map { |m| m.data[:type] }- expect(types).to contain_exactly("card_deleted", "card_created")+ expect(types).to contain_exactly("card_deleted", "board_updated")endit "rejects promoting a floater to a topic the user cannot see" do@@ -1720,7 +1756,7 @@ RSpec.describe Boards::Api::CardsController dosign_in(writer)messages =- MessageBus.track_publish("/topic/#{topic.id}") do+ MessageBus.track_publish doexpect dodelete "/boards/api/boards/#{board.id}/cards/#{card.id}.json",params: {@@ -1730,8 +1766,23 @@ RSpec.describe Boards::Api::CardsController doendexpect(response.status).to eq(204)- expect(messages.size).to eq(1)- expect(messages.first.data).to eq(reload_topic: true, client_id: "test-client")+ expect(messages).to contain_exactly(+ have_attributes(+ channel: "/boards/#{board.id}",+ data: {+ type: "board_updated",+ client_id: "test-client",+ },+ group_ids: contain_exactly(write_group.id, read_group.id),+ ),+ have_attributes(+ channel: "/topic/#{topic.id}",+ data: {+ reload_topic: true,+ client_id: "test-client",+ },+ ),+ )endit "returns 404 when deleting a topic card whose topic is hidden" dodiff --git a/plugins/boards/spec/serializers/boards/card_topic_serializer_spec.rb b/plugins/boards/spec/serializers/boards/card_topic_serializer_spec.rbindex 362457f96d2..8223e3fd941 100644--- a/plugins/boards/spec/serializers/boards/card_topic_serializer_spec.rb+++ b/plugins/boards/spec/serializers/boards/card_topic_serializer_spec.rb@@ -78,4 +78,25 @@ RSpec.describe Boards::CardTopicSerializer do),)end++ describe "topic tags" do+ let!(:tag) { Fabricate(:tag) }+ let!(:tagged_topic) { Fabricate(:topic, category:, tags: [tag]) }++ it "returns visible tag names when tagging is enabled" do+ SiteSetting.tagging_enabled = true++ payload = described_class.new(tagged_topic, root: false, scope: Guardian.new(viewer)).as_json++ expect(payload[:tags]).to eq([tag.name])+ end++ it "returns no tags when tagging is disabled" do+ SiteSetting.tagging_enabled = false++ payload = described_class.new(tagged_topic, root: false, scope: Guardian.new(viewer)).as_json++ expect(payload[:tags]).to eq([])+ end+ endenddiff --git a/plugins/boards/spec/services/boards/move_topic_to_column_spec.rb b/plugins/boards/spec/services/boards/move_topic_to_column_spec.rbindex fed2bbcd466..0386d406e02 100644--- a/plugins/boards/spec/services/boards/move_topic_to_column_spec.rb+++ b/plugins/boards/spec/services/boards/move_topic_to_column_spec.rb@@ -122,15 +122,13 @@ RSpec.describe Boards::MoveTopicToColumn doexpect(result[:card].column_changed_at).to be_presentend- it "publishes a card_created event scoped to board read groups" do+ it "publishes a board_updated event scoped to board read groups" doexpect(messages).to contain_exactly(have_attributes(- data:- include(- type: "card_created",- client_id: client_id,- card: include(topic_id: topic.id),- ),+ data: {+ type: "board_updated",+ client_id: client_id,+ },group_ids: contain_exactly(write_group.id, read_group.id),),)@@ -155,9 +153,9 @@ RSpec.describe Boards::MoveTopicToColumn doexpect(result[:card]).to have_attributes(id: existing_card.id, created_by_id: writer.id)end- it "publishes a card_moved message" do+ it "publishes a board_updated message" doexpect(messages).to contain_exactly(- have_attributes(data: include(type: "card_moved", client_id: client_id)),+ have_attributes(data: { type: "board_updated", client_id: client_id }),)enddiff --git a/plugins/boards/spec/services/boards/publisher_spec.rb b/plugins/boards/spec/services/boards/publisher_spec.rbindex ea888f1e461..690215dfafa 100644--- a/plugins/boards/spec/services/boards/publisher_spec.rb+++ b/plugins/boards/spec/services/boards/publisher_spec.rb@@ -56,6 +56,32 @@ RSpec.describe Boards::Publisher doendend+ describe "topic card events" do+ let(:topic_card_data) { card_data.merge(card_type: "topic", topic_id: 1) }++ it "publishes metadata-free board updates" do+ messages =+ MessageBus.track_publish(channel) do+ described_class.publish_card_created!(board, topic_card_data, client_id: test_client_id)+ described_class.publish_card_updated!(board, topic_card_data, client_id: test_client_id)+ described_class.publish_card_moved!(+ board,+ topic_card_data,+ acting_user: admin,+ client_id: test_client_id,+ )+ end++ expect(messages.map(&:data)).to eq(+ [+ { type: "board_updated", client_id: test_client_id },+ { type: "board_updated", client_id: test_client_id },+ { type: "board_updated", client_id: test_client_id },+ ],+ )+ end+ end+describe ".publish_topic_memberships_changed!" dofab!(:topic)@@ -169,7 +195,12 @@ RSpec.describe Boards::Publisher doit "publishes a card_deleted message with card_id" domessages =MessageBus.track_publish(channel) do- described_class.publish_card_deleted!(board, card.id, client_id: test_client_id)+ described_class.publish_card_deleted!(+ board,+ card.id,+ topic: false,+ client_id: test_client_id,+ )endexpect(messages.size).to eq(1)@@ -178,6 +209,20 @@ RSpec.describe Boards::Publisher doexpect(msg.data[:client_id]).to eq(test_client_id)expect(msg.data[:card_id]).to eq(card.id)end++ it "publishes a board update for a topic card" do+ messages =+ MessageBus.track_publish(channel) do+ described_class.publish_card_deleted!(+ board,+ card.id,+ topic: true,+ client_id: test_client_id,+ )+ end++ expect(messages.first.data).to eq(type: "board_updated", client_id: test_client_id)+ endenddescribe ".publish_board_updated!" do@@ -224,7 +269,7 @@ RSpec.describe Boards::Publisher doacting_user: admin,client_id: test_client_id,)- described_class.publish_card_deleted!(board, card.id, client_id: test_client_id)+ described_class.publish_card_deleted!(board, card.id, topic: false, client_id: test_client_id)described_class.publish_column_cleared!(board, column.id, client_id: test_client_id)described_class.publish_columns_reordered!(board, [column.id], client_id: test_client_id)described_class.publish_board_updated!(board, client_id: test_client_id)diff --git a/plugins/boards/spec/services/boards/topic_sync_spec.rb b/plugins/boards/spec/services/boards/topic_sync_spec.rbindex a96fbcfe081..ca8fc9a3769 100644--- a/plugins/boards/spec/services/boards/topic_sync_spec.rb+++ b/plugins/boards/spec/services/boards/topic_sync_spec.rb@@ -56,7 +56,7 @@ RSpec.describe Boards::TopicSync doexpect(card.column_changed_at).to be_presentend- it "publishes created topic cards to board ACL groups" do+ it "publishes board updates for created topic cards to board ACL groups" dotagged_topic = Fabricate(:topic, tags: [tag_a])board =Boards::Board.create!(@@ -83,11 +83,11 @@ RSpec.describe Boards::TopicSync doMessageBus.track_publish("/boards/#{board.id}") { described_class.sync_topic(tagged_topic) }expect(messages.size).to eq(1)- expect(messages.first.data[:type]).to eq("card_created")+ expect(messages.first.data).to eq(type: "board_updated", client_id: nil)expect(messages.first.group_ids).to contain_exactly(read_group.id, write_group.id)end- it "publishes created topic cards without group restrictions for anonymous board ACLs" do+ it "publishes board updates for created topic cards without group restrictions for anonymous board ACLs" dotagged_topic = Fabricate(:topic, tags: [tag_a])board =Boards::Board.create!(@@ -108,7 +108,7 @@ RSpec.describe Boards::TopicSync doMessageBus.track_publish("/boards/#{board.id}") { described_class.sync_topic(tagged_topic) }expect(messages.size).to eq(1)- expect(messages.first.data[:type]).to eq("card_created")+ expect(messages.first.data).to eq(type: "board_updated", client_id: nil)expect(messages.first.group_ids).to be_nilend@@ -307,14 +307,13 @@ RSpec.describe Boards::TopicSync docreated_by_id: admin.id,)column = board.columns.create!(title: "Backlog", position: 0)- card =- board.cards.create!(- topic_id: topic.id,- card_type: :topic,- column_id: column.id,- position: 0,- created_by_id: admin.id,- )+ board.cards.create!(+ topic_id: topic.id,+ card_type: :topic,+ column_id: column.id,+ position: 0,+ created_by_id: admin.id,+ )Fabricate(:access_control_list_with_groups,target: board,@@ -326,8 +325,7 @@ RSpec.describe Boards::TopicSync doMessageBus.track_publish("/boards/#{board.id}") { described_class.remove_topic(topic.id) }expect(messages.size).to eq(1)- expect(messages.first.data[:type]).to eq("card_deleted")- expect(messages.first.data[:card_id]).to eq(card.id)+ expect(messages.first.data).to eq(type: "board_updated", client_id: nil)expect(messages.first.group_ids).to contain_exactly(read_group.id)end