diff options
author | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-09-23 22:21:42 +0000 |
---|---|---|
committer | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-09-23 22:21:42 +0000 |
commit | 80865ba2dbddbee70bc2abd15eafadae50e846ac (patch) | |
tree | cadb6befe534a056f1c5300d761c3635f0a04601 /lib/net | |
parent | a32a1b7a03e6aeba489fdd935f88913319412e62 (diff) |
* 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 <cclark at isecpartners.com>
* 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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@13500 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/net')
-rw-r--r-- | lib/net/http.rb | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/lib/net/http.rb b/lib/net/http.rb index 46d95b27b4..3cf1803b12 100644 --- a/lib/net/http.rb +++ b/lib/net/http.rb @@ -470,6 +470,7 @@ module Net #:nodoc: @debug_output = nil @use_ssl = false @ssl_context = nil + @enable_post_connection_check = true end def inspect @@ -526,6 +527,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 @@ -584,6 +588,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 |