A platform for community discussion. Free, open, simple.
FIX: Prevent 403 errors when performing actions on reviewables with deleted posts (#43846)
Amanda Alves Branquinho0be6cfbf552e
diff --git a/app/controllers/reviewables_controller.rb b/app/controllers/reviewables_controller.rbindex 7bd6b31a78f..14e5fb08316 100644--- a/app/controllers/reviewables_controller.rb+++ b/app/controllers/reviewables_controller.rb@@ -8,7 +8,7 @@ class ReviewablesController < ApplicationControllerbefore_action :version_required, only: %i[update perform]before_action :ensure_can_see, except: [:destroy]- around_action :with_deleted_content, only: %i[index show]+ around_action :with_deleted_content, only: %i[index show perform]def indexoffset = params[:offset].to_idiff --git a/spec/requests/reviewables_controller_spec.rb b/spec/requests/reviewables_controller_spec.rbindex a0cbd346aff..d1536f644a3 100644--- a/spec/requests/reviewables_controller_spec.rb+++ b/spec/requests/reviewables_controller_spec.rb@@ -1033,6 +1033,67 @@ RSpec.describe ReviewablesController doexpect(json["errors"]).to be_presentendend++ describe "ReviewableFlaggedPost with deleted post" do+ fab!(:admin)+ fab!(:user) { Fabricate(:user, refresh_auto_groups: true) }+ fab!(:post)++ before do+ sign_in(admin)+ SiteSetting.reviewable_claiming = "optional"+ end++ it "allows performing actions on reviewable when post is deleted" do+ result = PostActionCreator.spam(user, post)+ reviewable = result.reviewable++ expect(reviewable.pending?).to eq(true)+ expect(reviewable.target_id).to eq(post.id)++ # Delete the post but keep reviewable pending+ PostDestroyer.new(admin, post, reviewable_id: reviewable.id).destroy+ reviewable.reload+ post.reload++ expect(post.deleted_at).not_to be_nil+ expect(reviewable.pending?).to eq(true),+ "Reviewable should still be pending after post deletion"++ put "/review/#{reviewable.id}/perform/agree_and_keep_deleted.json?version=#{reviewable.version}"++ expect(response.status).to eq(200),+ "Expected 200 but got #{response.status}. " \+ "This means target association is not loading as expected. " \+ "Body: #{response.parsed_body}"++ json = response.parsed_body+ expect(json.dig("reviewable_perform_result", "success")).to eq(true)++ reviewable.reload+ expect(reviewable.approved?).to eq(true)+ end++ it "does not return 403 when reviewable has deleted post" do+ result = PostActionCreator.spam(user, post)+ reviewable = result.reviewable++ # Delete the post but keep reviewable pending+ PostDestroyer.new(admin, post, reviewable_id: reviewable.id).destroy+ reviewable.reload++ expect(reviewable.pending?).to eq(true), "Reviewable should still be pending"++ put "/review/#{reviewable.id}/perform/agree_and_keep_deleted.json?version=#{reviewable.version}"++ expect(response.status).not_to eq(403),+ "Got 403 InvalidAction. " \+ "This means actions_for returned empty due to post.blank? being true. " \+ "The preload: false fix should prevent this."++ expect(response.status).to eq(200)+ end+ endenddescribe "with reviewable params added via plugin API" do