conjur-cli 4.12.0 → 4.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4340c1ab3fdec7c2cb49b4fa1ec442298df85a50
-  data.tar.gz: 4acef5138095751da921eba71e2a13780fddd9d6
+  metadata.gz: 8e1f0f7628065a0ce442b2265afe5f31ead8eaca
+  data.tar.gz: 7779ade9cf9b10d8814e127d2e696a24fb5d6606
 SHA512:
-  metadata.gz: 9d52290d6b3fb8a86df68d8bbc2faff5bd24e4b382f570096b74fe1d24b724592abb724df3e580448f52f93edf0376be8167e3b6fc4ff0b6c4daa45c90af959a
-  data.tar.gz: 70fa8e0a22fe5cc93eb51b08b07b0e8ee875b8336c6e4e06fa9fa5d66e2bae27345c50005e947c814fe6d2139448f76467b93bbfc20547201b5f499c9988cc79
+  metadata.gz: 4caf67febf27ac99ccbb1183a5371f04c6c768b643172f78bef981917762da18d5cbc519b92675b54f1acb0af867e75fde053f4747d4a397a6f7730e4a47cbe8
+  data.tar.gz: 0efb81a0af8cdb3ec276a980507003a0785cdffc04b483f360f208dbb6971064fb53115d3b23a89b33368f979a29ceafad12d4764794145041612f2f5e69c826

data/conjur.gemspec

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

data/lib/conjur/command/users.rb

@@ -43,13 +43,20 @@ class Conjur::Command::Users < Conjur::Command
       c.desc "Prompt for a password for the user (default: --no-password)"
       c.switch [:p,:password]
 
+      c.desc "UID number to be associated with user (optional)"
+      c.flag [:uidnumber]
+
       acting_as_option(c)
 
       c.action do |global_options,options,args|
         login = require_arg(args, 'login')
 
-        opts = options.slice(:ownerid)
-        
+        opts = options.slice(:ownerid,:uidnumber)
+        if opts[:uidnumber] 
+          raise "Uidnumber should be integer" unless /\d+/ =~ opts[:uidnumber]
+          opts[:uidnumber]=opts[:uidnumber].to_i
+        end
+
         if options[:p]
           opts[:password] = prompt_for_password
         end
@@ -88,6 +95,32 @@ class Conjur::Command::Users < Conjur::Command
         Conjur::API.update_password username, password, new_password
       end
     end
+
+    user.desc "Update user's attributes (only uidnumber supported now)"
+    user.arg_name "login" 
+    user.command :update do |c|
+      c.desc "UID number to be associated with user"
+      c.flag [:uidnumber]
+      c.action do |global_options, options, args|
+        login=require_arg(args,'login')
+        raise "Uidnumber should be integer" unless /\d+/ =~ options[:uidnumber]
+        options[:uidnumber]=options[:uidnumber].to_i
+        api.user(login).update(options)
+        puts "UID set" 
+      end
+    end
+
+    user.desc "Find the user by UID" 
+    user.arg_name "uid" 
+    user.command :uidsearch do |c| 
+      c.action do |global_options, options, args| 
+        uidnumber = require_arg(args,'uid')
+        raise "Uidnumber should be integer" unless /\d+/ =~ uidnumber
+        uidnumber=uidnumber.to_i
+        display api.find_users(uidnumber: uidnumber)
+      end
+    end
+
   end
 
 end

data/lib/conjur/config.rb

@@ -29,14 +29,25 @@ module Conjur
       def clear
         @@attributes = {}
       end
-      
-      def default_config_files
-        [ File.join("/etc", "conjur.conf"), ( ENV['CONJURRC'] || [ File.expand_path("~/.conjurrc"), '.conjurrc'] ) ].flatten.tap do |f| 
-          if f.include?'.conjurrc' and File.file?('.conjurrc') and not ENV['CONJURRC']=='.conjurrc'
-            $stderr.puts "WARNING: .conjurrc file from current directory is used. This behaviour is deprecated. Use ENV['CONJURRC'] to explicitly define custom configuration file if needed"
+
+      def user_config_files
+        if ENV['CONJURRC']
+          return ENV['CONJURRC']
+        else
+          homefile = File.expand_path "~/.conjurrc"
+          pwdfile = File.expand_path ".conjurrc"
+          if homefile != pwdfile && File.file?(pwdfile)
+            $stderr.puts "WARNING: .conjurrc file from current directory is " +
+                "used. This behaviour is deprecated. Use ENV['CONJURRC'] to " +
+                "explicitly define custom configuration file if needed"
           end
+          [ homefile, pwdfile ]
         end
       end
+
+      def default_config_files
+        ['/etc/conjur.conf', user_config_files].flatten
+      end
       
       def load(config_files = default_config_files)
         require 'yaml'
@@ -73,8 +84,12 @@ module Conjur
         end
   
         if Conjur.log
-          require 'conjur/api'
-          Conjur.log << "Using authn host #{Conjur::Authn::API.host}\n"
+          begin
+            require 'conjur/api'
+            Conjur.log << "Using authn host #{Conjur::Authn::API.host}\n"
+          rescue RuntimeError
+            raise $! unless $!.message == "Missing required option account"
+          end
         end
         if Config[:cert_file]
           OpenSSL::SSL::SSLContext::DEFAULT_CERT_STORE.add_file Config[:cert_file]

data/lib/conjur/dsl/runner.rb

@@ -12,11 +12,14 @@ module Conjur
       
       def initialize(script, filename = nil)
         @context = {
-          "env" => Conjur.env,
-          "stack" => Conjur.stack,
           "account" => Conjur.account,
           "api_keys" => {}
         }
+        
+        @context['env'] = Conjur.env unless Conjur.env == 'production'
+        @context['stack'] = Conjur.stack unless Conjur.stack == 'v4'
+        @context['appliance_url'] = Conjur.configuration.appliance_url unless Conjur.configuration.appliance_url.nil?
+
         @script = script
         @filename = filename
         @api = nil

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

data/spec/command/users_spec.rb

@@ -25,6 +25,33 @@ describe Conjur::Command::Users, logged_in: true do
           invoke
         end
       end
+      describe_command "#{cmd} --uidnumber 12345 the-user" do
+        it "Creates a user with specified uidnumber" do
+          Conjur::API.any_instance.should_receive(:create_user).with("the-user", { uidnumber: 12345 }).and_return new_user
+          invoke
+        end
+      end
+    end
+  end
+
+  context "updating UID number" do  
+    describe_command "user update --uidnumber 12345 the-user" do
+      it "updates the uidnumber" do
+        stub_user = double()
+        Conjur::API.any_instance.should_receive(:user).with("the-user").and_return stub_user
+        stub_user.should_receive(:update).with(uidnumber: 12345).and_return ""
+        expect { invoke }.to write "UID set"
+      end
+    end
+  end
+
+  context "lookup per UID" do
+    let(:search_result) { {id: "the-user"} }
+    describe_command "user uidsearch 12345" do
+      it "finds user" do
+        Conjur::API.any_instance.should_receive(:find_users).with(uidnumber: 12345).and_return search_result
+        expect { invoke }.to write(JSON.pretty_generate(search_result))
+      end
     end
   end
   
@@ -54,4 +81,4 @@ describe Conjur::Command::Users, logged_in: true do
       end
     end
   end
-end
+end

data/spec/config_spec.rb

@@ -3,20 +3,26 @@ require 'conjur/config'
 require 'conjur/command/rspec/output_matchers'
 
 describe Conjur::Config do
-  after {
-    Conjur::Config.clear
-  }
+  include_context "fresh config"
 
   describe ".default_config_files" do
     subject { Conjur::Config.default_config_files }
+    let(:homedir) { '/home/isfake' }
     around do |example|
       realhome = ENV.delete 'HOME'
-      ENV['HOME'] = '/home/isfake'
+      ENV['HOME'] = homedir
       example.run
       ENV['HOME'] = realhome
     end
 
     let(:deprecation_warning) { "WARNING: .conjurrc file from current directory is used. This behaviour is deprecated. Use ENV['CONJURRC'] to explicitly define custom configuration file if needed" }
+
+    shared_examples "no deprecation warning" do
+      it "does not issue a deprecation warning" do
+        expect { subject }.to_not write(deprecation_warning).to(:stderr)
+      end
+    end
+
     context "when CONJURRC is not set" do
       around do |example|
         oldrc = ENV.delete 'CONJURRC'
@@ -25,19 +31,34 @@ describe Conjur::Config do
       end
 
       it { should include('/etc/conjur.conf') }
-      it { should include('/home/isfake/.conjurrc') }
+      it { should include("#{homedir}/.conjurrc") }
       it { should include('.conjurrc') }
+
+      before do
+        File.stub(:expand_path).and_call_original
+        File.stub(:expand_path).with('.conjurrc').and_return '.conjurrc'
+      end
+
       context "When .conjurrc is present" do
         before { File.stub(:file?).with('.conjurrc').and_return true }
         it "Issues a deprecation warning" do 
           expect { subject }.to write(deprecation_warning).to(:stderr)
         end
-      end 
+
+        context "but the current directory is home" do
+          before do
+            File.unstub(:expand_path)
+            File.stub(:expand_path).and_call_original
+            File.stub(:expand_path).with('.conjurrc').and_return("#{homedir}/.conjurrc")
+          end
+
+          include_examples "no deprecation warning"
+        end
+      end
+
       context "When .conjurrc is missing" do
         before { File.stub(:file?).with('.conjurrc').and_return false }
-        it "Does not issue a deprecation warning" do 
-          expect { subject }.to_not write(deprecation_warning).to(:stderr)
-        end
+        include_examples "no deprecation warning"
       end
     end
 
@@ -50,11 +71,10 @@ describe Conjur::Config do
       end
       it { should include('/etc/conjur.conf') }
       it { should include('stub_conjurrc') }
-      it { should_not include('/home/isfake/.conjurrc') }
+      it { should_not include("#{homedir}/.conjurrc") }
       it { should_not include('.conjurrc') }
-      it "Does not issue a deprecation warning" do
-        expect { subject }.to_not write(deprecation_warning).to(:stderr)
-      end
+
+      include_examples "no deprecation warning"
     end
 
     context "when CONJURRC is set to .conjurrc" do
@@ -67,10 +87,9 @@ describe Conjur::Config do
       before { File.stub(:file?).with('.conjurrc').and_return true }
       it { should include('/etc/conjur.conf') }
       it { should include('.conjurrc') }
-      it { should_not include('/home/isfake/.conjurrc') }
-      it "Does not issue a deprecation warning" do
-        expect { subject }.to_not write(deprecation_warning).to(:stderr)
-      end
+      it { should_not include("#{homedir}/.conjurrc") }
+
+      include_examples "no deprecation warning"
     end
   end
 

data/spec/dsl/runner_spec.rb

@@ -2,6 +2,8 @@ require 'spec_helper'
 require 'conjur/dsl/runner'
 
 describe Conjur::DSL::Runner, logged_in: true do
+  include_context "fresh config"
+
   let(:filename) { nil }
   let(:runner) { Conjur::DSL::Runner.new script, filename }
   let(:script) { "user 'alice'" }
@@ -31,4 +33,36 @@ describe Conjur::DSL::Runner, logged_in: true do
       "the-account:user:alice" => "the-api-key"
     }
   end
-end
+
+  it "doesn't store default env and stack in context" do
+    expect(runner.context).to_not have_key 'env'
+    expect(runner.context).to_not have_key 'stack'
+  end
+
+  context "with non-default stack and env" do
+    let(:runner) do
+      Conjur::Config.merge env: 'baz', stack: 'bar'
+      Conjur::Config.apply
+      Conjur::DSL::Runner.new '', nil
+    end
+
+    it "stores them in context" do
+      expect(runner.context['env']).to eq 'baz'
+      expect(runner.context['stack']).to eq 'bar'
+    end
+  end
+
+  context "with appliance url" do
+    let(:appliance_url) { "https://conjur.example.com/api" }
+    let(:runner) do
+      Conjur::Config.merge appliance_url: appliance_url
+      Conjur::Config.apply
+      
+      Conjur::DSL::Runner.new '', nil
+    end
+
+    it "stores appliance url in the context" do
+      expect(runner.context['appliance_url']).to eq appliance_url
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -29,3 +29,18 @@ require 'conjur/command/rspec/helpers'
 ENV['CONJURRC'] = '/dev/null'
 
 require 'conjur/cli'
+
+shared_context "fresh config" do
+  before {
+    ENV.delete_if do |k,v|
+      k =~ /^CONJUR_/
+    end
+    
+    @configuration = Conjur.configuration
+    Conjur.configuration = Conjur::Configuration.new
+  }
+  after {
+    Conjur::Config.clear
+    Conjur.configuration = @configuration
+  }
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjur-cli
 version: !ruby/object:Gem::Version
-  version: 4.12.0
+  version: 4.13.1
 platform: ruby
 authors:
 - Rafał Rzepecki
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-05 00:00:00.000000000 Z
+date: 2014-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 4.9.2
+        version: 4.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 4.9.2
+        version: 4.10.0
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement