Merge pull request #35 from railsware/handle-mail-parse-error

Handle Mail parse error

Author: i7an

CHANGELOG.md

@@ -1,6 +1,11 @@
+## [2.1.2] - 2024-12-13
+
+- Improved handling of invalid `from`, `to`, `cc`, `bcc` headers when sending
+  with Action Mailer
+
 ## [2.1.1] - 2024-12-11
 
-- Improved handling of empty `from`
+- Improved handling of empty `from` header when sending with Action Mailer
 
 ## [2.1.0] - 2024-07-08
 

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mailtrap (2.1.1)
+    mailtrap (2.1.2)
 
 GEM
   remote: https://rubygems.org/

lib/mailtrap/mail.rb

@@ -4,10 +4,13 @@
 
 require_relative 'mail/base'
 require_relative 'mail/from_template'
+require_relative 'errors'
 
 module Mailtrap
   module Mail
     class << self
+      # @param message [Mail::Message]
+      # @return [Mailtrap::Mail::Base]
       def from_message(message) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
         Mailtrap::Mail::Base.new(
           from: prepare_addresses(address_list(message['from'])&.addresses).first,
@@ -50,10 +53,19 @@ def from_message(message) # rubocop:disable Metrics/AbcSize, Metrics/MethodLengt
 
       HEADERS_TO_REMOVE = (SPECIAL_HEADERS + ACTIONMAILER_ADDED_HEADERS).freeze
 
+      # @param header [Mail::Field, nil]
+      # @return [Mail::AddressList, nil]
       def address_list(header)
-        header.respond_to?(:element) ? header.element : header&.address_list
+        return nil unless header
+
+        unless header.errors.empty?
+          raise Mailtrap::Error, ["failed to parse '#{header.name}': '#{header.unparsed_value}'"]
+        end
+
+        header.respond_to?(:element) ? header.element : header.address_list
       end
 
+      # @param addresses [Array<Mail::Address>, nil]
       def prepare_addresses(addresses)
         Array(addresses).map { |address| prepare_address(address) }
       end
@@ -66,6 +78,7 @@ def prepare_headers(message)
           .compact
       end
 
+      # @param address [Mail::Address]
       def prepare_address(address)
         {
           email: address.address,

lib/mailtrap/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mailtrap
-  VERSION = '2.1.1'
+  VERSION = '2.1.2'
 end

spec/mailtrap/mail_spec.rb

@@ -142,5 +142,18 @@
       # (There will be a "'from' is required" error from the server)
       its(:from) { is_expected.to be_nil }
     end
+
+    %i[from to cc bcc].each do |header|
+      context "when '#{header}' is invalid" do
+        let(:message_params) { super().merge(header => 'invalid [email protected]') }
+
+        it 'raises an error' do
+          expect { mail }.to raise_error(
+            Mailtrap::Error,
+            "failed to parse '#{header.capitalize}': 'invalid [email protected]'"
+          )
+        end
+      end
+    end
   end
 end