Skip to content

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

DEV: Fix job serialization deprecation in email controller (#39311)

Jarek Radosz74a96bd966c7
diff --git a/app/controllers/admin/email_controller.rb b/app/controllers/admin/email_controller.rb
index 793b8c2167f..bc935a7acdc 100644
--- a/app/controllers/admin/email_controller.rb
+++ b/app/controllers/admin/email_controller.rb
@@ -88,24 +88,11 @@ class Admin::EmailController < Admin::AdminController
raise ActionController::ParameterMissing.new("email_encoded or email")
end
- retry_count = 0
+ # If it isn't valid UTF-8, reinterpret as ISO-8859-1 so it can be serialized to JSON.
+ email_raw = email_raw.dup.force_encoding("UTF-8")
+ email_raw = email_raw.encode("UTF-8", "ISO-8859-1") if !email_raw.valid_encoding?
- begin
- Jobs.enqueue(
- :process_email,
- mail: email_raw,
- retry_on_rate_limit: true,
- source: "handle_mail",
- )
- rescue JSON::GeneratorError, Encoding::UndefinedConversionError => e
- if retry_count == 0
- email_raw = email_raw.force_encoding("iso-8859-1").encode("UTF-8")
- retry_count += 1
- retry
- else
- raise e
- end
- end
+ Jobs.enqueue(:process_email, mail: email_raw, retry_on_rate_limit: true, source: "handle_mail")
if deprecated_email_param_used
warning =
diff --git a/spec/requests/admin/email_controller_spec.rb b/spec/requests/admin/email_controller_spec.rb
index 4199bce7c67..17c7620dfa4 100644
--- a/spec/requests/admin/email_controller_spec.rb
+++ b/spec/requests/admin/email_controller_spec.rb
@@ -312,7 +312,7 @@ RSpec.describe Admin::EmailController do
expect(response.body).to eq("email has been received and is queued for processing")
end
- it "retries enqueueing with forced UTF-8 encoding when encountering Encoding::UndefinedConversionError" do
+ it "normalizes invalid UTF-8 bytes before enqueueing" do
post "/admin/email/handle_mail.json",
params: {
email_encoded: Base64.strict_encode64(email("encoding_undefined_conversion")),