Version 6.0.6.1

jhawthorn · jhawthorn · commit 28bb76d3efc3 · 2023-01-17T10:41:40.000-08:00
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -32,79 +32,79 @@ GIT
 PATH
   remote: .
   specs:
-    actioncable (6.0.6)
-      actionpack (= 6.0.6)
+    actioncable (6.0.6.1)
+      actionpack (= 6.0.6.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.6)
-      actionpack (= 6.0.6)
-      activejob (= 6.0.6)
-      activerecord (= 6.0.6)
-      activestorage (= 6.0.6)
-      activesupport (= 6.0.6)
+    actionmailbox (6.0.6.1)
+      actionpack (= 6.0.6.1)
+      activejob (= 6.0.6.1)
+      activerecord (= 6.0.6.1)
+      activestorage (= 6.0.6.1)
+      activesupport (= 6.0.6.1)
       mail (>= 2.7.1)
-    actionmailer (6.0.6)
-      actionpack (= 6.0.6)
-      actionview (= 6.0.6)
-      activejob (= 6.0.6)
+    actionmailer (6.0.6.1)
+      actionpack (= 6.0.6.1)
+      actionview (= 6.0.6.1)
+      activejob (= 6.0.6.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.6)
-      actionview (= 6.0.6)
-      activesupport (= 6.0.6)
+    actionpack (6.0.6.1)
+      actionview (= 6.0.6.1)
+      activesupport (= 6.0.6.1)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.6)
-      actionpack (= 6.0.6)
-      activerecord (= 6.0.6)
-      activestorage (= 6.0.6)
-      activesupport (= 6.0.6)
+    actiontext (6.0.6.1)
+      actionpack (= 6.0.6.1)
+      activerecord (= 6.0.6.1)
+      activestorage (= 6.0.6.1)
+      activesupport (= 6.0.6.1)
       nokogiri (>= 1.8.5)
-    actionview (6.0.6)
-      activesupport (= 6.0.6)
+    actionview (6.0.6.1)
+      activesupport (= 6.0.6.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.6)
-      activesupport (= 6.0.6)
+    activejob (6.0.6.1)
+      activesupport (= 6.0.6.1)
       globalid (>= 0.3.6)
-    activemodel (6.0.6)
-      activesupport (= 6.0.6)
-    activerecord (6.0.6)
-      activemodel (= 6.0.6)
-      activesupport (= 6.0.6)
-    activestorage (6.0.6)
-      actionpack (= 6.0.6)
-      activejob (= 6.0.6)
-      activerecord (= 6.0.6)
+    activemodel (6.0.6.1)
+      activesupport (= 6.0.6.1)
+    activerecord (6.0.6.1)
+      activemodel (= 6.0.6.1)
+      activesupport (= 6.0.6.1)
+    activestorage (6.0.6.1)
+      actionpack (= 6.0.6.1)
+      activejob (= 6.0.6.1)
+      activerecord (= 6.0.6.1)
       marcel (~> 1.0)
-    activesupport (6.0.6)
+    activesupport (6.0.6.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
       zeitwerk (~> 2.2, >= 2.2.2)
-    rails (6.0.6)
-      actioncable (= 6.0.6)
-      actionmailbox (= 6.0.6)
-      actionmailer (= 6.0.6)
-      actionpack (= 6.0.6)
-      actiontext (= 6.0.6)
-      actionview (= 6.0.6)
-      activejob (= 6.0.6)
-      activemodel (= 6.0.6)
-      activerecord (= 6.0.6)
-      activestorage (= 6.0.6)
-      activesupport (= 6.0.6)
+    rails (6.0.6.1)
+      actioncable (= 6.0.6.1)
+      actionmailbox (= 6.0.6.1)
+      actionmailer (= 6.0.6.1)
+      actionpack (= 6.0.6.1)
+      actiontext (= 6.0.6.1)
+      actionview (= 6.0.6.1)
+      activejob (= 6.0.6.1)
+      activemodel (= 6.0.6.1)
+      activerecord (= 6.0.6.1)
+      activestorage (= 6.0.6.1)
+      activesupport (= 6.0.6.1)
       bundler (>= 1.3.0)
-      railties (= 6.0.6)
+      railties (= 6.0.6.1)
       sprockets-rails (>= 2.0.0)
-    railties (6.0.6)
-      actionpack (= 6.0.6)
-      activesupport (= 6.0.6)
+    railties (6.0.6.1)
+      actionpack (= 6.0.6.1)
+      activesupport (= 6.0.6.1)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
@@ -215,7 +215,7 @@ GEM
       http_parser.rb (>= 0.6.0)
     em-socksify (0.3.2)
       eventmachine (>= 1.0.0.beta.4)
-    erubi (1.11.0)
+    erubi (1.12.0)
     et-orbi (1.2.4)
       tzinfo
     event_emitter (0.2.6)
@@ -293,11 +293,14 @@ GEM
       mustache
       nokogiri
     libxml-ruby (3.2.1)
-    loofah (2.18.0)
+    loofah (2.19.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.7.1)
+    mail (2.8.0)
       mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
     marcel (1.0.2)
     matrix (0.4.2)
     memoist (0.16.2)
@@ -344,15 +347,12 @@ GEM
     nokogiri (1.11.3)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)
-    nokogiri (1.11.3-x86_64-darwin)
-      racc (~> 1.4)
     os (1.1.1)
     parallel (1.20.1)
     parser (3.0.1.1)
       ast (~> 2.4.1)
     path_expander (1.1.0)
     pg (1.2.3)
-    psych (3.3.2)
     public_suffix (4.0.6)
     puma (5.2.2)
       nio4r (~> 2.0)
@@ -374,8 +374,8 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.3)
-      loofah (~> 2.3)
+    rails-html-sanitizer (1.4.4)
+      loofah (~> 2.19, >= 2.19.1)
     rainbow (3.0.0)
     rake (13.0.3)
     rb-fsevent (0.10.4)
@@ -525,7 +525,7 @@ GEM
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.0)
+    zeitwerk (2.6.6)
 
 PLATFORMS
   ruby
diff --git a/RAILS_VERSION b/RAILS_VERSION
@@ -1 +1 @@
-6.0.6
+6.0.6.1
diff --git a/actioncable/CHANGELOG.md b/actioncable/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Rails 6.0.6.1 (January 17, 2023) ##
+
+*   No changes.
+
+
 ## Rails 6.0.6 (September 09, 2022) ##
 
 *   No changes.
diff --git a/actioncable/lib/action_cable/gem_version.rb b/actioncable/lib/action_cable/gem_version.rb
@@ -10,7 +10,7 @@ module VERSION
     MAJOR = 6
     MINOR = 0
     TINY  = 6
-    PRE   = nil
+    PRE   = "1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end
diff --git a/actioncable/package.json b/actioncable/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rails/actioncable",
-  "version": "6.0.6",
+  "version": "6.0.6-1",
   "description": "WebSocket framework for Ruby on Rails.",
   "main": "app/assets/javascripts/action_cable.js",
   "files": [
diff --git a/actionmailbox/CHANGELOG.md b/actionmailbox/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Rails 6.0.6.1 (January 17, 2023) ##
+
+*   No changes.
+
+
 ## Rails 6.0.6 (September 09, 2022) ##
 
 *   No changes.
diff --git a/actionmailbox/lib/action_mailbox/gem_version.rb b/actionmailbox/lib/action_mailbox/gem_version.rb
@@ -10,7 +10,7 @@ module VERSION
     MAJOR = 6
     MINOR = 0
     TINY  = 6
-    PRE   = nil
+    PRE   = "1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Rails 6.0.6.1 (January 17, 2023) ##
+
+*   No changes.
+
+
 ## Rails 6.0.6 (September 09, 2022) ##
 
 *   No changes.
diff --git a/actionmailer/lib/action_mailer/gem_version.rb b/actionmailer/lib/action_mailer/gem_version.rb
@@ -10,7 +10,7 @@ module VERSION
     MAJOR = 6
     MINOR = 0
     TINY  = 6
-    PRE   = nil
+    PRE   = "1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Rails 6.0.6.1 (January 17, 2023) ##
+
+*   No changes.
+
+
 ## Rails 6.0.6 (September 09, 2022) ##
 
 *   No changes.
diff --git a/actionpack/lib/action_pack/gem_version.rb b/actionpack/lib/action_pack/gem_version.rb
@@ -10,7 +10,7 @@ module VERSION
     MAJOR = 6
     MINOR = 0
     TINY  = 6
-    PRE   = nil
+    PRE   = "1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end
diff --git a/actiontext/CHANGELOG.md b/actiontext/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Rails 6.0.6.1 (January 17, 2023) ##
+
+*   No changes.
+
+
 ## Rails 6.0.6 (September 09, 2022) ##
 
 *   No changes.
diff --git a/actiontext/lib/action_text/gem_version.rb b/actiontext/lib/action_text/gem_version.rb
@@ -10,7 +10,7 @@ module VERSION
     MAJOR = 6
     MINOR = 0
     TINY  = 6
-    PRE   = nil
+    PRE   = "1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end
diff --git a/actiontext/package.json b/actiontext/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rails/actiontext",
-  "version": "6.0.6",
+  "version": "6.0.6-1",
   "description": "Edit and display rich text in Rails applications",
   "main": "app/javascript/actiontext/index.js",
   "files": [
diff --git a/actionview/CHANGELOG.md b/actionview/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Rails 6.0.6.1 (January 17, 2023) ##
+
+*   No changes.
+
+
 ## Rails 6.0.6 (September 09, 2022) ##
 
 *   No changes.
diff --git a/actionview/lib/action_view/gem_version.rb b/actionview/lib/action_view/gem_version.rb
@@ -10,7 +10,7 @@ module VERSION
     MAJOR = 6
     MINOR = 0
     TINY  = 6
-    PRE   = nil
+    PRE   = "1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end
diff --git a/actionview/package.json b/actionview/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rails/ujs",
-  "version": "6.0.6",
+  "version": "6.0.6-1",
   "description": "Ruby on Rails unobtrusive scripting adapter",
   "main": "lib/assets/compiled/rails-ujs.js",
   "files": [
diff --git a/activejob/CHANGELOG.md b/activejob/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Rails 6.0.6.1 (January 17, 2023) ##
+
+*   No changes.
+
+
 ## Rails 6.0.6 (September 09, 2022) ##
 
 *   No changes.
diff --git a/activejob/lib/active_job/gem_version.rb b/activejob/lib/active_job/gem_version.rb
@@ -10,7 +10,7 @@ module VERSION
     MAJOR = 6
     MINOR = 0
     TINY  = 6
-    PRE   = nil
+    PRE   = "1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end
diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Rails 6.0.6.1 (January 17, 2023) ##
+
+*   No changes.
+
+
 ## Rails 6.0.6 (September 09, 2022) ##
 
 *   No changes.
diff --git a/activemodel/lib/active_model/gem_version.rb b/activemodel/lib/active_model/gem_version.rb
@@ -10,7 +10,7 @@ module VERSION
     MAJOR = 6
     MINOR = 0
     TINY  = 6
-    PRE   = nil
+    PRE   = "1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
@@ -1,3 +1,22 @@
+## Rails 6.0.6.1 (January 17, 2023) ##
+
+*   Make `sanitize_as_sql_comment` more strict
+
+    Though this method was likely never meant to take user input, it was
+    attempting sanitization. That sanitization could be bypassed with
+    carefully crafted input.
+
+    This commit makes the sanitization more robust by replacing any
+    occurrances of "/*" or "*/" with "/ *" or "* /". It also performs a
+    first pass to remove one surrounding comment to avoid compatibility
+    issues for users relying on the existing removal.
+
+    This also clarifies in the documentation of annotate that it should not
+    be provided user input.
+
+    [CVE-2023-22794]
+
+
 ## Rails 6.0.6 (September 09, 2022) ##
 
 *   Symbol is allowed by default for YAML columns
diff --git a/activerecord/lib/active_record/gem_version.rb b/activerecord/lib/active_record/gem_version.rb
@@ -10,7 +10,7 @@ module VERSION
     MAJOR = 6
     MINOR = 0
     TINY  = 6
-    PRE   = nil
+    PRE   = "1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end
diff --git a/activestorage/CHANGELOG.md b/activestorage/CHANGELOG.md
diff --git a/activestorage/lib/active_storage/gem_version.rb b/activestorage/lib/active_storage/gem_version.rb
diff --git a/activestorage/package.json b/activestorage/package.json
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
diff --git a/activesupport/lib/active_support/gem_version.rb b/activesupport/lib/active_support/gem_version.rb
diff --git a/guides/CHANGELOG.md b/guides/CHANGELOG.md
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
diff --git a/railties/lib/rails/gem_version.rb b/railties/lib/rails/gem_version.rb
diff --git a/version.rb b/version.rb
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@rails/actioncable",`
`3`		`- "version": "6.0.6",`
	`3`	`+ "version": "6.0.6-1",`
`4`	`4`	`"description": "WebSocket framework for Ruby on Rails.",`
`5`	`5`	`"main": "app/assets/javascripts/action_cable.js",`
`6`	`6`	`"files": [`