activesupport 5.2.7 → 5.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ca8c97dbd9b8c0060fa8fdc9fe0a265e52dade43f834a64d81be63a58631d52
-  data.tar.gz: 718c11ac32f5ede2cf74701c236afae41cd9ad50d8eb3d138594c869cb543462
+  metadata.gz: 1d6eaa5e7c5e342b04aaca38462ee4f868b448c093a7a61c63a42db181d76309
+  data.tar.gz: 511031c0b3a3bfbbaae326bfd5db78b0699550f7e32cc47ebc72c0013d9b1b04
 SHA512:
-  metadata.gz: 9390ba51ca2fec524ab28bf67f75ec75ef44c6599311c16c09b14a9a29cfe4d71732bd0a5fd31bea4b8d6e5bc5bfd5c12c06101aee7cc4f7cae3d203de9bb7a7
-  data.tar.gz: 39569f88617d0c8bcae4f85b461ce38f355533d1eb9484848a3c38ceb553e365adf8b2a34788d4705b6ae7fd75ee315262b3f889dae919a9bbd28238f56732aa
+  metadata.gz: 7065b798f14de079d46164aca2e16f000ea2cf94c7583ae528173df31d458498def8dbe2326ace9c5a6300bb893e6733f3a83eb5ca78950bff932aa079d86c3d
+  data.tar.gz: c3589a3c955cba2775084df6a67b3c8fecbac5367ac0dd4badd3e4ef0cefbe3985ee38e893ec6667e04e59a935b9ab6486c372b4f81df80029f4976bc2b40ffc

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## Rails 5.2.8 (May 09, 2022) ##
+
+*   No changes.
+
+
+## Rails 5.2.7.1 (April 26, 2022) ##
+
+*   Fix and add protections for XSS in `ActionView::Helpers` and `ERB::Util`.
+
+    Add the method `ERB::Util.xml_name_escape` to escape dangerous characters
+    in names of tags and names of attributes, following the specification of XML.
+
+    *Álvaro Martín Fraguas*
+
+
 ## Rails 5.2.7 (March 10, 2022) ##
 
 *   Restore support to Ruby 2.2.

data/lib/active_support/concurrency/load_interlock_aware_monitor.rb

@@ -7,11 +7,29 @@ module ActiveSupport
     # A monitor that will permit dependency loading while blocked waiting for
     # the lock.
     class LoadInterlockAwareMonitor < Monitor
+      EXCEPTION_NEVER = { Exception => :never }.freeze
+      EXCEPTION_IMMEDIATE = { Exception => :immediate }.freeze
+      private_constant :EXCEPTION_NEVER, :EXCEPTION_IMMEDIATE
+
       # Enters an exclusive section, but allows dependency loading while blocked
       def mon_enter
         mon_try_enter ||
           ActiveSupport::Dependencies.interlock.permit_concurrent_loads { super }
       end
+
+      def synchronize
+        Thread.handle_interrupt(EXCEPTION_NEVER) do
+          mon_enter
+
+          begin
+            Thread.handle_interrupt(EXCEPTION_IMMEDIATE) do
+              yield
+            end
+          ensure
+            mon_exit
+          end
+        end
+      end
     end
   end
 end

data/lib/active_support/core_ext/string/output_safety.rb

@@ -12,6 +12,14 @@ class ERB
     HTML_ESCAPE_ONCE_REGEXP = /["><']|&(?!([a-zA-Z]+|(#\d+)|(#[xX][\dA-Fa-f]+));)/
     JSON_ESCAPE_REGEXP = /[\u2028\u2029&><]/u
 
+    # Following XML requirements: https://www.w3.org/TR/REC-xml/#NT-Name
+    TAG_NAME_START_REGEXP_SET = "@:A-Z_a-z\u{C0}-\u{D6}\u{D8}-\u{F6}\u{F8}-\u{2FF}\u{370}-\u{37D}\u{37F}-\u{1FFF}" \
+                                "\u{200C}-\u{200D}\u{2070}-\u{218F}\u{2C00}-\u{2FEF}\u{3001}-\u{D7FF}\u{F900}-\u{FDCF}" \
+                                "\u{FDF0}-\u{FFFD}\u{10000}-\u{EFFFF}"
+    TAG_NAME_START_REGEXP = /[^#{TAG_NAME_START_REGEXP_SET}]/
+    TAG_NAME_FOLLOWING_REGEXP = /[^#{TAG_NAME_START_REGEXP_SET}\-.0-9\u{B7}\u{0300}-\u{036F}\u{203F}-\u{2040}]/
+    TAG_NAME_REPLACEMENT_CHAR = "_"
+
     # A utility method for escaping HTML tag characters.
     # This method is also aliased as <tt>h</tt>.
     #
@@ -116,6 +124,26 @@ class ERB
     end
 
     module_function :json_escape
+
+    # A utility method for escaping XML names of tags and names of attributes.
+    #
+    #   xml_name_escape('1 < 2 & 3')
+    #   # => "1___2___3"
+    #
+    # It follows the requirements of the specification: https://www.w3.org/TR/REC-xml/#NT-Name
+    def xml_name_escape(name)
+      name = name.to_s
+      return "" if name.blank?
+
+      starting_char = name[0].gsub(TAG_NAME_START_REGEXP, TAG_NAME_REPLACEMENT_CHAR)
+
+      return starting_char if name.size == 1
+
+      following_chars = name[1..-1].gsub(TAG_NAME_FOLLOWING_REGEXP, TAG_NAME_REPLACEMENT_CHAR)
+
+      starting_char + following_chars
+    end
+    module_function :xml_name_escape
   end
 end
 

data/lib/active_support/gem_version.rb

@@ -9,7 +9,7 @@ module ActiveSupport
   module VERSION
     MAJOR = 5
     MINOR = 2
-    TINY  = 7
+    TINY  = 8
     PRE   = nil
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activesupport
 version: !ruby/object:Gem::Version
-  version: 5.2.7
+  version: 5.2.8
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-10 00:00:00.000000000 Z
+date: 2022-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -333,8 +333,8 @@ homepage: http://rubyonrails.org
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/rails/rails/tree/v5.2.7/activesupport
-  changelog_uri: https://github.com/rails/rails/blob/v5.2.7/activesupport/CHANGELOG.md
+  source_code_uri: https://github.com/rails/rails/tree/v5.2.8/activesupport
+  changelog_uri: https://github.com/rails/rails/blob/v5.2.8/activesupport/CHANGELOG.md
 post_install_message: 
 rdoc_options:
 - "--encoding"