Fix white space attachment processing

Some previously extracted attachment appear to have extra trailing white space, this commits strips this in order identify the original attachment body. Fixes #7886
mysociety · Sep 4, 2023 · 55d211c · 55d211c
1 parent 5c4d3f0
commit 55d211c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/lib/mail_handler/backends/mail_backend.rb b/lib/mail_handler/backends/mail_backend.rb
@@ -401,7 +401,9 @@ def attempt_to_find_original_attachment_attributes(mail, body:, nested: false)
 
         def caluclate_hexdigest(body)
           # ensure bodies have the same line endings
-          Digest::MD5.hexdigest(Mail::Utilities.binary_unsafe_to_lf(body))
+          Digest::MD5.hexdigest(Mail::Utilities.binary_unsafe_to_lf(
+            body.rstrip
+          ))
         end
 
         hexdigest = caluclate_hexdigest(body)

diff --git a/spec/lib/mail_handler/backends/mail_backend_spec.rb b/spec/lib/mail_handler/backends/mail_backend_spec.rb
@@ -489,6 +489,11 @@
       it { is_expected.to include(body_without_headers: "Hello world\n") }
     end
 
+    context 'when body has trailing whitespace' do
+      let(:body) { "bar\nbar\n" }
+      it { is_expected.to include(body: "bar\nbar") }
+    end
+
     context 'when body does not match' do
       let(:body) { 'this does not match' }
       it { is_expected.to eq(nil) }