A platform for community discussion. Free, open, simple.
FIX: Hide raw upload errors from users and log diagnostics (#43935)
Alan Guo Xiang Tanf0612a5043c3
diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rbindex 97b5ad3d5d0..496594c1eff 100644--- a/app/controllers/uploads_controller.rb+++ b/app/controllers/uploads_controller.rb@@ -82,7 +82,11 @@ class UploadsController < ApplicationControllerretain_hours:,)rescue => e- render json: failed_json.merge(message: e.message&.split("\n")&.first),+ Rails.logger.error(+ "Failed to create upload: #{e.class}: #{e.message}\n#{e.backtrace.join("\n")}",+ )++ render json: failed_json.merge(message: I18n.t("upload.failed")),status: :unprocessable_entityelserender json: UploadsController.serialize_upload(info), status: Upload === info ? 200 : 422diff --git a/spec/requests/uploads_controller_spec.rb b/spec/requests/uploads_controller_spec.rbindex ead49eba54f..691e0ad1e2e 100644--- a/spec/requests/uploads_controller_spec.rb+++ b/spec/requests/uploads_controller_spec.rb@@ -85,6 +85,31 @@ RSpec.describe UploadsController doexpect(Jobs::CreateAvatarThumbnails.jobs.size).to eq(1)end+ it "logs unexpected upload errors and returns a generic message" do+ error =+ Discourse::Utils::CommandError.new(+ "magick /private/tmp/upload.png /private/tmp/image.jpg\nImage conversion failed",+ )+ FileStore::LocalStore.any_instance.stubs(:store_upload).raises(error)++ logger =+ track_log_messages do+ post "/uploads.json", params: { file: logo, upload_type: "composer" }+ end++ expect(response.status).to eq(422)+ expect(response.parsed_body).to eq(+ "failed" => "FAILED",+ "message" => I18n.t("upload.failed"),+ )+ expect(logger.errors.join("\n")).to include(+ "Failed to create upload",+ error.class.name,+ error.message,+ error.backtrace.first,+ )+ end+it 'returns "raw" url for site settings' doset_cdn_url "https://awesome.com"