Merge branch '8543-increase-regexp-timeout' into develop

mysociety · Jan 20, 2025 · d57b209 · d57b209
2 parents 556fb26 + c12dc6d
commit d57b209
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/app/jobs/foi_attachment_mask_job.rb b/app/jobs/foi_attachment_mask_job.rb
@@ -9,6 +9,8 @@ class FoiAttachmentMaskJob < ApplicationJob
   queue_as :default
   unique :until_and_while_executing, on_conflict: :log
 
+  around_perform :set_regexp_timeout
+
   attr_reader :attachment
 
   delegate :incoming_message, to: :attachment
@@ -62,4 +64,11 @@ def masks
       masks: info_request.masks
     }
   end
+
+  def set_regexp_timeout
+    current_timeout = Regexp.timeout
+    Regexp.timeout = 60.0
+    yield
+    Regexp.timeout = current_timeout
+  end
 end
diff --git a/doc/CHANGES.md b/doc/CHANGES.md
@@ -2,6 +2,7 @@
 
 ## Highlighted Features
 
+Increase regular expression timeout for attachment masking (Graeme Porteous)
 Add additional InfoRequest embargo scopes (Graeme Porteous)
 
 # 0.45.3.0