Skip to content

Commit

Permalink
Fix Action Mailbox assuming request.body present
Browse files Browse the repository at this point in the history
In Rack 3.1, `rack.intput` (`request.body`) is no longer guaranteed to
be present, so we can no longer unconditionally call `read` on it.
  • Loading branch information
skipkayhil committed Jul 27, 2024
1 parent 1d3fb3c commit d75ce6c
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,11 @@ class Ingresses::Relay::InboundEmailsController < ActionMailbox::BaseController
before_action :authenticate_by_password, :require_valid_rfc822_message

def create
ActionMailbox::InboundEmail.create_and_extract_message_id! request.body.read
if request.body
ActionMailbox::InboundEmail.create_and_extract_message_id! request.body.read
else
head :unprocessable_entity
end
end

private
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,15 @@ class ActionMailbox::Ingresses::Relay::InboundEmailsControllerTest < ActionDispa
assert_equal "05988AA6EC0D44318855A5E39E3B6F9E@jansterba.com", inbound_email.message_id
end

test "rejecting a request with no body" do
assert_no_difference -> { ActionMailbox::InboundEmail.count } do
post rails_relay_inbound_emails_url, headers: { "Authorization" => credentials, "Content-Type" => "message/rfc822" },
env: { "rack.input" => nil }
end

assert_response :unprocessable_entity
end

test "rejecting an unauthorized inbound email" do
assert_no_difference -> { ActionMailbox::InboundEmail.count } do
post rails_relay_inbound_emails_url, headers: { "Content-Type" => "message/rfc822" },
Expand Down

0 comments on commit d75ce6c

Please sign in to comment.