A platform for community discussion. Free, open, simple.
FIX: Tighten security controls for artifact sharing (#40153)
Sam49af022877ee
diff --git a/plugins/discourse-ai/app/models/shared_ai_conversation.rb b/plugins/discourse-ai/app/models/shared_ai_conversation.rbindex 2b8183aca61..51cf2bbc411 100644--- a/plugins/discourse-ai/app/models/shared_ai_conversation.rb+++ b/plugins/discourse-ai/app/models/shared_ai_conversation.rb@@ -2,6 +2,7 @@class SharedAiConversation < ActiveRecord::BaseDEFAULT_MAX_POSTS = 100+ ARTIFACT_SECURITY_MODES = %w[lax hybrid strict]belongs_to :userbelongs_to :target, polymorphic: true@@ -17,18 +18,20 @@ class SharedAiConversation < ActiveRecord::Baseraise "Target must be a topic for now" if !target.is_a?(Topic)conversation = find_by(user: user, target: target)- conversation_data =- build_conversation_data(target, max_posts: max_posts, publish_artifacts: true)+ conversation_data = build_conversation_data(target, max_posts: max_posts)- conversation =+ shared =if conversationconversation.update(**conversation_data)- conversationelse- create(user_id: user.id, target: target, **conversation_data)+ conversation = create(user_id: user.id, target: target, **conversation_data)+ conversation.persisted?end- ::Jobs.enqueue(:shared_conversation_adjust_upload_security, conversation_id: conversation.id)+ if shared+ share_artifacts(target, max_posts: max_posts)+ ::Jobs.enqueue(:shared_conversation_adjust_upload_security, conversation_id: conversation.id)+ endconversationend@@ -136,12 +139,7 @@ class SharedAiConversation < ActiveRecord::BaseI18n.t("discourse_ai.share_ai.formatted_excerpt", llm_name: llm_name, excerpt: excerpt)end- def self.build_conversation_data(- topic,- max_posts: DEFAULT_MAX_POSTS,- include_usernames: false,- publish_artifacts: false- )+ def self.build_conversation_data(topic, max_posts: DEFAULT_MAX_POSTS, include_usernames: false)allowed_user_ids = topic.topic_allowed_users.pluck(:user_id)ai_bot_participant = DiscourseAi::AiBot::EntryPoint.find_participant_in(allowed_user_ids)@@ -155,14 +153,7 @@ class SharedAiConversation < ActiveRecord::Baseagent = AiAgent.find_by(id: agent_id.to_i)&.nameend- posts =- topic- .posts- .by_post_number- .where(post_type: Post.types[:regular])- .where.not(cooked: nil)- .where(deleted_at: nil)- .limit(max_posts)+ posts = conversation_posts(topic, max_posts: max_posts){llm_name: llm_name,@@ -174,7 +165,7 @@ class SharedAiConversation < ActiveRecord::Baseid: post.id,user_id: post.user_id,created_at: post.created_at,- cooked: cook_artifacts(post, publish: publish_artifacts),+ cooked: cook_artifacts(post),}mapped[:agent] = agent if ai_bot_participant&.id == post.user_id@@ -184,9 +175,9 @@ class SharedAiConversation < ActiveRecord::Base}end- def self.cook_artifacts(post, publish: false)+ def self.cook_artifacts(post)html = post.cooked- return html if !%w[lax hybrid strict].include?(SiteSetting.ai_artifact_security)+ return html if !ARTIFACT_SECURITY_MODES.include?(SiteSetting.ai_artifact_security)doc = Nokogiri::HTML5.fragment(html)doc@@ -195,15 +186,36 @@ class SharedAiConversation < ActiveRecord::Baseid = node["data-ai-artifact-id"].to_iversion = node["data-ai-artifact-version"]version_number = version.to_i if version- if id > 0- AiArtifact.share_publicly(id: id, post: post) if publish- node.replace(AiArtifact.iframe_for(id, version_number))- end+ node.replace(AiArtifact.iframe_for(id, version_number)) if id > 0enddoc.to_send+ def self.share_artifacts(topic, max_posts: DEFAULT_MAX_POSTS)+ return if !ARTIFACT_SECURITY_MODES.include?(SiteSetting.ai_artifact_security)++ conversation_posts(topic, max_posts: max_posts).each do |post|+ doc = Nokogiri::HTML5.fragment(post.cooked)+ doc+ .css("div.ai-artifact")+ .each do |node|+ id = node["data-ai-artifact-id"].to_i+ AiArtifact.share_publicly(id: id, post: post) if id > 0+ end+ end+ end++ def self.conversation_posts(topic, max_posts: DEFAULT_MAX_POSTS)+ topic+ .posts+ .by_post_number+ .where(post_type: Post.types[:regular])+ .where.not(cooked: nil)+ .where(deleted_at: nil)+ .limit(max_posts)+ end+privatedef populate_user_info!(posts)diff --git a/plugins/discourse-ai/spec/models/shared_ai_conversation_spec.rb b/plugins/discourse-ai/spec/models/shared_ai_conversation_spec.rbindex bad7d82e683..8d972875018 100644--- a/plugins/discourse-ai/spec/models/shared_ai_conversation_spec.rb+++ b/plugins/discourse-ai/spec/models/shared_ai_conversation_spec.rb@@ -110,6 +110,37 @@ RSpec.describe SharedAiConversation, type: :model doexpect(artifact.public?).to be_falseyend+ it "does not share artifacts publicly when refreshing the share fails" do+ SiteSetting.ai_artifact_security = "lax"++ conversation = described_class.share_conversation(user, topic)+ conversation.update_column(:share_key, "")++ artifact =+ Fabricate(+ :ai_artifact,+ post: post1,+ user: user,+ metadata: {+ public: false,+ something: "good",+ },+ )++ Fabricate(+ :post,+ topic: topic,+ post_number: 3,+ raw: "Here's an artifact",+ cooked: "<div class='ai-artifact' data-ai-artifact-id='#{artifact.id}'></div>",+ )++ described_class.share_conversation(user, topic)++ expect(artifact.reload.metadata["something"]).to eq("good")+ expect(artifact.public?).to be_falsey+ end+it "escapes HTML" doconversation = described_class.share_conversation(user, topic)onebox = conversation.onebox