Skip to content

A platform for community discussion. Free, open, simple.

DEV: Harden AI artifact postMessage and COOP headers (#38647)

Isaac Janzen2b8c97a5f958
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.rb
index bd28435782c..aa3a0f58939 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
@@ -7,6 +7,7 @@ module DiscourseAi
before_action :require_site_settings!
skip_before_action :preload_json, :check_xhr, only: %i[show]
+ skip_after_action :set_cross_origin_opener_policy_header, only: %i[show]
def show
artifact = AiArtifact.find(params[:id])
@@ -174,7 +175,9 @@ module DiscourseAi
def build_parent_javascript(artifact)
<<~JAVASCRIPT
<script>
- document.querySelector('iframe').addEventListener('load', function() {
+ const iframe = document.querySelector('iframe');
+
+ iframe.addEventListener('load', function() {
try {
const iframeWindow = this.contentWindow;
const message = { type: 'discourse-artifact-data', dataset: {} };
@@ -191,6 +194,7 @@ module DiscourseAi
// Handle key-value store requests from iframe
window.addEventListener('message', async function(event) {
if (event.data && event.data.type === 'discourse-artifact-kv') {
+ if (event.source !== iframe.contentWindow) return;
const { action, data, requestId } = event.data;
const artifactId = #{artifact.id};
@@ -327,6 +331,7 @@ module DiscourseAi
def set_security_headers
response.headers.delete("X-Frame-Options")
+ response.headers["Cross-Origin-Opener-Policy"] = "same-origin"
response.headers[
"Content-Security-Policy"
] = "script-src 'self' 'unsafe-inline' 'wasm-unsafe-eval' #{AiArtifact::ALLOWED_CDN_SOURCES.join(" ")};"
diff --git a/plugins/discourse-ai/spec/requests/ai_bot/artifacts_controller_spec.rb b/plugins/discourse-ai/spec/requests/ai_bot/artifacts_controller_spec.rb
index 1beb5729dd1..d5b5d2e5922 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
@@ -137,5 +137,28 @@ RSpec.describe DiscourseAi::AiBot::ArtifactsController do
expect(response.headers["Content-Security-Policy"]).to include("unsafe-inline")
expect(response.headers["X-Robots-Tag"]).to eq("noindex")
end
+
+ it "forces a same-origin opener policy for artifact pages" do
+ SiteSetting.cross_origin_opener_policy_header = "unsafe-none"
+
+ sign_in(user)
+ get "/discourse-ai/ai-bot/artifacts/#{artifact.id}"
+
+ expect(response.status).to eq(200)
+ expect(response.headers["Cross-Origin-Opener-Policy"]).to eq("same-origin")
+ end
+
+ it "validates event.source against the child iframe in the KV postMessage handler" do
+ sign_in(user)
+ get "/discourse-ai/ai-bot/artifacts/#{artifact.id}"
+ expect(response.status).to eq(200)
+
+ doc = Nokogiri.HTML5(response.body)
+ parent_scripts = doc.css("body > script").map(&:text)
+ kv_handler_script = parent_scripts.find { |s| s.include?("discourse-artifact-kv") }
+
+ expect(kv_handler_script).to be_present
+ expect(kv_handler_script).to match(/event\.source\s*!==?\s*\w+\.contentWindow/)
+ end
end
end