A platform for community discussion. Free, open, simple.
SECURITY: Enforce single validated locale for image caption authorization and lookup (#43934)
Keegan Georgece771c0e6829
diff --git a/plugins/discourse-ai/app/controllers/discourse_ai/post_image_captions_controller.rb b/plugins/discourse-ai/app/controllers/discourse_ai/post_image_captions_controller.rbindex 1295c8be319..1d3f6a8d02d 100644--- a/plugins/discourse-ai/app/controllers/discourse_ai/post_image_captions_controller.rb+++ b/plugins/discourse-ai/app/controllers/discourse_ai/post_image_captions_controller.rb@@ -7,17 +7,16 @@ module DiscourseAidef indexpost = find_post- guardian.ensure_can_edit!(post)+ locale = caption_locale(post)+ ensure_can_edit_caption!(post, locale)- render json: {- captions:- DiscourseAi::PostImageCaptions.editable_captions(post, caption_locale(post)),- }+ render json: { captions: DiscourseAi::PostImageCaptions.editable_captions(post, locale) }enddef updatepost = find_post- guardian.ensure_can_edit!(post)+ locale = caption_locale(post)+ ensure_can_edit_caption!(post, locale)description = params[:description].to_s.strip@@ -45,7 +44,7 @@ module DiscourseAiimage_caption =DiscourseAi::PostImageCaptions.update_caption(post,- caption_locale(post),+ locale,params[:base62_sha1],description,)@@ -64,8 +63,19 @@ module DiscourseAiPost.find(params[:post_id])end+ def ensure_can_edit_caption!(post, locale)+ if locale == DiscourseAi::PostImageCaptions.original_locale(post)+ guardian.ensure_can_edit!(post)+ else+ guardian.ensure_can_localize_post!(post)+ end+ end+def caption_locale(post)- params[:locale].presence || DiscourseAi::PostImageCaptions.original_locale(post)+ locale = params[:locale]+ raise Discourse::InvalidAccess unless locale.nil? || locale.is_a?(String)++ locale.presence || DiscourseAi::PostImageCaptions.original_locale(post)endendenddiff --git a/plugins/discourse-ai/spec/requests/post_image_captions_controller_spec.rb b/plugins/discourse-ai/spec/requests/post_image_captions_controller_spec.rbindex 74f1c1160a8..8e56d14c5e7 100644--- a/plugins/discourse-ai/spec/requests/post_image_captions_controller_spec.rb+++ b/plugins/discourse-ai/spec/requests/post_image_captions_controller_spec.rb@@ -2,6 +2,9 @@describe DiscourseAi::PostImageCaptionsController dofab!(:admin)+ fab!(:post_author) { Fabricate(:user, trust_level: 4) }+ fab!(:translator, :user)+ fab!(:localizers, :group)fab!(:upload) doUploadCreator.new(file_from_fixtures(@@ -10,10 +13,10 @@ describe DiscourseAi::PostImageCaptionsController doRails.root.join("plugins/discourse-ai/spec/fixtures").to_s,),"caption-image.jpg",- ).create_for(admin.id)+ ).create_for(post_author.id)endfab!(:post) do- Fabricate(:post, user: admin, raw: "")+ Fabricate(:post, user: post_author, raw: "")endbefore do@@ -83,13 +86,129 @@ describe DiscourseAi::PostImageCaptionsController do)end- it "requires permission to edit the post" do- sign_in(Fabricate(:user))- store_caption("A generated description")+ it "allows delegated translators to edit translated captions", :aggregate_failures do+ SiteSetting.content_localization_enabled = true+ SiteSetting.content_localization_supported_locales = "en|ja"+ SiteSetting.content_localization_allowed_groups = localizers.id.to_s+ localizers.add(translator)+ store_caption("翻訳前の説明", locale: "ja")+ sign_in(translator)++ get "/discourse-ai/post-image-captions/#{post.id}.json", params: { locale: "ja" }++ expect(response.status).to eq(200)+ expect(response.parsed_body["captions"]).to contain_exactly(+ { "base62_sha1" => upload.base62_sha1, "description" => "翻訳前の説明" },+ )++ put "/discourse-ai/post-image-captions/#{post.id}/#{upload.base62_sha1}.json",+ params: {+ description: "翻訳後の説明",+ locale: "ja",+ }++ expect(response.status).to eq(200)+ expect(response.parsed_body).to include(+ "base62_sha1" => upload.base62_sha1,+ "description" => "翻訳後の説明",+ )+ expect(+ AiPostImageCaption.find_by(+ post_id: post.id,+ base62_sha1: upload.base62_sha1,+ locale: "ja",+ ).description,+ ).to eq("翻訳後の説明")++ store_caption("The original description")get "/discourse-ai/post-image-captions/#{post.id}.json"expect(response.status).to eq(403)+ expect(response.parsed_body["errors"]).to be_present++ put "/discourse-ai/post-image-captions/#{post.id}/#{upload.base62_sha1}.json",+ params: {+ description: "An unauthorized original description",+ }++ expect(response.status).to eq(403)+ expect(response.parsed_body["errors"]).to be_present+ expect(+ AiPostImageCaption.find_by(+ post_id: post.id,+ base62_sha1: upload.base62_sha1,+ locale: DiscourseAi::PostImageCaptions.original_locale(post),+ ).description,+ ).to eq("The original description")+ end++ it "rejects non-scalar original locales from delegated translators", :aggregate_failures do+ SiteSetting.content_localization_enabled = true+ SiteSetting.content_localization_supported_locales = "en|ja"+ SiteSetting.content_localization_allowed_groups = localizers.id.to_s+ localizers.add(translator)+ original_locale = DiscourseAi::PostImageCaptions.original_locale(post)+ store_caption("The original description", locale: original_locale)+ sign_in(translator)++ expect(translator.guardian.can_edit?(post)).to eq(false)+ expect(translator.guardian.can_localize_post?(post)).to eq(true)++ get "/discourse-ai/post-image-captions/#{post.id}.json", params: { locale: [original_locale] }++ expect(response.status).to eq(403)+ expect(response.parsed_body["errors"]).to be_present++ put "/discourse-ai/post-image-captions/#{post.id}/#{upload.base62_sha1}.json",+ params: {+ description: "An unauthorized original description",+ locale: [original_locale],+ }++ expect(response.status).to eq(403)+ expect(response.parsed_body["errors"]).to be_present+ expect(+ AiPostImageCaption.find_by(+ post_id: post.id,+ base62_sha1: upload.base62_sha1,+ locale: original_locale,+ ).description,+ ).to eq("The original description")+ end++ it "rejects translated captions for source editors without localization permission",+ :aggregate_failures do+ SiteSetting.content_localization_enabled = true+ SiteSetting.content_localization_supported_locales = "en|ja"+ SiteSetting.content_localization_allowed_groups = localizers.id.to_s+ SiteSetting.content_localization_allow_author_localization = false+ store_caption("The translated description", locale: "ja")+ sign_in(post_author)++ expect(post_author.guardian.can_edit?(post)).to eq(true)+ expect(post_author.guardian.can_localize_post?(post)).to eq(false)++ get "/discourse-ai/post-image-captions/#{post.id}.json", params: { locale: "ja" }++ expect(response.status).to eq(403)+ expect(response.parsed_body["errors"]).to be_present++ put "/discourse-ai/post-image-captions/#{post.id}/#{upload.base62_sha1}.json",+ params: {+ description: "An unauthorized translated description",+ locale: "ja",+ }++ expect(response.status).to eq(403)+ expect(response.parsed_body["errors"]).to be_present+ expect(+ AiPostImageCaption.find_by(+ post_id: post.id,+ base62_sha1: upload.base62_sha1,+ locale: "ja",+ ).description,+ ).to eq("The translated description")endend