From 4f04f0372bf16f0d38f02bfb0a1cd162f2dd1766 Mon Sep 17 00:00:00 2001
From: gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
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 <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/trunk@13499 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/open-uri.rb | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'lib/open-uri.rb')

diff --git a/lib/open-uri.rb b/lib/open-uri.rb
index a3b5879fdc..dd0e0b5912 100644
--- a/lib/open-uri.rb
+++ b/lib/open-uri.rb
@@ -98,6 +98,7 @@ module OpenURI
     :read_timeout => true,
     :ssl_ca_cert => nil,
     :ssl_verify_mode => nil,
+    :ssl_enable_post_connection_check => true,
     :ftp_active_mode => false,
   }
 
@@ -269,6 +270,10 @@ module OpenURI
     if target.class == URI::HTTPS
       require 'net/https'
       http.use_ssl = true
+      http.enable_post_connection_check = 
+        options.has_key?(:ssl_enable_post_connection_check) ?
+        options[:ssl_enable_post_connection_check] :
+        Options[:ssl_enable_post_connection_check]
       http.verify_mode = options[:ssl_verify_mode] || OpenSSL::SSL::VERIFY_PEER
       store = OpenSSL::X509::Store.new
       if options[:ssl_ca_cert]
@@ -289,16 +294,6 @@ module OpenURI
 
     resp = nil
     http.start {
-      if target.class == URI::HTTPS
-        # xxx: information hiding violation
-        sock = http.instance_variable_get(:@socket)
-        if sock.respond_to?(:io)
-          sock = sock.io # 1.9
-        else
-          sock = sock.instance_variable_get(:@socket) # 1.8
-        end
-        sock.post_connection_check(target_host)
-      end
       req = Net::HTTP::Get.new(request_uri, header)
       if options.include? :http_basic_authentication
         user, pass = options[:http_basic_authentication]
-- 
cgit v1.2.3