From 34f6c69a800a5d70f0697d516907e9a5e89d0e1e Mon Sep 17 00:00:00 2001 From: gotoyuzo Date: Sun, 23 Sep 2007 22:21:18 +0000 Subject: * lib/net/http.rb: an SSL verification (the server hostname should be matched with its certificate's commonName) is added. this verification can be skipped by "Net::HTTP#enable_post_connection_check=(false)". suggested by Chris Clark * lib/net/open-uri.rb: use Net::HTTP#enable_post_connection_check to perform SSL post connection check. * ext/openssl/lib/openssl/ssl.c (OpenSSL::SSL::SSLSocket#post_connection_check): refine error message. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@13499 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/net/http.rb | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'lib/net') diff --git a/lib/net/http.rb b/lib/net/http.rb index 6be3a7ca2..c222ad3e6 100644 --- a/lib/net/http.rb +++ b/lib/net/http.rb @@ -476,6 +476,7 @@ module Net #:nodoc: @debug_output = nil @use_ssl = false @ssl_context = nil + @enable_post_connection_check = true end def inspect @@ -532,6 +533,9 @@ module Net #:nodoc: false # redefined in net/https end + # specify enabling SSL server sertificate and hostname checking. + attr_accessor :enable_post_connection_check + # Opens TCP connection and HTTP session. # # When this method is called with block, gives a HTTP object @@ -590,6 +594,14 @@ module Net #:nodoc: HTTPResponse.read_new(@socket).value end s.connect + if @ssl_context.verify_mode != OpenSSL::SSL::VERIFY_NONE + begin + s.post_connection_check(@address) + rescue OpenSSL::SSL::SSLError => ex + raise ex if @enable_post_connection_check + warn ex.message + end + end end on_connect end -- cgit