Fix uuencoded attachment processing

When attachment has different line endings we should be calling the calculate_hexdigest helper method.
mysociety · Sep 15, 2023 · a940d52 · a940d52
1 parent 73ff2d6
commit a940d52
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/mail_handler/backends/mail_backend.rb b/lib/mail_handler/backends/mail_backend.rb
@@ -432,7 +432,7 @@ def calculate_hexdigest(body)
           acc += uudecode(attrs[:body], attrs[:url_part_number])
         end
         attributes ||= uuencoded_attributes.find do |attrs|
-          attrs[:hexdigest] == hexdigest
+          calculate_hexdigest(attrs[:body]) == hexdigest
         end
 
         attributes

diff --git a/spec/lib/mail_handler/backends/mail_backend_spec.rb b/spec/lib/mail_handler/backends/mail_backend_spec.rb
@@ -450,7 +450,7 @@
           Hi Cat!
 
           begin 644 cat.txt
-          #0V%T
+          (0V%T#0I#870`
           `
           end
         EML
@@ -509,8 +509,8 @@
     end
 
     context 'when body has been uuencoded' do
-      let(:body) { "Cat" }
-      it { is_expected.to include(body: "Cat") }
+      let(:body) { "Cat\nCat" }
+      it { is_expected.to include(body: "Cat\r\nCat") }
     end
 
     context 'when body does not match' do