vault 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e65904a28c46a6472dbbf09106bf0a195f9d291
-  data.tar.gz: 6ffa1d55b773e146db6292da052a8a05aa6e6ba4
+  metadata.gz: 8070f5204dc7fb565bfd50f5ba081fcd43b871ee
+  data.tar.gz: ee1b072bdf2cf41a886b35fcb765337bdb18b260
 SHA512:
-  metadata.gz: ea8558f0ffc17e853c0042555add482dfbc4c43a8061df636dd8441602d5e2610ffe2c7c241074108eb6c8aae84ecd9e3175417fc636e5071a9f978771d292f4
-  data.tar.gz: d87e2b3784fc0c9ee8d701d8fbbebaa5ddd319ba907452bf4e44ecf0eb1137d32e48adaed433a93dff38fcbb427d2c7d43be4f958d220d679c4b8e128a670cef
+  metadata.gz: a4ef3702182f75b6d33b48be4d93f3bb8c0ea66920bc9b63cbaa46be9983a934c2611728fef80260d591293d87b941a07904d5add95f65feebd9847efc8125d0
+  data.tar.gz: dbb8386139effe9ba92a6803e7f20074a0a1ae92fe527d113113f9d6f95495465ac4ab190e13ae6ff944ffc09f480ff251904cf1e9edaa274bb715a3908746ca

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Vault Ruby Changelog
 
+## v0.1.5 (September 1, 2015)
+
+IMPROVEMENTS
+
+- Use headers instead of cookies for authenticating to Vault [GH-36]
+
+BUG FIXES
+
+- Do not set undefined OpenSSL options
+- Add `ssl_pem_passphrase` as a configuration option [GH-35]
+
 ## v0.1.4 (August 15, 2015)
 
 IMPROVEMENTS

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vault (0.1.4)
+    vault (0.1.5)
 
 GEM
   remote: https://rubygems.org/

data/lib/vault.rb

@@ -18,10 +18,12 @@ module Vault
       @client = Vault::Client.new
 
       # Set secure SSL options
-      OpenSSL::SSL::SSLContext::DEFAULT_PARAMS[:options] &= ~OpenSSL::SSL::OP_DONT_INSERT_EMPTY_FRAGMENTS
-      OpenSSL::SSL::SSLContext::DEFAULT_PARAMS[:options] |= OpenSSL::SSL::OP_NO_COMPRESSION
-      OpenSSL::SSL::SSLContext::DEFAULT_PARAMS[:options] |= OpenSSL::SSL::OP_NO_SSLv2
-      OpenSSL::SSL::SSLContext::DEFAULT_PARAMS[:options] |= OpenSSL::SSL::OP_NO_SSLv3
+      OpenSSL::SSL::SSLContext::DEFAULT_PARAMS[:options].tap do |opts|
+        opts &= ~OpenSSL::SSL::OP_DONT_INSERT_EMPTY_FRAGMENTS if defined?(OpenSSL::SSL::OP_DONT_INSERT_EMPTY_FRAGMENTS)
+        opts |= OpenSSL::SSL::OP_NO_COMPRESSION if defined?(OpenSSL::SSL::OP_NO_COMPRESSION)
+        opts |= OpenSSL::SSL::OP_NO_SSLv2 if defined?(OpenSSL::SSL::OP_NO_SSLv2)
+        opts |= OpenSSL::SSL::OP_NO_SSLv3 if defined?(OpenSSL::SSL::OP_NO_SSLv3)
+      end
 
       self
     end

data/lib/vault/client.rb

@@ -1,5 +1,4 @@
 require "cgi"
-require "cgi/cookie"
 require "json"
 require "net/http"
 require "net/https"
@@ -14,6 +13,9 @@ module Vault
     # The user agent for this client.
     USER_AGENT = "VaultRuby/#{Vault::VERSION} (+github.com/hashicorp/vault-ruby)".freeze
 
+    # The name of the header used to hold the Vault token.
+    TOKEN_HEADER = "X-Vault-Token".freeze
+
     # The default headers that are sent with every request.
     DEFAULT_HEADERS = {
       "Content-Type" => "application/json",
@@ -121,8 +123,16 @@ module Vault
       uri = build_uri(verb, path, data)
       request = class_for_request(verb).new(uri.request_uri)
 
-      # Add headers
+      # Get a list of headers
       headers = DEFAULT_HEADERS.merge(headers)
+
+      # Add the Vault token header - users could still override this on a
+      # per-request basis
+      if !token.nil?
+        request.add_field(TOKEN_HEADER, token)
+      end
+
+      # Add headers
       headers.each do |key, value|
         request.add_field(key, value)
       end
@@ -155,13 +165,6 @@ module Vault
         connection.read_timeout = (read_timeout || timeout).to_i
       end
 
-      # Create the cookie for the request.
-      cookie = CGI::Cookie.new
-      cookie.name    = "token"
-      cookie.value   = token
-      cookie.path    = "/"
-      cookie.expires = Time.now + (60*60*24*365)
-
       # Apply SSL, if applicable
       if uri.scheme == "https"
         # Turn on SSL
@@ -173,9 +176,6 @@ module Vault
         # Only use secure ciphers
         connection.ciphers = ssl_ciphers
 
-        # Turn on secure cookies
-        cookie.secure = true
-
         # Custom pem files, no problem!
         if ssl_pem_file
           pem = File.read(ssl_pem_file)
@@ -206,11 +206,6 @@ module Vault
         end
       end
 
-      # Add the cookie to the request if a token was given.
-      if !token.nil?
-        request["Cookie"] = cookie.to_s
-      end
-
       begin
         # Create a connection using the block form, which will ensure the socket
         # is properly closed in the event of an error.

data/lib/vault/configurable.rb

@@ -14,6 +14,7 @@ module Vault
         :read_timeout,
         :ssl_ciphers,
         :ssl_pem_file,
+        :ssl_pem_passphrase,
         :ssl_ca_cert,
         :ssl_ca_path,
         :ssl_verify,

data/lib/vault/defaults.rb

@@ -89,7 +89,7 @@ module Vault
         ENV["VAULT_SSL_CERT"]
       end
 
-      # The path to a pem on disk to use with custom SSL verification
+      # Passphrase to the pem file on disk to use with custom SSL verification
       # @return [String, nil]
       def ssl_pem_passphrase
         ENV["VAULT_SSL_CERT_PASSPHRASE"]

data/lib/vault/version.rb

@@ -1,3 +1,3 @@
 module Vault
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vault
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Seth Vargo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-15 00:00:00.000000000 Z
+date: 2015-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler