Skip to content

[9.4] deps(stdlib): bump erb from 2.2.3 to 4.0.4.1 to resolve CVE-2026-41316 #9387

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
headius merged 1 commit into from
Apr 22, 2026
+66 −19
Merged

[9.4] deps(stdlib): bump erb from 2.2.3 to 4.0.4.1 to resolve CVE-2026-41316 #9387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/pom.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def log(message = nil)
['digest', '3.1.0'],
['drb', '2.1.0'],
['english', '0.7.1'],
['erb', '2.2.3'],
['erb', '4.0.4.1'],
['error_highlight', '0.3.0'],
# https://github.com/ruby/etc/issues/19
# ['etc', '1.3.0'],
Expand Down
8 changes: 4 additions & 4 deletions lib/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ DO NOT MODIFY - GENERATED CODE
<dependency>
<groupId>rubygems</groupId>
<artifactId>erb</artifactId>
<version>2.2.3</version>
<version>4.0.4.1</version>
<type>gem</type>
<scope>provided</scope>
<exclusions>
Expand Down Expand Up @@ -1106,7 +1106,7 @@ DO NOT MODIFY - GENERATED CODE
<include>specifications/digest-3.1.0*</include>
<include>specifications/drb-2.1.0*</include>
<include>specifications/english-0.7.1*</include>
<include>specifications/erb-2.2.3*</include>
<include>specifications/erb-4.0.4.1*</include>
<include>specifications/error_highlight-0.3.0*</include>
<include>specifications/ffi-1.16.3*</include>
<include>specifications/fiddle-1.1.4*</include>
Expand Down Expand Up @@ -1186,7 +1186,7 @@ DO NOT MODIFY - GENERATED CODE
<include>gems/digest-3.1.0*/**/*</include>
<include>gems/drb-2.1.0*/**/*</include>
<include>gems/english-0.7.1*/**/*</include>
<include>gems/erb-2.2.3*/**/*</include>
<include>gems/erb-4.0.4.1*/**/*</include>
<include>gems/error_highlight-0.3.0*/**/*</include>
<include>gems/ffi-1.16.3*/**/*</include>
<include>gems/fiddle-1.1.4*/**/*</include>
Expand Down Expand Up @@ -1266,7 +1266,7 @@ DO NOT MODIFY - GENERATED CODE
<include>cache/digest-3.1.0*</include>
<include>cache/drb-2.1.0*</include>
<include>cache/english-0.7.1*</include>
<include>cache/erb-2.2.3*</include>
<include>cache/erb-4.0.4.1*</include>
<include>cache/error_highlight-0.3.0*</include>
<include>cache/ffi-1.16.3*</include>
<include>cache/fiddle-1.1.4*</include>
Expand Down
57 changes: 57 additions & 0 deletions test/mri/erb/test_erb.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,28 @@ def test_html_escape
assert_equal("", ERB::Util.html_escape(""))
assert_equal("abc", ERB::Util.html_escape("abc"))
assert_equal("&lt;&lt;", ERB::Util.html_escape("<\<"))
assert_equal("&#39;&amp;&quot;&gt;&lt;", ERB::Util.html_escape("'&\"><"))

assert_equal("", ERB::Util.html_escape(nil))
assert_equal("123", ERB::Util.html_escape(123))
end

def test_html_escape_to_s
object = Object.new
def object.to_s
"object"
end
assert_equal("object", ERB::Util.html_escape(object))
end

def test_html_escape_extension
assert_nil(ERB::Util.method(:html_escape).source_location)
end if RUBY_ENGINE == 'ruby'

def test_concurrent_default_binding
# This test randomly fails with JRuby -- NameError: undefined local variable or method `template2'
pend if RUBY_ENGINE == 'jruby'

template1 = 'one <%= ERB.new(template2).result %>'

eval 'template2 = "two"', TOPLEVEL_BINDING
Expand Down Expand Up @@ -236,6 +252,8 @@ def test_explicit_trim_line_with_carriage_return
end

def test_invalid_trim_mode
pend if RUBY_ENGINE == 'truffleruby'

assert_warning(/#{__FILE__}:#{__LINE__ + 1}/) do
@erb.new("", trim_mode: 'abc-def')
end
Expand Down Expand Up @@ -695,6 +713,45 @@ def test_prohibited_marshal_load
erb = Marshal.load(Marshal.dump(erb))
assert_raise(ArgumentError) {erb.result}
end

def test_prohibited_marshal_load_def_method
erb = ERB.allocate
erb.instance_variable_set(:@src, "")
erb.instance_variable_set(:@lineno, 1)
erb.instance_variable_set(:@_init, true)
erb = Marshal.load(Marshal.dump(erb))
assert_raise(ArgumentError) {erb.def_method(Class.new, 'render')}
end

def test_prohibited_marshal_load_def_module
erb = ERB.allocate
erb.instance_variable_set(:@src, "")
erb.instance_variable_set(:@lineno, 1)
erb.instance_variable_set(:@_init, true)
erb = Marshal.load(Marshal.dump(erb))
assert_raise(ArgumentError) {erb.def_module}
end

def test_prohibited_marshal_load_def_class
erb = ERB.allocate
erb.instance_variable_set(:@src, "")
erb.instance_variable_set(:@lineno, 1)
erb.instance_variable_set(:@_init, true)
erb = Marshal.load(Marshal.dump(erb))
assert_raise(ArgumentError) {erb.def_class}
end

def test_multi_line_comment_lineno
erb = ERB.new(<<~EOS)
<%= __LINE__ %>
<%#
%><%= __LINE__ %>
EOS
assert_equal <<~EOS, erb.result
1
3
EOS
end
end

class TestERBCoreWOStrScan < TestERBCore
Expand Down
18 changes: 4 additions & 14 deletions test/mri/erb/test_erb_command.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,17 @@

class TestErbCommand < Test::Unit::TestCase
def test_var
assert_in_out_err(["-I#{File.expand_path('../../lib', __dir__)}", "-w",
pend if RUBY_ENGINE == 'truffleruby'
assert_in_out_err(["-I#{File.expand_path('../../lib', __dir__)}",
File.expand_path("../../libexec/erb", __dir__),
"var=hoge"],
"<%=var%>", ["hoge"])
end

def test_template_file_encoding
assert_in_out_err(["-I#{File.expand_path('../../lib', __dir__)}", "-w",
pend if RUBY_ENGINE == 'truffleruby'
assert_in_out_err(["-I#{File.expand_path('../../lib', __dir__)}",
File.expand_path("../../libexec/erb", __dir__)],
"<%=''.encoding.to_s%>", ["UTF-8"])
end

# These interfaces will be removed at Ruby 2.7.
def test_deprecated_option
warnings = [
"warning: -S option of erb command is deprecated. Please do not use this.",
/\n.+\/libexec\/erb:\d+: warning: Passing safe_level with the 2nd argument of ERB\.new is deprecated\. Do not use it, and specify other arguments as keyword arguments\.\n/,
]
assert_in_out_err(["-I#{File.expand_path('../../lib', __dir__)}", "-w",
File.expand_path("../../libexec/erb", __dir__),
"-S", "0"],
"hoge", ["hoge"], warnings)
end
end
Loading