Merge branch 'fix-pdf-text-masker' into develop

mysociety · Jan 12, 2023 · 91d9f38 · 91d9f38
2 parents d907f71 + fd7fc77
commit 91d9f38
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/doc/CHANGES.md b/doc/CHANGES.md
@@ -2,6 +2,7 @@
 
 ## Highlighted Features
 
+* Improve processing of large PDF attachments (Graeme Porteous)
 * Add support for Ruby 3 (Graeme Porteous)
 * Drop support for Ruby 2.7 (Graeme Porteous)
 

diff --git a/lib/alaveteli_text_masker.rb b/lib/alaveteli_text_masker.rb
@@ -1,3 +1,5 @@
+require 'tempfile'
+
 module AlaveteliTextMasker
   include ConfigHelper
 
@@ -47,10 +49,22 @@ def apply_masks(text, content_type, options = {})
   private
 
   def uncompress_pdf(text)
-    AlaveteliExternalCommand.run("pdftk", "-", "output", "-", "uncompress", :stdin_string => text)
+    temp = Tempfile.new('pdftk', './tmp', encoding: 'ascii-8bit')
+    temp.write(text)
+    temp.close
+
+    AlaveteliExternalCommand.run(
+      "pdftk", temp.path, "output", "-", "uncompress"
+    )
+  ensure
+    temp.unlink
   end
 
   def compress_pdf(text)
+    temp = Tempfile.new('pdftk', './tmp', encoding: 'ascii-8bit')
+    temp.write(text)
+    temp.close
+
     if AlaveteliConfiguration::use_ghostscript_compression
       command = ["gs",
                  "-sDEVICE=pdfwrite",
@@ -60,11 +74,13 @@ def compress_pdf(text)
                  "-dQUIET",
                  "-dBATCH",
                  "-sOutputFile=-",
-                 "-"]
+                 temp.path]
     else
-      command = ["pdftk", "-", "output", "-", "compress"]
+      command = ["pdftk", temp.path, "output", "-", "compress"]
     end
-    AlaveteliExternalCommand.run(*(command + [ :stdin_string => text ]))
+    AlaveteliExternalCommand.run(*command)
+  ensure
+    temp.unlink
   end
 
   def apply_pdf_masks(text, options = {})