1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* lib/open-uri.rb: add :ssl_verify_mode option.

suggested by Will Glynn.

* lib/open-uri.rb: add :ssl_ca_cert option.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9958 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2006-02-19 15:17:16 +00:00
parent 5d95ecbd1a
commit 6701de8e1e
2 changed files with 32 additions and 1 deletions

View file

@ -1,3 +1,10 @@
Mon Feb 20 00:13:49 2006 Tanaka Akira <akr@m17n.org>
* lib/open-uri.rb: add :ssl_verify_mode option.
suggested by Will Glynn.
* lib/open-uri.rb: add :ssl_ca_cert option.
Sat Feb 18 23:58:26 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/tracer.rb (Tracer::Tracer.add_filter): turn on tracer mode

View file

@ -99,6 +99,8 @@ module OpenURI
:content_length_proc => true,
:http_basic_authentication => true,
:read_timeout => true,
:ssl_ca_cert => nil,
:ssl_verify_mode => nil,
}
def OpenURI.check_options(options) # :nodoc:
@ -269,8 +271,17 @@ module OpenURI
if target.class == URI::HTTPS
require 'net/https'
http.use_ssl = true
http.verify_mode = OpenSSL::SSL::VERIFY_PEER
http.verify_mode = options[:ssl_verify_mode] || OpenSSL::SSL::VERIFY_PEER
store = OpenSSL::X509::Store.new
if options[:ssl_ca_cert]
if File.directory? options[:ssl_ca_cert]
store.add_path options[:ssl_ca_cert]
else
store.add_file options[:ssl_ca_cert]
end
else
store.set_default_paths
end
store.set_default_paths
http.cert_store = store
end
@ -583,6 +594,19 @@ module OpenURI
#
# :read_timeout option specifies a timeout of read for http connections.
#
# [:ssl_ca_cert]
# Synopsis:
# :ssl_ca_cert=>filename
#
# :ssl_ca_cert is used to specify CA certificate for SSL.
# If it is given, default certificates are not used.
#
# [:ssl_verify_mode]
# Synopsis:
# :ssl_verify_mode=>mode
#
# :ssl_verify_mode is used to specify openssl verify mode.
#
# OpenURI::OpenRead#open returns an IO like object if block is not given.
# Otherwise it yields the IO object and return the value of the block.
# The IO object is extended with OpenURI::Meta.