actionmailer 7.0.8.4 → 7.0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b225cfd985720ee0f8146fbefb48d635a689609f164dbdd6f545343a37a122a
-  data.tar.gz: 9daa50d7707cb6b08b85647e0dc3601c8510d2d734fd5257ad3df56a4385147a
+  metadata.gz: ec2aa94608e560dfa9fdb7247f2730a9973a8f2cf6d0004de3aede436852a5c2
+  data.tar.gz: 4be541003682f9868402bbe1c14171768157b3472452bf01962ddf0117de268b
 SHA512:
-  metadata.gz: 61812d9de84bd3561f49215ad9eedcd29f406ab61428fb9b33e866007ad57358e18ca627bc6024f60898fa02c3e4d9cbc36ac65b864c2a688cd8d35cba7a1b42
-  data.tar.gz: 1d074be551151665b3f416c078b2857a3ed3b28bc83c04f2cc24b34220302ad60d6a90906f56b6d1e68600f57819086913bcb882abdddfaf9730dadbcde51779
+  metadata.gz: 4a1275a44f7a32b52c353149fe5d41de26d45b34ca9392c9c73018fcae1fa40f2bc9bb8cb3cd7ee2388644097ad2f65b0fdac894d83907d70371ddf91c630f5b
+  data.tar.gz: e7df435d8a5ed6c06b1e30598f865d9028d917119272e70a4647e1eac19100bc9da1d2326f5f6017d27f6a46d7690568a369539eedbddb61cfbf456fa6674cae

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## Rails 7.0.8.5 (October 15, 2024) ##
+
+*   Avoid regex backtracking in `block_format` helper
+
+    [CVE-2024-47889]
+
+
 ## Rails 7.0.8.4 (June 04, 2024) ##
 
 *   No changes.

data/lib/action_mailer/gem_version.rb

@@ -10,7 +10,7 @@ module ActionMailer
     MAJOR = 7
     MINOR = 0
     TINY  = 8
-    PRE   = "4"
+    PRE   = "5"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/action_mailer/mail_helper.rb

@@ -23,10 +23,18 @@ module ActionMailer
       }.join("\n\n")
 
       # Make list points stand on their own line
-      formatted.gsub!(/[ ]*([*]+) ([^*]*)/) { "  #{$1} #{$2.strip}\n" }
-      formatted.gsub!(/[ ]*([#]+) ([^#]*)/) { "  #{$1} #{$2.strip}\n" }
+      output = +""
+      splits = formatted.split(/(\*+|\#+)/)
+      while line = splits.shift
+        if line.start_with?("*", "#") && splits[0].start_with?(" ")
+          output.chomp!(" ") while output.end_with?(" ")
+          output << "  #{line} #{splits.shift.strip}\n"
+        else
+          output << line
+        end
+      end
 
-      formatted
+      output
     end
 
     # Access the mailer instance.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: actionmailer
 version: !ruby/object:Gem::Version
-  version: 7.0.8.4
+  version: 7.0.8.5
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-04 00:00:00.000000000 Z
+date: 2024-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.8.4
+        version: 7.0.8.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.8.4
+        version: 7.0.8.5
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.8.4
+        version: 7.0.8.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.8.4
+        version: 7.0.8.5
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.8.4
+        version: 7.0.8.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.8.4
+        version: 7.0.8.5
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.8.4
+        version: 7.0.8.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.0.8.4
+        version: 7.0.8.5
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
@@ -178,10 +178,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v7.0.8.4/actionmailer/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v7.0.8.4/
+  changelog_uri: https://github.com/rails/rails/blob/v7.0.8.5/actionmailer/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v7.0.8.5/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v7.0.8.4/actionmailer
+  source_code_uri: https://github.com/rails/rails/tree/v7.0.8.5/actionmailer
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
@@ -199,7 +199,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - none
-rubygems_version: 3.3.27
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: Email composition and delivery framework (part of Rails).