Skip to content

Commit

Permalink
Merge pull request #582 from Fryguy/rexml_3_3_4
Browse files Browse the repository at this point in the history
Upgrade rexml to 3.3.3+ for CVE-2024-41123 and CVE-2024-41946

(cherry picked from commit aa3f5b2)
  • Loading branch information
jrafanie authored and Fryguy committed Oct 2, 2024
1 parent c9ea131 commit 89c10f4
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 14 deletions.
2 changes: 1 addition & 1 deletion manageiq-gems-pending.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Gem::Specification.new do |s|
s.add_runtime_dependency "more_core_extensions", "~> 4.4"
s.add_runtime_dependency "net-ftp", "~> 0.1.2"
s.add_runtime_dependency "nokogiri", "~> 1.14", ">= 1.14.3"
s.add_runtime_dependency "rexml", ">= 3.3.2"
s.add_runtime_dependency "rexml", ">= 3.3.4"
s.add_runtime_dependency "sys-proctable", "~> 1.2.5"
s.add_runtime_dependency "sys-uname", "~> 1.2.1"
s.add_runtime_dependency "win32ole", "~> 1.8.8" # this gem was extracted in ruby 3 - required if we use wmi on windows
Expand Down
13 changes: 0 additions & 13 deletions spec/util/miq-xml_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,6 @@
expect(xml.root.elements[1].attributes['attr1']).to eq(attr_string)
end

it "handles loaded document with top-level text nodes" do
attr_string = "test string"
doc_text = "XXX<test><element_1 attr1='#{attr_string}'/></test>"

xml = MiqXml.load(doc_text)
expect(xml.root.elements[1].attributes['attr1']).to eq(attr_string)

expect(xml.to_s).to start_with("XXX<test>")

xml.write(xml_str = '', 1)
expect(xml_str).to start_with("\n<test>")
end

it "handles loaded document with UTF-8 BOM" do
bom = "\xEF\xBB\xBF".force_encoding("US-ASCII")
attr_string = "test string"
Expand Down

0 comments on commit 89c10f4

Please sign in to comment.