activesupport 6.0.4.7 → 6.0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c2ac48c4fc14731e5de656bd8d6e95f0e05bbf3e327070658ed4ffe5f4220d1
-  data.tar.gz: f2c96dbb25d284303c5b8d6c642951085a7ae33dcf19e5423f3143b3e4a11801
+  metadata.gz: c10e4238f073719e09a040bcb9d75ffb447e6255ce7794099f9d3f6ae38b5b32
+  data.tar.gz: e4044e3a0e76c0c732107d921d6832740dc41b6ac95bf912a70505a1d43d6a80
 SHA512:
-  metadata.gz: f5894888b523c8523b1664a00e1daf9d6cd679f78fd0f4ef0dfb5860058d99869960d4241e94d4802e19607e3e42abb6a141b37b85ea596b7e49510cf4f2162b
-  data.tar.gz: ac6c166043958ea77707d2f4973225568bee0b2d8bf1c3a9518e83f2b3f36f8e4761437cec0cd9de7389a017ea38f91fe89cd7f3b2d8bd03a99900f743bb0f53
+  metadata.gz: 3ab4066d1f1b568f9ed38f92a40d18515557f4d1f3eea87a571c2f3e3a6fd1d237229fb890cc383b4b943de410ae52347251da3675f79f872861791b10a00485
+  data.tar.gz: d586fccfd8c78eaccba32a46275e84bef0fefec92ace78bec50cef3d34c053e3842dee2380b020464f4f6c5a9b94b6815d5275438343ae02e5018cfb36aefb09

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## Rails 6.0.4.8 (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 6.0.4.7 (March 08, 2022) ##
 
 *   No changes.

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activesupport
 version: !ruby/object:Gem::Version
-  version: 6.0.4.7
+  version: 6.0.4.8
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-08 00:00:00.000000000 Z
+date: 2022-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -359,10 +359,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v6.0.4.7/activesupport/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v6.0.4.7/
+  changelog_uri: https://github.com/rails/rails/blob/v6.0.4.8/activesupport/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v6.0.4.8/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v6.0.4.7/activesupport
+  source_code_uri: https://github.com/rails/rails/tree/v6.0.4.8/activesupport
 post_install_message:
 rdoc_options:
 - "--encoding"