vault 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59a8ecc9e18c8112104e721f65e10cd56377803c
-  data.tar.gz: 28937a7a2360736b70cbae0f53c7103659a6ade0
+  metadata.gz: 17c7b7d52eaf25c26decc7297cff321cb39874c8
+  data.tar.gz: 553f4ded368aaff1b8cf9a44c8dc1fc200a488bb
 SHA512:
-  metadata.gz: 91b7a092f7dc019da3b410c744351686f146bd8c72d57f1a096f20e107df19ec9ef34b36125131d993d8539899713cdd014cfc98ac6b7e69a1f64729f1f982fb
-  data.tar.gz: 292bfa0003747c1e02cbe6ab3332e6a05b449db6d4f812d440864927f7c4f3b3dcd6ace36adc7574e9ac9849a32091c43d0b236765ed03e70c178a266677d961
+  metadata.gz: e3aca22bda4c5676b95acb887d1fc887781a896f0da9f76a1fba43a2b5676ef895f022cc2045bcc0b96ff5056d1e260da39a04e162ef756c011c2ed03f756fa9
+  data.tar.gz: 1148bc3d5e61bbad1703c5bb68d5fc7657c551fbb00f71b6534f6a44bb82eb102d1a5ddb80a2aefca7f248734d5fd342ff4ecd2d9be618ba0e70676922a89d28

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Vault Ruby Changelog
 
+## v0.7.1 (October 21, 2016)
+
+BUG FIXES
+
+- Properly vendor Net::HTTP::Persistent so that it doesn't collide
+  with net-http-persistent
+- Fix behavior where `verify_mode` was forced to `VERIFY_PEER`
+  if a custom CA was set
+
 ## v0.7.0 (October 18, 2016)
 
 DEPRECATIONS

data/lib/vault/client.rb

@@ -2,8 +2,7 @@ require "cgi"
 require "json"
 require "uri"
 
-require_relative "vendor/net/http/persistent"
-
+require_relative "persistent"
 require_relative "configurable"
 require_relative "errors"
 require_relative "version"
@@ -55,7 +54,7 @@ module Vault
       a << Net::ReadTimeout if defined?(Net::ReadTimeout)
       a << Net::OpenTimeout if defined?(Net::OpenTimeout)
 
-      a << Net::HTTP::Persistent::Error
+      a << PersistentHTTP::Error
     end.freeze
 
     # Indicates a requested operation is not possible due to security
@@ -76,7 +75,7 @@ module Vault
         instance_variable_set(:"@#{key}", value)
       end
 
-      @nhp = Net::HTTP::Persistent.new(name: "vault-ruby")
+      @nhp = PersistentHTTP.new(name: "vault-ruby")
 
       if proxy_address
         proxy_uri = URI.parse "http://#{proxy_address}"

data/lib/vault/{vendor/net/http/persistent.rb → persistent.rb}

@@ -1,3 +1,5 @@
+# Vendored and modified from github.com/drbrain/net-http-persistent
+#
 require 'net/http'
 require 'uri'
 require 'cgi' # for escaping
@@ -13,18 +15,18 @@ autoload :OpenSSL, 'openssl'
 ##
 # Persistent connections for Net::HTTP
 #
-# Net::HTTP::Persistent maintains persistent connections across all the
+# PersistentHTTP maintains persistent connections across all the
 # servers you wish to talk to.  For each host:port you communicate with a
 # single persistent connection is created.
 #
-# Multiple Net::HTTP::Persistent objects will share the same set of
+# Multiple PersistentHTTP objects will share the same set of
 # connections.
 #
 # For each thread you start a new connection will be created.  A
-# Net::HTTP::Persistent connection will not be shared across threads.
+# PersistentHTTP connection will not be shared across threads.
 #
 # You can shut down the HTTP connections when done by calling #shutdown.  You
-# should name your Net::HTTP::Persistent object if you intend to call this
+# should name your PersistentHTTP object if you intend to call this
 # method.
 #
 # Example:
@@ -33,7 +35,7 @@ autoload :OpenSSL, 'openssl'
 #
 #   uri = URI 'http://example.com/awesome/web/service'
 #
-#   http = Net::HTTP::Persistent.new 'my_app_name'
+#   http = PersistentHTTP.new 'my_app_name'
 #
 #   # perform a GET
 #   response = http.request uri
@@ -153,14 +155,14 @@ autoload :OpenSSL, 'openssl'
 #   uri = URI 'http://example.com/awesome/web/service'
 #   post_uri = uri + 'create'
 #
-#   http = Net::HTTP::Persistent.new 'my_app_name'
+#   http = PersistentHTTP.new 'my_app_name'
 #
 #   post = Net::HTTP::Post.new post_uri.path
 #   # ... fill in POST request
 #
 #   begin
 #     response = http.request post_uri, post
-#   rescue Net::HTTP::Persistent::Error
+#   rescue PersistentHTTP::Error
 #
 #     # POST failed, make a new request to verify the server did not process
 #     # the request
@@ -177,7 +179,7 @@ autoload :OpenSSL, 'openssl'
 #
 # === Connection Termination
 #
-# If you are done using the Net::HTTP::Persistent instance you may shut down
+# If you are done using the PersistentHTTP instance you may shut down
 # all the connections in the current thread with #shutdown.  This is not
 # recommended for normal use, it should only be used when it will be several
 # minutes before you make another HTTP request.
@@ -188,7 +190,7 @@ autoload :OpenSSL, 'openssl'
 # when the thread terminates.
 
 module Vault
-class Net::HTTP::Persistent
+class PersistentHTTP
 
   ##
   # The beginning of Time
@@ -206,7 +208,7 @@ class Net::HTTP::Persistent
   DEFAULT_POOL_SIZE = Process.getrlimit(Process::RLIMIT_NOFILE).first / 4
 
   ##
-  # The version of Net::HTTP::Persistent you are using
+  # The version of PersistentHTTP you are using
 
   VERSION = '3.0.0'
 
@@ -226,7 +228,7 @@ class Net::HTTP::Persistent
   ].compact
 
   ##
-  # Error class for errors raised by Net::HTTP::Persistent.  Various
+  # Error class for errors raised by PersistentHTTP.  Various
   # SystemCallErrors are re-raised with a human-readable message under this
   # class.
 
@@ -483,7 +485,7 @@ class Net::HTTP::Persistent
   attr_accessor :retry_change_requests
 
   ##
-  # Creates a new Net::HTTP::Persistent.
+  # Creates a new PersistentHTTP.
   #
   # Set +name+ to keep your connections apart from everybody else's.  Not
   # required currently, but highly recommended.  Your library name should be
@@ -523,8 +525,8 @@ class Net::HTTP::Persistent
     @socket_options << [Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1] if
       Socket.const_defined? :TCP_NODELAY
 
-    @pool = Net::HTTP::Persistent::Pool.new size: pool_size do |http_args|
-      Net::HTTP::Persistent::Connection.new Net::HTTP, http_args, @ssl_generation
+    @pool = PersistentHTTP::Pool.new size: pool_size do |http_args|
+      PersistentHTTP::Connection.new Net::HTTP, http_args, @ssl_generation
     end
 
     @certificate        = nil
@@ -1080,7 +1082,6 @@ application:
     connection.ca_path = @ca_path if @ca_path
 
     if @ca_file or @ca_path then
-      connection.verify_mode = OpenSSL::SSL::VERIFY_PEER
       connection.verify_callback = @verify_callback if @verify_callback
     end
 

data/lib/vault/{vendor/net/http/persistent → persistent}/connection.rb

@@ -3,7 +3,7 @@
 # connection's lifetime.
 
 module Vault
-class Net::HTTP::Persistent::Connection # :nodoc:
+class PersistentHTTP::Connection # :nodoc:
 
   attr_accessor :http
 
@@ -28,7 +28,7 @@ class Net::HTTP::Persistent::Connection # :nodoc:
   end
 
   def reset
-    @last_use = Net::HTTP::Persistent::EPOCH
+    @last_use = PersistentHTTP::EPOCH
     @requests = 0
   end
 

data/lib/vault/{vendor/net/http/persistent → persistent}/pool.rb

@@ -1,5 +1,5 @@
 module Vault
-class Net::HTTP::Persistent::Pool < Vault::ConnectionPool # :nodoc:
+class PersistentHTTP::Pool < Vault::ConnectionPool # :nodoc:
 
   attr_reader :available # :nodoc:
   attr_reader :key # :nodoc:
@@ -7,7 +7,7 @@ class Net::HTTP::Persistent::Pool < Vault::ConnectionPool # :nodoc:
   def initialize(options = {}, &block)
     super
 
-    @available = Net::HTTP::Persistent::TimedStackMulti.new(@size, &block)
+    @available = PersistentHTTP::TimedStackMulti.new(@size, &block)
     @key = :"current-#{@available.object_id}"
   end
 

data/lib/vault/{vendor/net/http/persistent → persistent}/timed_stack_multi.rb

@@ -1,5 +1,5 @@
 module Vault
-class Net::HTTP::Persistent::TimedStackMulti < ConnectionPool::TimedStack # :nodoc:
+class PersistentHTTP::TimedStackMulti < ConnectionPool::TimedStack # :nodoc:
 
   def initialize(size = 0, &block)
     super

data/lib/vault/version.rb

@@ -1,3 +1,3 @@
 module Vault
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vault
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Seth Vargo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-18 00:00:00.000000000 Z
+date: 2016-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -132,15 +132,15 @@ files:
 - lib/vault/defaults.rb
 - lib/vault/encode.rb
 - lib/vault/errors.rb
+- lib/vault/persistent.rb
+- lib/vault/persistent/connection.rb
+- lib/vault/persistent/pool.rb
+- lib/vault/persistent/timed_stack_multi.rb
 - lib/vault/request.rb
 - lib/vault/response.rb
 - lib/vault/vendor/connection_pool.rb
 - lib/vault/vendor/connection_pool/timed_stack.rb
 - lib/vault/vendor/connection_pool/version.rb
-- lib/vault/vendor/net/http/persistent.rb
-- lib/vault/vendor/net/http/persistent/connection.rb
-- lib/vault/vendor/net/http/persistent/pool.rb
-- lib/vault/vendor/net/http/persistent/timed_stack_multi.rb
 - lib/vault/version.rb
 - vault.gemspec
 homepage: https://github.com/hashicorp/vault-ruby