rubygems
/
webrick
1
0
Fork 0
Code Packages Releases Activity

Revert "Fix invalid use of IP addresses in SNI" 

This reverts commit b5c68768ed.

The commit will not longer be needed after changes to net/http
are merged to not set IP addresses as SNI server names.
This commit is contained in:
Jeremy Evans 2022-01-04 09:20:25 -08:00
parent b5c68768ed
commit f81c2cc7c5
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/webrick/test_httpproxy.rb
View File

@ -282,7 +282,7 @@ class TestWEBrickHTTPProxy < Test::Unit::TestCase
# 3. ------- GET or POST ---------->
#
key = TEST_KEY_RSA2048
cert = make_certificate(key, "localhost")
cert = make_certificate(key, "127.0.0.1")
s_config = {
:SSLEnable =>true,
:ServerName => "localhost",
@ -300,7 +300,7 @@ class TestWEBrickHTTPProxy < Test::Unit::TestCase
res.body = "SSL #{req.request_method} #{req.path} #{req.body}"
}
TestWEBrick.start_httpproxy(config){|server, addr, port, log|
http = Net::HTTP.new("localhost", s_port, addr, port)
http = Net::HTTP.new("127.0.0.1", s_port, addr, port)
http.use_ssl = true
http.verify_callback = Proc.new do |preverify_ok, store_ctx|
store_ctx.current_cert.to_der == cert.to_der
@ -398,7 +398,7 @@ class TestWEBrickHTTPProxy < Test::Unit::TestCase
# 3. ---------- GET or POST -------------->
#
key = TEST_KEY_RSA2048
cert = make_certificate(key, "localhost")
cert = make_certificate(key, "127.0.0.1")
s_config = {
:SSLEnable =>true,
:ServerName => "localhost",
@ -409,7 +409,7 @@ class TestWEBrickHTTPProxy < Test::Unit::TestCase
s_server.mount_proc("/"){|req2, res|
res.body = "SSL #{req2.request_method} #{req2.path} #{req2.body}"
}
http = Net::HTTP.new("localhost", s_port, addr, port, up_log.call + log.call + s_log.call)
http = Net::HTTP.new("127.0.0.1", s_port, addr, port, up_log.call + log.call + s_log.call)
http.use_ssl = true
http.verify_callback = Proc.new do |preverify_ok, store_ctx|
store_ctx.current_cert.to_der == cert.to_der

5
test/webrick/test_https.rb
View File

@ -17,11 +17,6 @@ class TestWEBrickHTTPS < Test::Unit::TestCase
class HTTPSNITest < ::Net::HTTP
attr_accessor :sni_hostname
def connect
@address = 'localhost' if @address == '127.0.0.1'
super
end
def ssl_socket_connect(s, timeout)
s.hostname = sni_hostname
super