A platform for community discussion. Free, open, simple.
FIX: Revalidate artifact sharing policies (#42527)
Isaac Janzen12a31eb95339
diff --git a/plugins/discourse-ai/app/controllers/discourse_ai/ai_bot/artifacts_controller.rb b/plugins/discourse-ai/app/controllers/discourse_ai/ai_bot/artifacts_controller.rbindex 365cba01286..90687372623 100644--- a/plugins/discourse-ai/app/controllers/discourse_ai/ai_bot/artifacts_controller.rb+++ b/plugins/discourse-ai/app/controllers/discourse_ai/ai_bot/artifacts_controller.rb@@ -15,11 +15,11 @@ module DiscourseAipost = Post.find_by(id: artifact.post_id)raise Discourse::NotFound if post.blank? || post.topic.blank?- if artifact.public?- # no guardian needed- else- raise Discourse::NotFound if !guardian.can_see?(post)- end+ shared_conversation = SharedAiConversation.find_by(target: post.topic) if artifact.public?+ artifact_is_public =+ artifact.public? && (shared_conversation.blank? || shared_conversation.publicly_visible?)++ raise Discourse::NotFound if !artifact_is_public && !guardian.can_see?(post)name = artifact.nameartifact_version = nildiff --git a/plugins/discourse-ai/spec/requests/ai_bot/artifacts_controller_spec.rb b/plugins/discourse-ai/spec/requests/ai_bot/artifacts_controller_spec.rbindex 71746330261..6062dc676a6 100644--- a/plugins/discourse-ai/spec/requests/ai_bot/artifacts_controller_spec.rb+++ b/plugins/discourse-ai/spec/requests/ai_bot/artifacts_controller_spec.rb@@ -120,6 +120,52 @@ RSpec.describe DiscourseAi::AiBot::ArtifactsController doendend+ it "hides artifacts and future versions when their conversation share is invalidated" do+ llm_model = Fabricate(:llm_model, name: "artifact-sharing-model")+ toggle_enabled_bots(bots: [llm_model])+ SiteSetting.ai_bot_enabled = true+ SiteSetting.ai_bot_public_sharing_allowed_groups = "10"+ Group.user_trust_level_change!(user.id, user.trust_level)++ bot_user = llm_model.reload.user+ topic.topic_allowed_users.where.not(user_id: user.id).delete_all+ topic.topic_allowed_users.create!(user: bot_user)+ post.update_columns(+ cooked: "<div class='ai-artifact' data-ai-artifact-id='#{artifact.id}'></div>",+ )++ shared_conversation = SharedAiConversation.share_conversation(user, topic)+ expect(shared_conversation.publicly_visible?).to eq(true)+ expect(artifact.reload.public?).to eq(true)++ topic.topic_allowed_users.create!(user: Fabricate(:user))+ artifact_version =+ artifact.create_new_version(html: "<div>Future private artifact version</div>")++ get "/discourse-ai/ai-bot/shared-ai-conversations/#{shared_conversation.share_key}.json"+ shared_conversation_status = response.status++ get artifact.url+ artifact_response = {+ status: response.status,+ body: response.status == 200 ? parse_srcdoc(response.body) : response.body,+ }++ get AiArtifact.url(artifact.id, artifact_version.version_number)+ artifact_version_response = {+ status: response.status,+ body: response.status == 200 ? parse_srcdoc(response.body) : response.body,+ }++ aggregate_failures do+ expect(shared_conversation_status).to eq(404)+ expect(artifact_response[:status]).to eq(404)+ expect(artifact_response[:body]).not_to include(artifact.html)+ expect(artifact_version_response[:status]).to eq(404)+ expect(artifact_version_response[:body]).not_to include(artifact_version.html)+ end+ end+it "sanitizes CSS to prevent style tag breakout" dosign_in(user)malicious_css = '</style><script>alert("XSS from CSS")</script><style>'