From f2af1c58158c45b0f7273158e86b3c749f1138f5 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Sat, 7 Jun 2008 16:15:19 +0000 Subject: merge revision(s) 13657: * lib/net/http.rb, lib/open-uri.rb: remove Net::HTTP#enable_post_connection_check. [ruby-dev:31960] * lib/net/imap.rb: hostname should be verified against server's indentity as persented in the server's certificate. [ruby-dev:31960] * ext/openssl/lib/net/telnets.rb, ext/openssl/lib/net/ftptls.rb: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@16876 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 10 ++++++++++ ext/openssl/lib/net/ftptls.rb | 10 ++++++++++ ext/openssl/lib/net/telnets.rb | 3 +++ lib/net/http.rb | 11 +---------- lib/net/imap.rb | 1 + lib/open-uri.rb | 1 - version.h | 8 ++++---- 7 files changed, 29 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index c4cc641dd9..bdcd0d8e22 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Sun Jun 8 00:56:44 2008 GOTOU Yuuzou + + * lib/net/http.rb, lib/open-uri.rb: remove + Net::HTTP#enable_post_connection_check. [ruby-dev:31960] + + * lib/net/imap.rb: hostname should be verified against server's + indentity as persented in the server's certificate. [ruby-dev:31960] + + * ext/openssl/lib/net/telnets.rb, ext/openssl/lib/net/ftptls.rb: ditto. + Thu Jun 5 16:19:27 2008 NAKAMURA Usaku * win32/win32.c (make_cmdvector): adjust escaped successive diff --git a/ext/openssl/lib/net/ftptls.rb b/ext/openssl/lib/net/ftptls.rb index 43cc136bf6..e82eff72fa 100644 --- a/ext/openssl/lib/net/ftptls.rb +++ b/ext/openssl/lib/net/ftptls.rb @@ -29,13 +29,23 @@ require 'net/ftp' module Net class FTPTLS < FTP + def connect(host, port=FTP_PORT) + @hostname = host + super + end + def login(user = "anonymous", passwd = nil, acct = nil) + store = OpenSSL::X509::Store.new + store.set_default_paths ctx = OpenSSL::SSL::SSLContext.new('SSLv23') + ctx.cert_store = store + ctx.verify_mode = OpenSSL::SSL::VERIFY_PEER ctx.key = nil ctx.cert = nil voidcmd("AUTH TLS") @sock = OpenSSL::SSL::SSLSocket.new(@sock, ctx) @sock.connect + @sock.post_connection_check(@hostname) super(user, passwd, acct) voidcmd("PBSZ 0") end diff --git a/ext/openssl/lib/net/telnets.rb b/ext/openssl/lib/net/telnets.rb index d277a5c2a6..c869b5da1c 100644 --- a/ext/openssl/lib/net/telnets.rb +++ b/ext/openssl/lib/net/telnets.rb @@ -134,6 +134,9 @@ module Net @sock.verify_callback = @options['VerifyCallback'] @sock.verify_depth = @options['VerifyDepth'] @sock.connect + if @options['VerifyMode'] != OpenSSL::SSL::VERIFY_NONE + @sock.post_connection_check(@options['Host']) + end @ssl = true end '' diff --git a/lib/net/http.rb b/lib/net/http.rb index 54721a49a4..d518f32cbb 100644 --- a/lib/net/http.rb +++ b/lib/net/http.rb @@ -470,7 +470,6 @@ module Net #:nodoc: @debug_output = nil @use_ssl = false @ssl_context = nil - @enable_post_connection_check = false end def inspect @@ -527,9 +526,6 @@ module Net #:nodoc: false # redefined in net/https end - # specify enabling SSL server certificate 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 @@ -589,12 +585,7 @@ module Net #:nodoc: 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 + s.post_connection_check(@address) end end on_connect diff --git a/lib/net/imap.rb b/lib/net/imap.rb index 586f3fe4c0..57e78ec135 100644 --- a/lib/net/imap.rb +++ b/lib/net/imap.rb @@ -900,6 +900,7 @@ module Net end @sock = SSLSocket.new(@sock, context) @sock.connect # start ssl session. + @sock.post_connection_check(@host) if verify else @usessl = false end diff --git a/lib/open-uri.rb b/lib/open-uri.rb index 36a0639a80..0dae95b6e6 100644 --- a/lib/open-uri.rb +++ b/lib/open-uri.rb @@ -229,7 +229,6 @@ module OpenURI if target.class == URI::HTTPS require 'net/https' http.use_ssl = true - http.enable_post_connection_check = true http.verify_mode = OpenSSL::SSL::VERIFY_PEER store = OpenSSL::X509::Store.new store.set_default_paths diff --git a/version.h b/version.h index 614fe1fc16..2d65f3e426 100644 --- a/version.h +++ b/version.h @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.5" -#define RUBY_RELEASE_DATE "2008-06-05" +#define RUBY_RELEASE_DATE "2008-06-08" #define RUBY_VERSION_CODE 185 -#define RUBY_RELEASE_CODE 20080605 -#define RUBY_PATCHLEVEL 129 +#define RUBY_RELEASE_CODE 20080608 +#define RUBY_PATCHLEVEL 130 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 5 #define RUBY_RELEASE_YEAR 2008 #define RUBY_RELEASE_MONTH 6 -#define RUBY_RELEASE_DAY 5 +#define RUBY_RELEASE_DAY 8 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; -- cgit v1.2.3