conjur-cli 4.20.1 → 4.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54829e90e9f47497bd87c30bdaa35c6004a91d64
-  data.tar.gz: b468b645050ddf11e00e2c111e87fc32dd9d2945
+  metadata.gz: 3c37f9ccccef777e9cc90ab9dd9d83c167f59e8f
+  data.tar.gz: 00970eef162d3ff5f69b09bff7196234e61dfe97
 SHA512:
-  metadata.gz: e6750225d94caf197718145f90077f86b3e50dde0c8d8ba49d7e63db7cdb3fa3adf72c72eef3615a722a64486e1ce72aa5669fb820c56be0065abc4adac30d78
-  data.tar.gz: d1758ad2e32ed4a5161435edd98100399c466c85bfcff273c735fef1ec67a0ec889d5156ac184e0f555666d886912714f09171799be5be887ecda4009a1ebde6
+  metadata.gz: 538be1cde61f32cfe2db688d7bb399a9f44e85ca6e75ea1327e2a15cb1a1eade78a0265512b89a53fa2b9ef333828bc471c48ca18a23228fbe817d23abd8c4d9
+  data.tar.gz: bd3c351d0493ff5a2bbccbd5b510a76c4f28b3c3225da8c62de87f34b287ec332f7c43622be241fbdc6cf71e942e6d8408b64afacefd644f2785a465efb1781f

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 4.21.0
+
+* Use user cache dir for mimetype cache
+* Retrieve the whole certificate chain on conjur init
+
 # 4.20.1
 
 * Improve the error reporting

data/README.md

@@ -1,12 +1,14 @@
 # Conjur
 
-TODO: Write a gem description
+Command-line interface to Conjur. 
+
+A complete reference guide is available at [developer.conjur.net](http://developer.conjur.net/reference).
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
-    gem 'conjur'
+    gem 'conjur-cli', require: 'conjur/cli'
 
 And then execute:
 
@@ -14,11 +16,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install conjur
-
-## Usage
-
-TODO: Write usage instructions here
+    $ gem install conjur-cli
 
 ## Contributing
 

data/conjur.gemspec

@@ -17,12 +17,13 @@ Gem::Specification.new do |gem|
 
 
   gem.add_dependency 'activesupport'
-  gem.add_dependency 'conjur-api', '~> 4.13.0'
+  gem.add_dependency 'conjur-api', '~> 4.14'
   gem.add_dependency 'gli', '>=2.8.0'
   gem.add_dependency 'highline'
   gem.add_dependency 'netrc', '~> 0.10.2'
   gem.add_dependency 'methadone'
   gem.add_dependency 'deep_merge'
+  gem.add_dependency 'xdg'
 
   gem.add_runtime_dependency 'cas_rest_client'
 

data/lib/conjur/cli.rb

@@ -22,12 +22,15 @@ require 'gli'
 # need this to prevent an active support bug in some versions
 require 'active_support'
 require 'active_support/deprecation'
-require 'tmpdir'
+require 'xdg'
+require 'fileutils'
 
 # this makes mime/types gem load much faster by lazy loading
 # mime types and caching them in binary form
 ENV['RUBY_MIME_TYPES_LAZY_LOAD'] ||= 'true'
-ENV['RUBY_MIME_TYPES_CACHE'] ||= File.join Dir.tmpdir, 'conjur.mimetype.cache'
+ENV['RUBY_MIME_TYPES_CACHE'] ||= (
+  XDG['CACHE'].to_path.tap(&FileUtils.method(:mkdir_p)) + 'ruby-mime-types.cache'
+).to_s
 
 module Conjur
   autoload :Config,                 'conjur/config'

data/lib/conjur/command/init.rb

@@ -129,13 +129,14 @@ class Conjur::Command::Init < Conjur::Command
     sock = TCPSocket.new host, port.to_i
     ssock = SSLSocket.new sock
     ssock.connect
-    cert = ssock.peer_cert
+    chain = ssock.peer_cert_chain
+    cert = chain.first
     fp = Digest::SHA1.digest cert.to_der
 
     # convert to hex, then split into bytes with :
     hexfp = (fp.unpack 'H*').first.upcase.scan(/../).join(':')
 
-    ["SHA1 Fingerprint=#{hexfp}", cert.to_pem]
+    ["SHA1 Fingerprint=#{hexfp}", chain.map(&:to_pem).join]
   rescue
     exit_now! "Unable to retrieve certificate from #{connect_hostname}"
   ensure

data/lib/conjur/command/rspec/describe_command.rb

@@ -1,6 +1,19 @@
 RSpec::Core::DSL.change_global_dsl do
   def describe_command *argv, &block
     describe *argv do
+      let(:cert_store) { double(:cert_store) }
+        
+      before do
+        allow(cert_store).to receive(:add_file)
+        stub_const 'OpenSSL::SSL::SSLContext::DEFAULT_CERT_STORE', cert_store
+      end
+      
+      let(:cert_store_options) do
+        {
+          ssl_cert_store: cert_store
+        }
+      end
+      
       let(:invoke) do
         Conjur::CLI.error_device = $stderr
         # TODO: allow proper handling of description like "audit:send 'hello world'"

data/lib/conjur/version.rb

@@ -19,6 +19,6 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 module Conjur
-  VERSION = "4.20.1"
+  VERSION = "4.21.0"
   ::Version=VERSION
 end

data/spec/command/groups_spec.rb

@@ -30,47 +30,47 @@ describe Conjur::Command::Groups, logged_in: true do
 
   describe_command "group:members:add group user:alice" do
     it "adds the role to the group" do
-           expect(RestClient::Request).to receive(:execute).with(
+      expect(RestClient::Request).to receive(:execute).with({
         method: :put,
         url: "https://authz.example.com/the-account/roles/group/group/?members&member=user:alice",
         headers: {},
         payload: nil
-      )
+      }.merge(cert_store_options))
       invoke
     end
   end
 
   describe_command "group:members:add -a group user:alice" do
     it "adds the role to the group with admin option" do
-       expect(RestClient::Request).to receive(:execute).with(
+      expect(RestClient::Request).to receive(:execute).with({
         method: :put,
         url: "https://authz.example.com/the-account/roles/group/group/?members&member=user:alice",
         headers: {},
         payload: { admin_option: true }
-      )
+      }.merge(cert_store_options))
       invoke
     end
   end
   describe_command "group:members:add -a group alice" do
     it "assumes that a nake member name is a user" do
-           expect(RestClient::Request).to receive(:execute).with(
+     expect(RestClient::Request).to receive(:execute).with({
         method: :put,
         url: "https://authz.example.com/the-account/roles/group/group/?members&member=user:alice",
         headers: {},
         payload: { admin_option: true }
-      )
+      }.merge(cert_store_options))
       invoke
     end
   end
 
   describe_command "group:members:add -r group alice" do
     it "revokes the admin rights" do
-       expect(RestClient::Request).to receive(:execute).with(
+       expect(RestClient::Request).to receive(:execute).with({
         method: :put,
         url: "https://authz.example.com/the-account/roles/group/group/?members&member=user:alice",
         headers: {},
         payload: { admin_option: false }
-      )
+       }.merge(cert_store_options))
       invoke
     end
   end

data/spec/command/hosts_spec.rb

@@ -5,24 +5,24 @@ describe Conjur::Command::Hosts, logged_in: true do
   
   describe_command "host:create" do
     it "lets the server assign the id" do
-     expect(RestClient::Request).to receive(:execute).with(
+     expect(RestClient::Request).to receive(:execute).with({
         method: :post,
         url: collection_url,
         headers: {},
         payload: {}
-      ).and_return(post_response('assigned-id'))
+        }.merge(cert_store_options)).and_return(post_response('assigned-id'))
 
       expect { invoke }.to write({ id: 'assigned-id' }).to(:stdout)
     end
   end
   describe_command "host:create the-id" do
     it "propagates the user-assigned id" do
-     expect(RestClient::Request).to receive(:execute).with(
+     expect(RestClient::Request).to receive(:execute).with({
         method: :post,
         url: collection_url,
         headers: {},
         payload: { id: 'the-id' }
-      ).and_return(post_response('the-id'))
+      }.merge(cert_store_options)).and_return(post_response('the-id'))
 
       expect { invoke }.to write({ id: 'the-id' }).to(:stdout)
     end

data/spec/command/init_spec.rb

@@ -44,7 +44,7 @@ describe Conjur::Command::Init do
     it "returns the right certificate from github" do
       fingerprint, certificate = Conjur::Command::Init.get_certificate('github.com:443')
       expect(fingerprint).to eq(GITHUB_FP)
-      expect(certificate.strip).to eq(GITHUB_CERT.strip)
+      expect(certificate.strip).to include(GITHUB_CERT.strip)
     end
   end
 

data/spec/command/users_spec.rb

@@ -57,14 +57,14 @@ describe Conjur::Command::Users, logged_in: true do
   
   context "updating password" do
     before do
-     expect(RestClient::Request).to receive(:execute).with(
+     expect(RestClient::Request).to receive(:execute).with({
         method: :put,
         url: update_password_url,
         user: username, 
         password: api_key,
         headers: { },
         payload: "new-password"
-      )
+       }.merge(cert_store_options))
     end
     
     describe_command "user:update_password -p new-password" do

data/spec/command/variables_spec.rb

@@ -9,12 +9,12 @@ describe Conjur::Command::Variables, logged_in: true do
   describe_command "variable:create -m text/json -k password" do
     let(:id) { 'assigned-id' }
     it "lets the server assign the id" do
-     expect(RestClient::Request).to receive(:execute).with(
+     expect(RestClient::Request).to receive(:execute).with({
         method: :post,
         url: collection_url,
         headers: {},
         payload: base_payload
-      ).and_return(variable)
+      }.merge(cert_store_options)).and_return(variable)
 
       expect { invoke }.to write({ id: 'assigned-id' }).to(:stdout)
     end
@@ -22,12 +22,12 @@ describe Conjur::Command::Variables, logged_in: true do
 
   describe_command "variable:create -m text/json -k password the-id" do
     it "propagates the user-assigned id" do
-     expect(RestClient::Request).to receive(:execute).with(
+     expect(RestClient::Request).to receive(:execute).with({
         method: :post,
         url: collection_url,
         headers: {},
         payload: base_payload.merge({ id: 'the-id' })
-      ).and_return(variable)
+      }.merge(cert_store_options)).and_return(variable)
 
       expect { invoke }.to write({ id: 'the-id' }).to(:stdout)
     end
@@ -35,12 +35,12 @@ describe Conjur::Command::Variables, logged_in: true do
 
   describe_command "variable:create -m text/json -k password the-id the-value" do
     it "propagates the user-assigned id and value" do
-     expect(RestClient::Request).to receive(:execute).with(
+     expect(RestClient::Request).to receive(:execute).with({
         method: :post,
         url: collection_url,
         headers: {},
         payload: base_payload.merge({ id: 'the-id', value: 'the-value' })
-      ).and_return(variable)
+      }.merge(cert_store_options)).and_return(variable)
 
       expect { invoke }.to write({ id: 'the-id' }).to(:stdout)
     end
@@ -60,12 +60,12 @@ describe Conjur::Command::Variables, logged_in: true do
   
   describe_command "variable:create" do
     it "provides default values for optional parameters mime_type and kind" do
-      expect(RestClient::Request).to receive(:execute).with(
+      expect(RestClient::Request).to receive(:execute).with({
         method: :post,
         url: collection_url,
         headers: {},
         payload: { mime_type: 'text/plain', kind: 'secret'}
-        ).and_return(variable)
+      }.merge(cert_store_options)).and_return(variable)
       expect { invoke }.to write # invoke_silently
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjur-cli
 version: !ruby/object:Gem::Version
-  version: 4.20.1
+  version: 4.21.0
 platform: ruby
 authors:
 - Rafal Rzepecki
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-17 00:00:00.000000000 Z
+date: 2015-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.13.0
+        version: '4.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.13.0
+        version: '4.14'
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -109,6 +109,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: xdg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cas_rest_client
   requirement: !ruby/object:Gem::Requirement