From 666947089d5d3bca105d90a9ca227451d106f7c0 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Mon, 13 Apr 2020 15:14:53 -0700 Subject: [PATCH] Add option to set X-Original-To for systems that route on envelope addressing --- .../conductor/action_mailbox/inbound_emails_controller.rb | 2 +- .../conductor/action_mailbox/inbound_emails/new.html.erb | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/actionmailbox/app/controllers/rails/conductor/action_mailbox/inbound_emails_controller.rb b/actionmailbox/app/controllers/rails/conductor/action_mailbox/inbound_emails_controller.rb index cd8b12dcde2..4846739c456 100644 --- a/actionmailbox/app/controllers/rails/conductor/action_mailbox/inbound_emails_controller.rb +++ b/actionmailbox/app/controllers/rails/conductor/action_mailbox/inbound_emails_controller.rb @@ -20,7 +20,7 @@ module Rails private def new_mail - Mail.new(params.require(:mail).permit(:from, :to, :cc, :bcc, :in_reply_to, :subject, :body).to_h).tap do |mail| + Mail.new(params.require(:mail).permit(:from, :to, :cc, :bcc, :x_original_to, :in_reply_to, :subject, :body).to_h).tap do |mail| mail[:bcc]&.include_in_headers = true params[:mail][:attachments].to_a.each do |attachment| mail.add_file(filename: attachment.original_filename, content: attachment.read) diff --git a/actionmailbox/app/views/rails/conductor/action_mailbox/inbound_emails/new.html.erb b/actionmailbox/app/views/rails/conductor/action_mailbox/inbound_emails/new.html.erb index a3c3d390649..752e0c31872 100644 --- a/actionmailbox/app/views/rails/conductor/action_mailbox/inbound_emails/new.html.erb +++ b/actionmailbox/app/views/rails/conductor/action_mailbox/inbound_emails/new.html.erb @@ -23,6 +23,11 @@ <%= form.text_field :bcc %> +
+ <%= form.label :x_original_to, "X-Original-To" %>
+ <%= form.text_field :x_original_to %> +
+
<%= form.label :in_reply_to, "In-Reply-To" %>
<%= form.text_field :in_reply_to %>