Handle multiple DKIM headers

Stephen Paul Weber created 2 years ago

Change summary

lib/interac_email.rb       |  8 ++--
test/test_interac_email.rb | 75 ++++++++++++++++++++++++++++++++++++++++
2 files changed, 79 insertions(+), 4 deletions(-)

Detailed changes

lib/interac_email.rb

@@ -119,17 +119,17 @@ class InteracEmail
 		end
 
 		def authentication_header
-			@m["Authentication-Results"]&.value
+			Array(@m["Authentication-Results"]).map(&:value)
 		end
 
 		HEADER_REGEX = /\sheader.d=payments.interac.ca\s/.freeze
 
 		def ensure_authentication_header
-			auth = authentication_header
-
+			auth = authentication_header.find { |a|
+				a =~ HEADER_REGEX
+			}
 			raise Error::NoAuth, @m unless auth
 			raise Error::BadAuth, @m unless auth =~ /\sdkim=pass\s/
-			raise Error::BadDomain, @m unless auth =~ HEADER_REGEX
 		end
 
 		def dkim_header

test/test_interac_email.rb

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+require "interac_email"
+require "mail"
+require "test_helper"
+
+class InteracEmailTest < Minitest::Test
+	def test_authentication_header
+		@m = Mail.new(<<~MAIL)
+			Authentication-Results: hai
+			To: [e-mail]
+			From: [e-mail]
+
+			body
+		MAIL
+		@validator = InteracEmail::Validator.new(@m)
+		assert_equal ["hai"], @validator.authentication_header
+	end
+
+	def test_authentication_headers
+		@m = Mail.new(<<~MAIL)
+			Authentication-Results: hai
+			Authentication-Results: hai2
+			To: [e-mail]
+			From: [e-mail]
+
+			body
+		MAIL
+		@validator = InteracEmail::Validator.new(@m)
+		assert_equal ["hai", "hai2"], @validator.authentication_header
+	end
+
+	def test_ensure_authentication_header
+		@m = Mail.new(<<~MAIL)
+			Authentication-Results: stuff header.d=payments.interac.ca dkim=pass and
+			Authentication-Results: and
+			To: [e-mail]
+			From: [e-mail]
+
+			body
+		MAIL
+		@validator = InteracEmail::Validator.new(@m)
+		@validator.ensure_authentication_header
+	end
+
+	def test_ensure_authentication_header_fail
+		@m = Mail.new(<<~MAIL)
+			Authentication-Results: stuff header.d=payments.interac.ca dkim=fail and
+			Authentication-Results: and
+			To: [e-mail]
+			From: [e-mail]
+
+			body
+		MAIL
+		@validator = InteracEmail::Validator.new(@m)
+		assert_raises(InteracEmail::Error::BadAuth) do
+			@validator.ensure_authentication_header
+		end
+	end
+
+	def test_ensure_authentication_header_no_interac
+		@m = Mail.new(<<~MAIL)
+			Authentication-Results: stuff header.d=fakey.fake dkim=pass and
+			Authentication-Results: and dkim=pass stuff
+			To: [e-mail]
+			From: [e-mail]
+
+			body
+		MAIL
+		@validator = InteracEmail::Validator.new(@m)
+		assert_raises(InteracEmail::Error::NoAuth) do
+			@validator.ensure_authentication_header
+		end
+	end
+end