conjur-cli 4.21.0 → 4.21.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c37f9ccccef777e9cc90ab9dd9d83c167f59e8f
-  data.tar.gz: 00970eef162d3ff5f69b09bff7196234e61dfe97
+  metadata.gz: 42c5699c45672978a67be3e037c53b212fb232d3
+  data.tar.gz: 4288dda53317d3fe79ea7d255d12cf21681a2abf
 SHA512:
-  metadata.gz: 538be1cde61f32cfe2db688d7bb399a9f44e85ca6e75ea1327e2a15cb1a1eade78a0265512b89a53fa2b9ef333828bc471c48ca18a23228fbe817d23abd8c4d9
-  data.tar.gz: bd3c351d0493ff5a2bbccbd5b510a76c4f28b3c3225da8c62de87f34b287ec332f7c43622be241fbdc6cf71e942e6d8408b64afacefd644f2785a465efb1781f
+  metadata.gz: 48ef1a3766bcabca227c830c2801ded50ba83870e53d01e559a663fea813d078c42cb69c1316a227b000db10790ce8a2f91d1d31b98cf67002a83211e23d0e80
+  data.tar.gz: 43c0a98e20cc612567e74929856428dd7004615d5f33fb5c2176d7c0328fd6827c5ac87f4997be839f2f566593908deafdc8ccb898de4889bf2ba419633b3a7a

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 4.21.1
+
+* Configure trust to the new certificate in `conjur init`, before attempting to contact the Conjur server
+
 # 4.21.0
 
 * Use user cache dir for mimetype cache

data/lib/conjur/command/bootstrap.rb

@@ -53,12 +53,12 @@ class Conjur::Command::Bootstrap < Conjur::Command
         puts "Adminship granted"
       end
       
-    if (attic = api.user("attic")).exists?
-      puts "User 'attic' exists"
-    else
-      puts "Creating user 'attic'"
-      attic = api.create_user("attic")
-    end
+      if (attic = api.user("attic")).exists?
+        puts "User 'attic' exists"
+      else
+        puts "Creating user 'attic'"
+        attic = api.create_user("attic")
+      end
     end
   end
 end

data/lib/conjur/command/init.rb

@@ -61,14 +61,6 @@ class Conjur::Command::Init < Conjur::Command
         Conjur.configuration.core_url = "https://#{hostname}/api"
       end
 
-      account = options[:account]
-      account ||= if hostname
-        account = Conjur::Core::API.info['account'] or raise "Expecting 'account' in Core info"
-      else
-        # using .to_s to overcome https://github.com/JEG2/highline/issues/69
-        highline.ask("Enter your organization account name: ").to_s
-      end
-
       if (certificate = options[:certificate]).blank?
         unless hostname.blank?
           connect_hostname = if hostname.include?(':')
@@ -86,6 +78,16 @@ class Conjur::Command::Init < Conjur::Command
           exit_now! "You decided not to trust the certificate" unless highline.ask("Trust this certificate (yes/no): ").strip == "yes"
         end
       end
+      
+      configure_cert_store certificate
+      
+      account = options[:account]
+      account ||= if hostname
+        account = Conjur::Core::API.info['account'] or raise "Expecting 'account' in Core info"
+      else
+        # using .to_s to overcome https://github.com/JEG2/highline/issues/69
+        highline.ask("Enter your organization account name: ").to_s
+      end
 
       exit_now! "account is required" if account.blank?
 
@@ -120,7 +122,15 @@ class Conjur::Command::Init < Conjur::Command
       puts "Wrote configuration to #{config_file}"
     end
   end
-
+  
+  def self.configure_cert_store certificate
+    unless certificate.blank?
+      cert_file = Tempfile.new("conjur_cert")
+      File.write cert_file.path, certificate
+      OpenSSL::SSL::SSLContext::DEFAULT_CERT_STORE.add_file cert_file.path
+    end
+  end
+  
   def self.get_certificate connect_hostname
     include OpenSSL::SSL
     host, port = connect_hostname.split ':'

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.21.0"
+  VERSION = "4.21.1"
   ::Version=VERSION
 end

data/spec/command/init_spec.rb

@@ -83,25 +83,10 @@ describe Conjur::Command::Init do
       end
     end
 
-    # KEG: These tests have a nasty habit of hanging
-#    describe_command 'init -a the-account -h google.com' do
-#      it "writes the config and cert" do
-#        HighLine.any_instance.stub(:ask).and_return "yes"
-#        File.should_receive(:open).twice
-#        invoke
-#      end
-#    end
-#    describe_command 'init -a the-account -h https://google.com' do
-#      it "writes the config and cert" do
-#        HighLine.any_instance.stub(:ask).and_return "yes"
-#        File.should_receive(:open).twice
-#        invoke
-#      end
-#    end
-
     describe_command 'init -a the-account -h localhost -c the-cert' do
       it "writes config and cert files" do
         expect(File).to receive(:open).twice
+        expect(Conjur::Command::Init).to receive(:configure_cert_store).with "the-cert"
         invoke
       end
     end

data/spec/spec_helper.rb

@@ -29,6 +29,7 @@ require 'conjur/command/rspec/helpers'
 ENV['CONJURRC'] = '/dev/null'
 
 require 'conjur/cli'
+require 'conjur/api'
 
 shared_context "fresh config" do
   before {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjur-cli
 version: !ruby/object:Gem::Version
-  version: 4.21.0
+  version: 4.21.1
 platform: ruby
 authors:
 - Rafal Rzepecki
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-07 00:00:00.000000000 Z
+date: 2015-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport