ruby-dev

前田です。

Net::POP3#enable_ssl(とNet::POP3.enable_ssl)の仕様変更を提案します。
変更点は以下の2点です。

(1) デフォルトのverify_modeをVERIFY_PEERにする
(2) 第1引数がハッシュだったらSSLContext.buildにそのまま渡す
    (それ以外の場合は、(1)以外は以前と同じ挙動)
    ただし、:portはポート番号として扱い、buildには渡さない。

パッチを添付しますので、検討をお願いします。
というか、ゆうぞうさんの賛同が得られればcommitしてしまうかも
しれませんが許してください。

-- 
前田 修吾
ほんとに1.9.1でライブラリの仕様もフリーズするんですかねえ…。

Attachments (1)

pop3s.diff (4.78 KB, text/x-diff)

Index: lib/net/pop.rb
===================================================================
--- lib/net/pop.rb	(revision 14409)
+++ lib/net/pop.rb	(working copy)
@@ -25,7 +25,7 @@
 require 'timeout'
 
 begin
-  require "openssl"
+  require "openssl/ssl"
 rescue LoadError
 end
 
@@ -322,38 +322,53 @@
     # SSL
     #
 
-    @use_ssl = false
-    @verify = nil
-    @certs = nil
+    @ssl_params = nil
 
     # Enable SSL for all new instances.
     # +verify+ is the type of verification to do on the Server Cert; Defaults
-    # to OpenSSL::SSL::VERIFY_NONE.
+    # to OpenSSL::SSL::VERIFY_PEER.
     # +certs+ is a file or directory holding CA certs to use to verify the 
     # server cert; Defaults to nil.
-    def POP3.enable_ssl(verify = OpenSSL::SSL::VERIFY_NONE, certs = nil)
-      @use_ssl = true
-      @verify = verify
-      @certs = certs  
+    def POP3.enable_ssl(*args)
+      @ssl_params = create_ssl_params(*args)
     end
 
+    def POP3.create_ssl_params(verify_or_params = {}, certs = nil)
+      begin
+        params = verify_or_params.to_hash
+      rescue NoMethodError
+        params = {}
+        params[:verify_mode] = verify_or_params
+        if certs
+          if File.file?(certs)
+            params[:ca_file] = certs
+          elsif File.directory?(certs)
+            params[:ca_path] = certs
+          end
+        end
+      end
+      return params
+    end
+
     # Disable SSL for all new instances.
     def POP3.disable_ssl
-      @use_ssl = nil
-      @verify = nil
-      @certs = nil
+      @ssl_params = nil
     end
 
+    def POP3.ssl_params
+      return @ssl_params
+    end
+
     def POP3.use_ssl?
-      @use_ssl
+      return !@ssl_params.nil?
     end
 
     def POP3.verify
-      @verify
+      return @ssl_params[:verify_mode]
     end
 
     def POP3.certs
-      @certs
+      return @ssl_params[:ca_file] || @ssl_params[:ca_path]
     end
 
     #
@@ -394,11 +409,9 @@
     # This method does *not* open the TCP connection.
     def initialize(addr, port = nil, isapop = false)
       @address = addr
-      @use_ssl = POP3.use_ssl?
-      @port = port || (POP3.use_ssl? ? POP3.default_pop3s_port : POP3.default_pop3_port)
+      @ssl_params = POP3.ssl_params
+      @port = port
       @apop = isapop
-      @certs = POP3.certs
-      @verify = POP3.verify
       
       @command = nil
       @socket = nil
@@ -419,28 +432,28 @@
 
     # does this instance use SSL?
     def use_ssl?
-      @use_ssl
+      return !@ssl_params.nil?
     end
    
     # Enables SSL for this instance.  Must be called before the connection is
     # established to have any effect.
     # +verify+ is the type of verification to do on the Server Cert; Defaults
-    # to OpenSSL::SSL::VERIFY_NONE.
+    # to OpenSSL::SSL::VERIFY_PEER.
     # +certs+ is a file or directory holding CA certs to use to verify the 
     # server cert; Defaults to nil.
     # +port+ is port to establish the SSL connection on; Defaults to 995.
-    def enable_ssl(verify = OpenSSL::SSL::VERIFY_NONE, certs = nil, 
-                   port = POP3.default_pop3s_port)
-      @use_ssl = true
-      @verify = verify
-      @certs = certs
-      @port = port
+    def enable_ssl(verify_or_params = {}, certs = nil, port = nil)
+      begin
+        @ssl_params = verify_or_params.to_hash.dup
+        @port = @ssl_params.delete(:port) || @port
+      rescue NoMethodError
+        @ssl_params = POP3.create_ssl_params(verify_or_params, certs)
+        @port = port || @port
+      end
     end
     
     def disable_ssl
-      @use_ssl = false
-      @verify = nil
-      @certs = nil
+      @ssl_params = nil
     end
 
     # Provide human-readable stringification of class state.
@@ -469,7 +482,9 @@
     attr_reader :address
 
     # The port number to connect to.
-    attr_reader :port
+    def port
+      return @port || (use_ssl? ? POP3.default_pop3s_port : POP3.default_pop3_port)
+    end
 
     # Seconds to wait until a connection is opened.
     # If the POP3 object cannot open a connection within this time,
@@ -516,20 +531,10 @@
     end
 
     def do_start(account, password)
-      s = timeout(@open_timeout) { TCPSocket.open(@address, @port) }
+      s = timeout(@open_timeout) { TCPSocket.open(@address, port) }
       if use_ssl?
         raise 'openssl library not installed' unless defined?(OpenSSL)
-        context = OpenSSL::SSL::SSLContext.new
-        context.verify_mode = @verify
-        if @certs
-          if File.file?(@certs)
-            context.ca_file = @certs
-          elsif File.directory?(@certs)
-            context.ca_path = @certs
-          else
-            raise ArgumentError, "certs path is not file/directory: #{@certs}"
-          end
-        end
+        context = OpenSSL::SSL::SSLContext.build(@ssl_params)
         s = OpenSSL::SSL::SSLSocket.new(s, context)
         s.sync_close = true
         s.connect

Thread

Prev Next

In This Thread

Prev Next

[#32429] eval("\"\xfd".force_encoding("utf-8")) generages garbage in error message. — Tanaka Akira <akr@...>

[#32430] "wrong number of arguments (6 for 2)" by def m(a, b=:b, c, d, e) — Tanaka Akira <akr@...>

[#32432] eval("a"): illegal multibyte char — Tanaka Akira <akr@...>

[#32434] signature of exit() on C++ — "KISHIMOTO, Makoto" <ksmakoto@...4u.or.jp>

[#32447] ruby 1.9 trunk NKF and KCONV Encoding:ASCII-8BIT — WATANABE Tetsuya <Tetsuya.WATANABE@...>

[#32448] SEGV on "abcd\xf0".force_encoding("utf-8").reverse — Tanaka Akira <akr@...>

[#32451] -e:1:in `conv': no implicit conversion from nil to integer (TypeError) — Tanaka Akira <akr@...>

[#32452] `split': negative string size (or size too big) (ArgumentError) — Tanaka Akira <akr@...>

[#32459] Enumerator raises `dead fiber called' — "Yusuke ENDOH" <mame@...>

[#32462] SEGV by test/ruby/test_fiber.rb — Tanaka Akira <akr@...>

[#32468] Iconv.list patch for NetBSD/Citrus — "NARUSE, Yui" <naruse@...>

[#32473] about to_path and to_open — "Yusuke ENDOH" <mame@...>

[#32475] ext/tk/sample/tkextlib/vu/canvSticker2.rb — Tanaka Akira <akr@...>

[#32485] self-calling method dumps core — Tadashi Saito <shiba@...2.accsnet.ne.jp>

[#32493] Regexp#names, MatchData#names, MatchData#regexp — Tanaka Akira <akr@...>

[#32498] Re: [ruby-cvs:21399] Ruby:r14162 (trunk): * parse.y (expr): redefinable not (!) operator. — SASADA Koichi <ko1@...>

[#32502] :!@.inspect — Kazuhiro NISHIYAMA <zn@...>

[#32509] ruby-core:13961での問題(Error while bulding Ruby 1.9 from snapshot 2007/12/09) — KIMURA Koichi <kimura.koichi@...>

[#32512] Re: [ruby-cvs:21409] Ruby:r14172 (trunk): * transcode.c: new file to provide encoding conversion features. — Nobuyoshi Nakada <nobu@...>

[#32514] typo in lib/uri/common.rb — Ueda Satoshi <s-ueda@...>

[#32518] bug in Array#slice! — Satoshi Nakagawa <snakagawa@...>

[#32531] eigenmethod definition for BasicObjects dumps core — Tadashi Saito <shiba@...2.accsnet.ne.jp>

[#32536] timezone 関数が cygwin で見つかりません — Martin Duerst <duerst@...>

[#32550] Binary String — Hidetoshi NAGAI <nagai@...>

[#32556] default completion for irb1.9 — Tadashi Saito <shiba@...2.accsnet.ne.jp>

[#32563] transcoder loading — Nobuyoshi Nakada <nobu@...>

[#32565] Re: [ruby-cvs:21436] Ruby:r14199 (trunk): * io.c (rb_io_check_readable): set default external encoding to — Tanaka Akira <akr@...>

[#32566] hang with write — Tanaka Akira <akr@...>

[#32567] [nil, [...]] — Tanaka Akira <akr@...>

[#32569] Re: [ruby-cvs:21441] Ruby:r14204 (trunk): * io.c (rb_io_getc): use default external encoding if fptr->enc is — Tanaka Akira <akr@...>

[#32581] expandarray may mark dirty VALUE beyond stack — "Yusuke ENDOH" <mame@...>

[#32585] SEGV by IO.pipe — Tanaka Akira <akr@...>

[#32588] /(?<foo>...)/ =~ str assigns foo — Tanaka Akira <akr@...>

[#32590] Circular dependency on AIX — "Yutaka Kanemoto" <kinpoco@...>

[#32604] stack overflow by GC in a thread — Tanaka Akira <akr@...>

[#32606] encoding loading — Nobuyoshi Nakada <nobu@...>

[#32608] $! == 8 — Tanaka Akira <akr@...>

[#32609] Re: [ruby-cvs:21475] Ruby:r14238 (trunk): * configure.in (enc/Makefile): add external encoding objects list. — Yukihiro Matsumoto <matz@...>

[#32610] 1.9.1 issues left (as of 12/15) — Yukihiro Matsumoto <matz@...>

[#32622] binding of caller — Nobuyoshi Nakada <nobu@...>

[#32624] rss and base64 — Tanaka Akira <akr@...>

[#32625] Re: [ruby-cvs:21528] Ruby:r14292 (trunk): more tests. — Yukihiro Matsumoto <matz@...>

[#32628] Bignum#to_s doesn't check base — "Yusuke ENDOH" <mame@...>

[#32629] faster Bignum#* — "Yusuke ENDOH" <mame@...>

[#32631] Cygwin 上で Ruby最新版 をインストールする場合 — "Koji Tominaga" <crimsonshower@...>

[#32636] Re: [ruby-cvs:21552] Ruby:r14315 (trunk): * ext/nkf/nkf.c (NKF::_ENCODING): removed. — Tanaka Akira <akr@...>

[#32640] inspect closed dir. — Tanaka Akira <akr@...>

[#32641] interrupt in * — Tanaka Akira <akr@...>

[#32644] unparenthesized method call with block — "Yusuke ENDOH" <mame@...>

[#32645] unparenthesized method call with block — "Yusuke ENDOH" <mame@...>

[#32662] encode! は変換しないときに <nil> になってしまう。 — Martin Duerst <duerst@...>

[#32665] Net::POP3#enable_sslの仕様変更 — Shugo Maeda <shugo@...>

[#32668] syntax errors on ext/tk/sample — "U.Nakamura" <usa@...>

[#32675] /(?<break>a)/ =~ "a" 等によるローカル変数 — "Keita Yamaguchi" <keita.yamaguchi@...>

[#32677] nil.freeze in date.rb — Shugo Maeda <shugo@...>

[#32680] fail to compile version.c in trunk — Masaki Suketa <masaki.suketa@...>

[#32685] test/webrick/test_server.rb hang — Tanaka Akira <akr@...>

[#32686] enum_inject の説明文 — "Keita Yamaguchi" <keita.yamaguchi@...>

[#32687] Re: [ruby-cvs:21753] Ruby:r14516 (trunk): * lib/time.rb (Time.httpdate): use Time.utc for — Tadayoshi Funaba <tadf@...>

[#32691] Why only inject() accepts :symbols as if it's a Proc in Enumerable? — Tadashi Saito <shiba@...2.accsnet.ne.jp>

[#32693] String#== is not transitive — Tanaka Akira <akr@...>

[#32695] ISO-2022-JP output for transcode — "NARUSE, Yui" <naruse@...>

[#32699] cygwin 上で r14576 現在の test の失敗 — Martin Duerst <duerst@...>

[#32706] Fwd: RDoc: [FATAL] failed to allocate memory — Martin Duerst <duerst@...>

[#32708] Enumerable can't take multiple parameters — GOTOU Yuuzou <gotoyuzo@...>

[#32709] Re: [ruby-cvs:21826] Ruby:r14589 (trunk): Mon Dec 24 17:20:34 2007 NAKAMURA, Hiroshi <nahi@ruby-lang.org> — Tadayoshi Funaba <tadf@...>

[#32710] \e — "U.Nakamura" <usa@...>

[#32713] pre-release note for the christmas release. — Yukihiro Matsumoto <matz@...>

[#32715] issues left as of 12/25 2:00am JST — Yukihiro Matsumoto <matz@...>

[#32718] next dumps core when poped is 0 — "Yusuke ENDOH" <mame@...>

[#32725] more ANSI'ize — Tadashi Saito <shiba@...2.accsnet.ne.jp>

[#32726] Can't build on MacOSX 10.4(Tiger) (was Re: Re: 1.9.1 issues left (as of 12/15)) — "MOROHASHI Kyosuke" <moronatural@...>

[#32740] distinguish "w" and "w:euc-jp" — Tanaka Akira <akr@...>

[#32746] appendline Invalid read of size 1 — Tanaka Akira <akr@...>

[#32747] test-all on Debian/GNU etch — SASADA Koichi <ko1@...>

[#32748] resut of make test on cygwin — SASADA Koichi <ko1@...>

[#32756] make rdoc cause segv on OpenBSD — SASADA Koichi <ko1@...>

[#32763] Re: [ruby-cvs:21913] Ruby:r14676 (trunk): * trunk/common.mk, goruby.c, golf_prelude.rb: for golfers. — Yukihiro Matsumoto <matz@...>

[#32765] test/ruby/test_transcode.rb の問題 — Martin Duerst <duerst@...>

[#32767] result of test-all on FreeBSD 6.2 — SASADA Koichi <ko1@...>

[#32631] Cygwin 上で Ruby最新版をインストールする場合 — "Koji Tominaga" <crimsonshower@...>