net-http-persistent 1.8.1 → 1.9

data/History.txt

@@ -1,3 +1,13 @@
+=== 1.9 / 2011-08-26
+
+* Minor Enhancement
+  * Added Net::HTTP::Persistent#cert_store to set an SSL certificate store
+    which defaults to the OpenSSL default certificate store.
+
+    HTTPS server certificates will be validated when this option is combined
+    with setting Net::HTTP::Persistent#verify_mode to
+    OpenSSL::SSL::VERIFY_PEER.
+
 === 1.8.1 / 2011-08-08
 
 * Bug Fix

data/lib/net/http/persistent.rb

@@ -43,7 +43,7 @@ class Net::HTTP::Persistent
   ##
   # The version of Net::HTTP::Persistent use are using
 
-  VERSION = '1.8.1'
+  VERSION = '1.9'
 
   ##
   # Error class for errors raised by Net::HTTP::Persistent.  Various
@@ -63,6 +63,12 @@ class Net::HTTP::Persistent
 
   attr_accessor :ca_file
 
+  ##
+  # An SSL certificate store. Setting this will override the default
+  # certificate store. See verify_mode for more information.
+
+  attr_accessor :cert_store
+
   ##
   # Where this instance's connections live in the thread local variables
 
@@ -149,6 +155,10 @@ class Net::HTTP::Persistent
   # HTTPS verify mode.  Defaults to OpenSSL::SSL::VERIFY_NONE which ignores
   # certificate problems.
   #
+  # Setting this to OpenSSL::SSL::VERIFY_PEER will, if no certificate, ca_file
+  # or cert_store are otherwhise set, use the systems default certificate
+  # store. This means it will use the Operating Systems root CA certificates.
+  #
   # You can use +verify_mode+ to override any default values.
 
   attr_accessor :verify_mode
@@ -223,6 +233,7 @@ class Net::HTTP::Persistent
     @private_key     = nil
     @verify_callback = nil
     @verify_mode     = nil
+    @cert_store      = nil
 
     @retry_change_requests = false
   end
@@ -523,7 +534,18 @@ class Net::HTTP::Persistent
       connection.key  = @private_key
     end
 
-    connection.verify_mode = @verify_mode if @verify_mode
+    connection.cert_store = @cert_store if @cert_store
+
+    if @verify_mode then
+      connection.verify_mode = @verify_mode
+
+      connection.cert_store ||= begin
+        store = OpenSSL::X509::Store.new
+        store.set_default_paths
+        store
+      end
+    end
+
   end
 
 end

data/test/test_net_http_persistent.rb

@@ -774,6 +774,29 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     assert_equal :callback, c.verify_callback
   end
 
+  def test_ssl_cert_store
+    store = OpenSSL::X509::Store.new
+    @http.cert_store = store
+
+    c = Net::HTTP.new 'localhost', 80
+
+    @http.ssl c
+
+    assert c.use_ssl?
+    assert_equal store, c.cert_store
+  end
+
+  def test_default_cert_store
+    @http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+
+    c = Net::HTTP.new 'localhost', 80
+
+    @http.ssl c
+
+    assert c.use_ssl?
+    assert c.cert_store
+  end
+
   def test_ssl_certificate
     @http.certificate = :cert
     @http.private_key = :key

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: net-http-persistent
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 29
   prerelease: 
   segments: 
   - 1
-  - 8
-  - 1
-  version: 1.8.1
+  - 9
+  version: "1.9"
 platform: ruby
 authors: 
 - Eric Hodel
@@ -36,7 +35,7 @@ cert_chain:
   x52qPcexcYZR7w==
   -----END CERTIFICATE-----
 
-date: 2011-08-09 00:00:00 Z
+date: 2011-08-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: minitest
@@ -62,11 +61,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 27
         segments: 
         - 2
-        - 9
-        version: "2.9"
+        - 12
+        version: "2.12"
   type: :development
   version_requirements: *id002
 description: |-
@@ -103,8 +102,6 @@ files:
 homepage: http://docs.seattlerb.org/net-http-persistent
 licenses: []
 
-metadata: {}
-
 post_install_message: 
 rdoc_options: 
 - --main
@@ -132,9 +129,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: net-http-persistent
-rubygems_version: 1.8.6
+rubygems_version: 1.8.9
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Manages persistent connections using Net::HTTP plus a speed fix for Ruby 1.8
 test_files: 
 - test/test_net_http_persistent.rb