Skip to content
Snippets Groups Projects
Unverified Commit d6535b84 authored by Heinrich Lee Yu's avatar Heinrich Lee Yu :basketball: Committed by GitLab
Browse files

Merge branch 'dcouture-rexml-CVE-2024-41946' into 'master' 

Update rexml to fix CVE-2024-41946

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/169632



Merged-by: default avatarHeinrich Lee Yu <heinrich@gitlab.com>
Approved-by: default avatarGreg Myers <gmyers@gitlab.com>
Approved-by: default avatarAsh McKenzie <amckenzie@gitlab.com>
Approved-by: default avatarHeinrich Lee Yu <heinrich@gitlab.com>
Co-authored-by: default avatarDominic Couture <dcouture@gitlab.com>
parents 5cf2cfec 8feae395
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 35 additions and 45 deletions
Gemfile.checksum
+ 1
− 3
View file @ d6535b84
@@ -587,7 +587,7 @@
{"name":"rest-client","version":"2.1.0","platform":"x86-mswin32","checksum":"a35a3bb8d16ca39d110a946a2c805267f98ce07a0ae890e4512a45eadea47a6e"},
{"name":"retriable","version":"3.1.2","platform":"ruby","checksum":"0a5a5d0ca4ba61a76fb31a17ab8f7f80281beb040c329d34dfc137a1398688e0"},
{"name":"reverse_markdown","version":"1.4.0","platform":"ruby","checksum":"a3305da1509ac8388fa84a28745621113e121383402a2e8e9350ba649034e870"},
{"name":"rexml","version":"3.3.2","platform":"ruby","checksum":"4513686f858d0ff2e5a412d734c8a192e16cb1df4cb2063f56b72a8ad4c5257f"},
{"name":"rexml","version":"3.3.8","platform":"ruby","checksum":"f68fd96345330a1062896d0d0401324b0dae0ee20f784791b0843db96b212167"},
{"name":"rinku","version":"2.0.0","platform":"ruby","checksum":"3e695aaf9f24baba3af45823b5c427b58a624582132f18482320e2737f9f8a85"},
{"name":"rotp","version":"6.3.0","platform":"ruby","checksum":"75d40087e65ed0d8022c33055a6306c1c400d1c12261932533b5d6cbcd868854"},
{"name":"rouge","version":"4.3.0","platform":"ruby","checksum":"9ee3d9ec53338e78c03fff0cbcd08881d80d69152349b046761e48ccf2de581c"},
@@ -699,8 +699,6 @@
{"name":"state_machines-activerecord","version":"0.8.0","platform":"ruby","checksum":"072fb701b8ab03de0608297f6c55dc34ed096e556fa8f77e556f3c461c71aab6"},
{"name":"strings","version":"0.2.1","platform":"ruby","checksum":"933293b3c95cf85b81eb44b3cf673e3087661ba739bbadfeadf442083158d6fb"},
{"name":"strings-ansi","version":"0.2.0","platform":"ruby","checksum":"90262d760ea4a94cc2ae8d58205277a343409c288cbe7c29416b1826bd511c88"},
{"name":"strscan","version":"3.1.0","platform":"java","checksum":"8645aa76e017e21764c6df572d2d79fcc1672284014f5bdbd806278cdbcd11b0"},
{"name":"strscan","version":"3.1.0","platform":"ruby","checksum":"01b8a81d214fbf7b5308c6fb51b5972bbfc4a6aa1f166fd3618ba97e0fcd5555"},
{"name":"swd","version":"2.0.3","platform":"ruby","checksum":"4cdbe2a4246c19f093fce22e967ec3ebdd4657d37673672e621bf0c7eb770655"},
{"name":"sync","version":"0.5.0","platform":"ruby","checksum":"668356cc07c59ac7ed9ecf34fec3929831f179c07adb1f3e1c3b7a1609a638fd"},
{"name":"sys-filesystem","version":"1.4.3","platform":"ruby","checksum":"390919de89822ad6d3ba3daf694d720be9d83ed95cdf7adf54d4573c98b17421"},
Gemfile.lock
+ 1
− 3
View file @ d6535b84
@@ -1568,8 +1568,7 @@ GEM
retriable (3.1.2)
reverse_markdown (1.4.0)
nokogiri
rexml (3.3.2)
strscan
rexml (3.3.8)
rinku (2.0.0)
rotp (6.3.0)
rouge (4.3.0)
@@ -1792,7 +1791,6 @@ GEM
unicode-display_width (>= 1.5, < 3.0)
unicode_utils (~> 1.4)
strings-ansi (0.2.0)
strscan (3.1.0)
swd (2.0.3)
activesupport (>= 3)
attr_required (>= 0.0.5)
Gemfile.next.checksum
+ 1
− 3
View file @ d6535b84
@@ -600,7 +600,7 @@
{"name":"rest-client","version":"2.1.0","platform":"x86-mswin32","checksum":"a35a3bb8d16ca39d110a946a2c805267f98ce07a0ae890e4512a45eadea47a6e"},
{"name":"retriable","version":"3.1.2","platform":"ruby","checksum":"0a5a5d0ca4ba61a76fb31a17ab8f7f80281beb040c329d34dfc137a1398688e0"},
{"name":"reverse_markdown","version":"1.4.0","platform":"ruby","checksum":"a3305da1509ac8388fa84a28745621113e121383402a2e8e9350ba649034e870"},
{"name":"rexml","version":"3.3.2","platform":"ruby","checksum":"4513686f858d0ff2e5a412d734c8a192e16cb1df4cb2063f56b72a8ad4c5257f"},
{"name":"rexml","version":"3.3.8","platform":"ruby","checksum":"f68fd96345330a1062896d0d0401324b0dae0ee20f784791b0843db96b212167"},
{"name":"rinku","version":"2.0.0","platform":"ruby","checksum":"3e695aaf9f24baba3af45823b5c427b58a624582132f18482320e2737f9f8a85"},
{"name":"rotp","version":"6.3.0","platform":"ruby","checksum":"75d40087e65ed0d8022c33055a6306c1c400d1c12261932533b5d6cbcd868854"},
{"name":"rouge","version":"4.3.0","platform":"ruby","checksum":"9ee3d9ec53338e78c03fff0cbcd08881d80d69152349b046761e48ccf2de581c"},
@@ -714,8 +714,6 @@
{"name":"stringio","version":"3.1.1","platform":"ruby","checksum":"53456e14175c594e0e8eb2206a1be33f3974d4fe21c131e628908b05c8c2ae1e"},
{"name":"strings","version":"0.2.1","platform":"ruby","checksum":"933293b3c95cf85b81eb44b3cf673e3087661ba739bbadfeadf442083158d6fb"},
{"name":"strings-ansi","version":"0.2.0","platform":"ruby","checksum":"90262d760ea4a94cc2ae8d58205277a343409c288cbe7c29416b1826bd511c88"},
{"name":"strscan","version":"3.1.0","platform":"java","checksum":"8645aa76e017e21764c6df572d2d79fcc1672284014f5bdbd806278cdbcd11b0"},
{"name":"strscan","version":"3.1.0","platform":"ruby","checksum":"01b8a81d214fbf7b5308c6fb51b5972bbfc4a6aa1f166fd3618ba97e0fcd5555"},
{"name":"swd","version":"2.0.3","platform":"ruby","checksum":"4cdbe2a4246c19f093fce22e967ec3ebdd4657d37673672e621bf0c7eb770655"},
{"name":"sync","version":"0.5.0","platform":"ruby","checksum":"668356cc07c59ac7ed9ecf34fec3929831f179c07adb1f3e1c3b7a1609a638fd"},
{"name":"sys-filesystem","version":"1.4.3","platform":"ruby","checksum":"390919de89822ad6d3ba3daf694d720be9d83ed95cdf7adf54d4573c98b17421"},
Gemfile.next.lock
+ 1
− 3
View file @ d6535b84
@@ -1594,8 +1594,7 @@ GEM
retriable (3.1.2)
reverse_markdown (1.4.0)
nokogiri
rexml (3.3.2)
strscan
rexml (3.3.8)
rinku (2.0.0)
rotp (6.3.0)
rouge (4.3.0)
@@ -1819,7 +1818,6 @@ GEM
unicode-display_width (>= 1.5, < 3.0)
unicode_utils (~> 1.4)
strings-ansi (0.2.0)
strscan (3.1.0)
swd (2.0.3)
activesupport (>= 3)
attr_required (>= 0.0.5)
gems/activerecord-gitlab/Gemfile.lock
+ 2
− 2
View file @ d6535b84
@@ -39,7 +39,7 @@ GEM
rack (3.0.8)
rainbow (3.1.1)
regexp_parser (2.8.1)
rexml (3.2.5)
rexml (3.3.8)
rspec (3.12.0)
rspec-core (~> 3.12.0)
rspec-expectations (~> 3.12.0)
@@ -102,4 +102,4 @@ DEPENDENCIES
sqlite3 (~> 1.6)
 
BUNDLED WITH
2.4.14
2.5.21
gems/click_house-client/Gemfile.lock
+ 2
− 2
View file @ d6535b84
@@ -41,7 +41,7 @@ GEM
rainbow (3.1.1)
rake (13.0.6)
regexp_parser (2.8.1)
rexml (3.2.5)
rexml (3.3.8)
rspec (3.12.0)
rspec-core (~> 3.12.0)
rspec-expectations (~> 3.12.0)
@@ -103,4 +103,4 @@ DEPENDENCIES
rubocop-rspec
 
BUNDLED WITH
2.4.16
2.5.21
gems/csv_builder/Gemfile.lock
+ 2
− 2
View file @ d6535b84
@@ -37,7 +37,7 @@ GEM
rack (3.0.8)
rainbow (3.1.1)
regexp_parser (2.8.1)
rexml (3.2.6)
rexml (3.3.8)
rspec (3.12.0)
rspec-core (~> 3.12.0)
rspec-expectations (~> 3.12.0)
@@ -97,4 +97,4 @@ DEPENDENCIES
rubocop-rspec (~> 2.22)
 
BUNDLED WITH
2.4.17
2.5.21
gems/gitlab-backup-cli/Gemfile.lock
+ 2
− 2
View file @ d6535b84
@@ -133,7 +133,7 @@ GEM
rainbow (3.1.1)
rake (13.2.1)
regexp_parser (2.9.2)
rexml (3.3.7)
rexml (3.3.8)
rspec (3.13.0)
rspec-core (~> 3.13.0)
rspec-expectations (~> 3.13.0)
@@ -209,4 +209,4 @@ DEPENDENCIES
rubocop-rspec (~> 2.27.1)
 
BUNDLED WITH
2.5.18
2.5.21
gems/gitlab-database-load_balancing/Gemfile.lock
+ 2
− 2
View file @ d6535b84
@@ -205,7 +205,7 @@ GEM
regexp_parser (2.7.0)
request_store (1.5.1)
rack (>= 1.4)
rexml (3.2.5)
rexml (3.3.8)
rspec (3.12.0)
rspec-core (~> 3.12.0)
rspec-expectations (~> 3.12.0)
@@ -300,4 +300,4 @@ DEPENDENCIES
rubocop-rspec (~> 2.22)
 
BUNDLED WITH
2.4.16
2.5.21
gems/gitlab-database-lock_retries/Gemfile.lock
+ 2
− 2
View file @ d6535b84
@@ -43,7 +43,7 @@ GEM
rack (3.0.8)
rainbow (3.1.1)
regexp_parser (2.8.2)
rexml (3.2.6)
rexml (3.3.8)
rspec (3.12.0)
rspec-core (~> 3.12.0)
rspec-expectations (~> 3.12.0)
@@ -102,4 +102,4 @@ DEPENDENCIES
rspec (~> 3.0)
 
BUNDLED WITH
2.4.22
2.5.21
gems/gitlab-housekeeper/Gemfile.lock
+ 2
− 2
View file @ d6535b84
@@ -67,7 +67,7 @@ GEM
rainbow (3.1.1)
rake (13.1.0)
regexp_parser (2.8.3)
rexml (3.2.6)
rexml (3.3.8)
rspec (3.12.0)
rspec-core (~> 3.12.0)
rspec-expectations (~> 3.12.0)
@@ -139,4 +139,4 @@ DEPENDENCIES
webmock
 
BUNDLED WITH
2.4.21
2.5.21
gems/gitlab-http/Gemfile.lock
+ 2
− 2
View file @ d6535b84
@@ -119,7 +119,7 @@ GEM
rainbow (3.1.1)
rake (13.0.6)
regexp_parser (2.8.1)
rexml (3.2.5)
rexml (3.3.8)
rouge (4.3.0)
rspec (3.12.0)
rspec-core (~> 3.12.0)
@@ -214,4 +214,4 @@ DEPENDENCIES
webrick (~> 1.8)
 
BUNDLED WITH
2.4.14
2.5.21
gems/gitlab-rspec/Gemfile.lock
+ 2
− 2
View file @ d6535b84
@@ -94,7 +94,7 @@ GEM
rainbow (3.1.1)
rake (13.0.6)
regexp_parser (2.8.1)
rexml (3.2.5)
rexml (3.3.8)
rspec (3.12.0)
rspec-core (~> 3.12.0)
rspec-expectations (~> 3.12.0)
@@ -185,4 +185,4 @@ DEPENDENCIES
rubocop-rspec (~> 2.22)
 
BUNDLED WITH
2.4.4
2.5.21
gems/gitlab-rspec_flaky/Gemfile.lock
+ 2
− 2
View file @ d6535b84
@@ -67,7 +67,7 @@ GEM
rack (3.0.8)
rainbow (3.1.1)
regexp_parser (2.8.1)
rexml (3.2.5)
rexml (3.3.8)
rspec (3.12.0)
rspec-core (~> 3.12.0)
rspec-expectations (~> 3.12.0)
@@ -143,4 +143,4 @@ DEPENDENCIES
rubocop-rspec (~> 2.22)
 
BUNDLED WITH
2.4.14
2.5.21
gems/gitlab-safe_request_store/Gemfile.lock
+ 2
− 2
View file @ d6535b84
@@ -41,7 +41,7 @@ GEM
regexp_parser (2.7.0)
request_store (1.5.1)
rack (>= 1.4)
rexml (3.2.5)
rexml (3.3.8)
rspec (3.12.0)
rspec-core (~> 3.12.0)
rspec-expectations (~> 3.12.0)
@@ -101,4 +101,4 @@ DEPENDENCIES
rubocop-rspec (~> 2.22)
 
BUNDLED WITH
2.4.16
2.5.21
gems/gitlab-schema-validation/Gemfile.lock
+ 2
− 2
View file @ d6535b84
@@ -54,7 +54,7 @@ GEM
rack (3.0.8)
rainbow (3.1.1)
regexp_parser (2.8.1)
rexml (3.2.5)
rexml (3.3.8)
rspec (3.12.0)
rspec-core (~> 3.12.0)
rspec-expectations (~> 3.12.0)
@@ -136,4 +136,4 @@ DEPENDENCIES
rubocop-rspec (~> 2.22)
 
BUNDLED WITH
2.4.14
2.5.21
gems/gitlab-secret_detection/Gemfile.lock
+ 2
− 2
View file @ d6535b84
@@ -62,7 +62,7 @@ GEM
re2 (2.4.3)
mini_portile2 (~> 2.8.5)
regexp_parser (2.8.2)
rexml (3.2.6)
rexml (3.3.8)
rspec (3.12.0)
rspec-core (~> 3.12.0)
rspec-expectations (~> 3.12.0)
@@ -148,4 +148,4 @@ DEPENDENCIES
rubocop-rspec (~> 2.22)
 
BUNDLED WITH
2.4.22
2.5.21
gems/gitlab-utils/Gemfile.lock
+ 2
− 2
View file @ d6535b84
@@ -108,7 +108,7 @@ GEM
rainbow (3.1.1)
rake (13.0.6)
regexp_parser (2.8.1)
rexml (3.2.5)
rexml (3.3.8)
rspec (3.12.0)
rspec-core (~> 3.12.0)
rspec-expectations (~> 3.12.0)
@@ -201,4 +201,4 @@ DEPENDENCIES
rubocop-rspec (~> 2.22)
 
BUNDLED WITH
2.4.4
2.5.21
gems/ipynbdiff/Gemfile.lock
+ 2
− 2
View file @ d6535b84
@@ -53,7 +53,7 @@ GEM
rainbow (3.1.1)
rake (13.0.6)
regexp_parser (2.8.1)
rexml (3.2.5)
rexml (3.3.8)
rspec (3.11.0)
rspec-core (~> 3.11.0)
rspec-expectations (~> 3.11.0)
@@ -136,4 +136,4 @@ DEPENDENCIES
simplecov (~> 0.22.0)
 
BUNDLED WITH
2.3.16
2.5.21
gems/openbao_client/Gemfile.lock
+ 1
− 3
View file @ d6535b84
@@ -58,8 +58,7 @@ GEM
rack (3.1.7)
rainbow (3.1.1)
regexp_parser (2.9.2)
rexml (3.3.2)
strscan
rexml (3.3.8)
rspec (3.13.0)
rspec-core (~> 3.13.0)
rspec-expectations (~> 3.13.0)
@@ -105,7 +104,6 @@ GEM
rubocop-capybara (~> 2.17)
rubocop-factory_bot (~> 2.22)
ruby-progressbar (1.13.0)
strscan (3.1.0)
typhoeus (1.4.1)
ethon (>= 0.9.0)
tzinfo (2.0.6)
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment