conjur-cli 4.21.1 → 4.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42c5699c45672978a67be3e037c53b212fb232d3
-  data.tar.gz: 4288dda53317d3fe79ea7d255d12cf21681a2abf
+  metadata.gz: 3327a3212d116f7989090b9a1aed6de2f202b698
+  data.tar.gz: 37954aa133694126b93021e5d57d7d90f8f15927
 SHA512:
-  metadata.gz: 48ef1a3766bcabca227c830c2801ded50ba83870e53d01e559a663fea813d078c42cb69c1316a227b000db10790ce8a2f91d1d31b98cf67002a83211e23d0e80
-  data.tar.gz: 43c0a98e20cc612567e74929856428dd7004615d5f33fb5c2176d7c0328fd6827c5ac87f4997be839f2f566593908deafdc8ccb898de4889bf2ba419633b3a7a
+  metadata.gz: e0855d2122e2af07cf868cb1da21f6e6426c2fa5e7c6f05d9a23528f6d7abcd73458b3d831377153275d0bdd39b65b566f2c8cde8d3a301b938ef20daa989676
+  data.tar.gz: bc1675b9fca3d60bf3ac5dfcb007649a872e370b441a41c4ede7294f5ab5fad1cf92a2adf605c92664d1164b634ba645da0d35c3bc2bebc2919f5d0253bedfbc

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 4.22.0
+
+* New 'plugin' subcommand to manage CLI plugins
+* Configure SSL certificate from Conjur.configuration
+* Print the error message if there's a problem loading a plugin
+
 # 4.21.1
 
 * Configure trust to the new certificate in `conjur init`, before attempting to contact the Conjur server

data/conjur.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
 
 
   gem.add_dependency 'activesupport'
-  gem.add_dependency 'conjur-api', '~> 4.14'
+  gem.add_dependency 'conjur-api', '~> 4.16'
   gem.add_dependency 'gli', '>=2.8.0'
   gem.add_dependency 'highline'
   gem.add_dependency 'netrc', '~> 0.10.2'

data/lib/conjur/cli.rb

@@ -75,8 +75,10 @@ module Conjur
           begin
             filename = "conjur-asset-#{plugin}"
             require filename
-          rescue LoadError
-            warn "Could not load plugin '#{plugin}' specified in your config file.\nMake sure you have the #{filename} gem installed."
+          rescue LoadError => err
+            warn "WARNING: #{err.message}\n" \
+              "Could not load plugin '#{plugin}' specified in your config file.\n"\
+              "Make sure you have the #{filename} gem installed."
           end
         end
       end

data/lib/conjur/command/plugin.rb

@@ -0,0 +1,138 @@
+#
+# Copyright (C) 2015 Conjur Inc
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+require 'rubygems'
+require 'rubygems/commands/install_command'
+require 'rubygems/commands/uninstall_command'
+require 'yaml'
+
+require 'conjur/command'
+
+class Conjur::Command::Plugin < Conjur::Command
+  def self.assert_empty(args)
+    exit_now! 'Received extra command arguments' unless args.empty?
+  end
+
+  desc 'Manage plugins'
+  command :plugin do |cmd|
+    cmd.desc 'List installed plugins'
+    cmd.command :list do |c|
+      c.action do |_, _, args|
+        self.assert_empty(args)
+        Conjur::Config.plugins.each do |p|
+          begin
+            gem = Gem::Specification.find_by_name "conjur-asset-#{p}"
+            puts "#{p} (#{gem.version})"
+          rescue Gem::LoadError
+            nil
+          end
+        end
+      end
+    end
+
+    cmd.desc 'Install a plugin'
+    cmd.arg_name 'name'
+    cmd.command :install do |c|
+      c.arg_name 'version'
+      c.desc 'Version of the plugin to install'
+      c.flag [:v, :version], :default_value => Gem::Requirement.default
+
+      c.action do |_, options, args|
+        install_plugin(require_arg(args, 'name'), options[:version])
+      end
+    end
+
+    cmd.desc 'Uninstall a plugin'
+    cmd.arg_name 'name'
+    cmd.command :uninstall do |c|
+      c.action do |_, _, args|
+        name = require_arg(args, 'name')
+        uninstall_plugin(name)
+      end
+    end
+
+    cmd.desc "Show a plugin's details"
+    cmd.arg_name 'name'
+    cmd.command :show do |c|
+      c.action do |_, _, args|
+        name = require_arg(args, 'name')
+        begin
+          gem = Gem::Specification.find_by_name "conjur-asset-#{name}"
+          puts "Name: #{name}"
+          puts "Description: #{gem.summary}"
+          puts "Gem: #{gem.name}"
+          puts "Version: #{gem.version}"
+        rescue Gem::LoadError
+          puts "Plugin '#{name}' is not installed"
+        end
+      end
+    end
+  end
+end
+
+def install_plugin(name, version)
+  uninstall_plugin(name) rescue Exception
+
+  gem_name = name.start_with?('conjur-asset-') ? name : "conjur-asset-#{name}"
+
+  cmd = Gem::Commands::InstallCommand.new
+  cmd.handle_options ['--no-ri', '--no-rdoc', gem_name, '--version', "#{version}"]
+
+  begin
+    cmd.execute
+  rescue Gem::SystemExitException => e
+    if e.exit_code != 0
+      raise e
+    end
+  end
+
+  modify_plugin_list('add', name)
+end
+
+def uninstall_plugin(name)
+  if Conjur::Config.plugins.include?(name)
+    gem_name = name.start_with?('conjur-asset-') ? name : "conjur-asset-#{name}"
+
+    cmd = Gem::Commands::UninstallCommand.new
+    cmd.handle_options ['-x', '-I', '-a', gem_name]
+    cmd.execute
+
+    modify_plugin_list('remove', name)
+  end
+end
+
+def modify_plugin_list(op, plugin_name)
+  config_exists = false
+  Conjur::Config.default_config_files.each do |f|
+    if File.file?(f)
+      config_exists = true
+      config = YAML.load(IO.read(f)).stringify_keys rescue {}
+
+      config['plugins'] ||= {}
+      config['plugins'] += [plugin_name] if op == 'add'
+      config['plugins'] -= [plugin_name] if op == 'remove'
+      config['plugins'].uniq!
+
+      File.write(f, YAML.dump(config))
+    end
+  end
+  exit_now! 'No Conjur config file found, run "conjur init"' unless config_exists
+end

data/lib/conjur/config.rb

@@ -97,11 +97,11 @@ module Conjur
             raise $!
           end
         end
-        if Config[:cert_file]
-          OpenSSL::SSL::SSLContext::DEFAULT_CERT_STORE.add_file Config[:cert_file]
-        end
+
+        Conjur.config.apply_cert_config!
       end
 
+
       def inspect
         @@attributes.inspect
       end

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

data/spec/command/variables_spec.rb

@@ -45,19 +45,19 @@ describe Conjur::Command::Variables, logged_in: true do
       expect { invoke }.to write({ id: 'the-id' }).to(:stdout)
     end
   end
-  
+
   describe_command "variable:create -v the-value-1 the-id the-value-2" do
     it "complains about conflicting values" do
       expect { invoke }.to raise_error("Received conflicting value arguments")
     end
   end
-  
+
   describe_command "variable:create the-id -v the-value" do
     it "complains about extra arguments" do
       expect { invoke }.to raise_error("Received extra arguments 'the-value'")
     end
   end
-  
+
   describe_command "variable:create" do
     it "provides default values for optional parameters mime_type and kind" do
       expect(RestClient::Request).to receive(:execute).with({

data/spec/config_spec.rb

@@ -107,10 +107,26 @@ describe Conjur::Config do
       expect(Conjur::Config[:cert_file]).to eq(cert_path)
     end
   end
+
   describe "#apply" do
     before { 
       allow(OpenSSL::SSL::SSLContext::DEFAULT_CERT_STORE).to receive(:add_file) 
     }
+
+    context "ssl_certificate string" do
+      let(:ssl_certificate){ 'the certificate' }
+      let(:certificate){ double('Certificate') }
+      before{
+          Conjur::Config.class_variable_set('@@attributes', {'ssl_certificate' => ssl_certificate})
+      }
+
+      it 'trusts the certificate string' do
+        expect(OpenSSL::X509::Certificate).to receive(:new).with(ssl_certificate).once.and_return certificate
+        expect(OpenSSL::SSL::SSLContext::DEFAULT_CERT_STORE).to receive(:add_cert).with(certificate).once
+        Conjur::Config.apply
+      end
+    end
+
     context "cert_file" do
       let(:cert_file) { "/path/to/cert.pem" }
       before { 
@@ -121,6 +137,7 @@ describe Conjur::Config do
         expect(OpenSSL::SSL::SSLContext::DEFAULT_CERT_STORE).to receive(:add_file).with cert_file  
         Conjur::Config.apply
       end
+
       it "propagates the cert_file to Configuration.cert_file" do
         Conjur::Config.apply
         expect(Conjur.configuration.cert_file).to eq(cert_file)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjur-cli
 version: !ruby/object:Gem::Version
-  version: 4.21.1
+  version: 4.22.0
 platform: ruby
 authors:
 - Rafal Rzepecki
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-13 00:00:00.000000000 Z
+date: 2015-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.14'
+        version: '4.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.14'
+        version: '4.16'
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -313,6 +313,7 @@ files:
 - lib/conjur/command/ids.rb
 - lib/conjur/command/init.rb
 - lib/conjur/command/layers.rb
+- lib/conjur/command/plugin.rb
 - lib/conjur/command/policy.rb
 - lib/conjur/command/pubkeys.rb
 - lib/conjur/command/resources.rb