Skip to content

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

FIX: Unify artifact rendering and key-value storage availability via shared policy (#43962)

Renato Atilio1aaea57e757a
diff --git a/plugins/discourse-ai/app/controllers/discourse_ai/ai_bot/artifact_key_values_controller.rb b/plugins/discourse-ai/app/controllers/discourse_ai/ai_bot/artifact_key_values_controller.rb
index 7b7c8478f19..d714003ec11 100644
--- a/plugins/discourse-ai/app/controllers/discourse_ai/ai_bot/artifact_key_values_controller.rb
+++ b/plugins/discourse-ai/app/controllers/discourse_ai/ai_bot/artifact_key_values_controller.rb
@@ -116,8 +116,7 @@ module DiscourseAi
def find_artifact
@artifact = AiArtifact.find_by(id: params[:artifact_id])
raise Discourse::NotFound if !@artifact
- raise Discourse::NotFound if [email protected]? && guardian.anonymous?
- raise Discourse::NotFound if [email protected]? && !guardian.can_see?(@artifact.post)
+ raise Discourse::NotFound if [email protected]_to?(guardian)
end
end
end
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 90687372623..21e549b0410 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
@@ -12,14 +12,7 @@ module DiscourseAi
def show
artifact = AiArtifact.find(params[:id])
- post = Post.find_by(id: artifact.post_id)
- raise Discourse::NotFound if post.blank? || post.topic.blank?
-
- 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)
+ raise Discourse::NotFound if !artifact.available_to?(guardian)
name = artifact.name
artifact_version = nil
diff --git a/plugins/discourse-ai/app/models/ai_artifact.rb b/plugins/discourse-ai/app/models/ai_artifact.rb
index 7581890c24b..fbceccffa7f 100644
--- a/plugins/discourse-ai/app/models/ai_artifact.rb
+++ b/plugins/discourse-ai/app/models/ai_artifact.rb
@@ -97,6 +97,21 @@ class AiArtifact < ActiveRecord::Base
version
end
+ def available_to?(guardian)
+ if !SiteSetting.discourse_ai_enabled ||
+ !SiteSetting.ai_artifact_security.in?(%w[lax hybrid strict])
+ return false
+ end
+
+ source_post = Post.find_by(id: post_id)
+ return false if source_post.blank? || source_post.topic.blank?
+
+ shared_conversation = SharedAiConversation.find_by(target: source_post.topic) if public?
+ return true if public? && (shared_conversation.blank? || shared_conversation.publicly_visible?)
+
+ guardian.can_see?(source_post)
+ end
+
def public?
metadata&.dig("public") == true
end
diff --git a/plugins/discourse-ai/spec/requests/ai_bot/artifact_key_values_controller_spec.rb b/plugins/discourse-ai/spec/requests/ai_bot/artifact_key_values_controller_spec.rb
index 8e137384863..0d5bf191c25 100644
--- a/plugins/discourse-ai/spec/requests/ai_bot/artifact_key_values_controller_spec.rb
+++ b/plugins/discourse-ai/spec/requests/ai_bot/artifact_key_values_controller_spec.rb
@@ -85,6 +85,70 @@ RSpec.describe DiscourseAi::AiBot::ArtifactKeyValuesController do
expect(json["users"].map { |u| u["id"] }).to contain_exactly(user.id, other_user.id)
end
+ it "returns 404 when artifact availability is revoked" do
+ SiteSetting.ai_artifact_security = "disabled"
+
+ get "/discourse-ai/ai-bot/artifacts/#{artifact.id}"
+ expect(response.status).to eq(404)
+
+ get "/discourse-ai/ai-bot/artifact-key-values/#{artifact.id}.json",
+ params: {
+ all_users: true,
+ }
+ expect(response.status).to eq(404)
+ expect(response.body).not_to include(public_key_value.value)
+
+ SiteSetting.ai_artifact_security = "strict"
+ private_message_topic.trash!
+
+ get "/discourse-ai/ai-bot/artifacts/#{artifact.id}"
+ expect(response.status).to eq(404)
+
+ get "/discourse-ai/ai-bot/artifact-key-values/#{artifact.id}.json",
+ params: {
+ all_users: true,
+ }
+ expect(response.status).to eq(404)
+ expect(response.body).not_to include(public_key_value.value)
+ end
+
+ it "allows anonymous access to public-post artifacts with private metadata" do
+ public_post = Fabricate(:post, topic: Fabricate(:topic, user: user), user: user)
+ public_artifact = Fabricate(:ai_artifact, post: public_post)
+ public_key_value =
+ Fabricate(
+ :ai_artifact_key_value,
+ ai_artifact: public_artifact,
+ user: user,
+ key: "public_key",
+ public: true,
+ )
+ private_key_value =
+ Fabricate(
+ :ai_artifact_key_value,
+ ai_artifact: public_artifact,
+ user: user,
+ key: "private_key",
+ value: "private_value",
+ public: false,
+ )
+
+ get "/discourse-ai/ai-bot/artifacts/#{public_artifact.id}"
+ expect(response.status).to eq(200)
+ expect(response.body).to include(ERB::Util.html_escape(public_artifact.html))
+
+ get "/discourse-ai/ai-bot/artifact-key-values/#{public_artifact.id}.json",
+ params: {
+ all_users: true,
+ }
+
+ expect(response.status).to eq(200)
+ expect(response.parsed_body["key_values"].map { |key_value| key_value["key"] }).to eq(
+ [public_key_value.key],
+ )
+ expect(response.body).not_to include(private_key_value.value)
+ end
+
it "returns 404 for private artifact" do
get "/discourse-ai/ai-bot/artifact-key-values/#{private_artifact.id}.json"
expect(response.status).to eq(404)
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 6062dc676a6..69c8f2e2bb2 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
@@ -134,6 +134,16 @@ RSpec.describe DiscourseAi::AiBot::ArtifactsController do
cooked: "<div class='ai-artifact' data-ai-artifact-id='#{artifact.id}'></div>",
)
+ public_key_value =
+ Fabricate(
+ :ai_artifact_key_value,
+ ai_artifact: artifact,
+ user: user,
+ key: "shared_public_key",
+ value: "shared_public_value",
+ public: true,
+ )
+
shared_conversation = SharedAiConversation.share_conversation(user, topic)
expect(shared_conversation.publicly_visible?).to eq(true)
expect(artifact.reload.public?).to eq(true)
@@ -157,12 +167,20 @@ RSpec.describe DiscourseAi::AiBot::ArtifactsController do
body: response.status == 200 ? parse_srcdoc(response.body) : response.body,
}
+ get "/discourse-ai/ai-bot/artifact-key-values/#{artifact.id}.json",
+ params: {
+ all_users: true,
+ }
+ key_values_response = { status: response.status, 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)
+ expect(key_values_response[:status]).to eq(404)
+ expect(key_values_response[:body]).not_to include(public_key_value.value)
end
end