conjur-cli 4.7.0 → 4.7.1

data/Gemfile

@@ -12,5 +12,5 @@ group :development do
   gem 'conjur-asset-environment-api'
   gem 'conjur-asset-key-pair-api'
   gem 'conjur-asset-layer-api'
-#  gem 'conjur-asset-ui-api', github: 'conjurinc/conjur-asset-ui', branch: 'new-audit'
+  gem 'conjur-asset-ui-api', git: 'git@github.com:conjurinc/conjur-asset-ui', branch: 'new-audit'
 end

data/conjur.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Conjur::VERSION
   
-  gem.add_dependency 'conjur-api', '>=4.0'
+  gem.add_dependency 'conjur-api', '>=4.7.2'
   gem.add_dependency 'gli', '>=2.8.0'
   gem.add_dependency 'highline'
   gem.add_dependency 'netrc'

data/features/dsl_user_create.feature

@@ -10,14 +10,14 @@ namespace do
   user "bob"
 end
     """
-    Then the model should contain "user" "bob"
+    Then the model should contain "user" /^bob@/
 
   Scenario: Namespace can be used as a no-arg method
     When I run script:
     """
 namespace "foobar" do
-  user "#{namespace}-bob"
+  user "bob"
 end
     """
-    Then the model should contain "user" "foobar-bob"
+    Then the model should contain "user" "bob@foobar"
     

data/lib/conjur/command/audit.rb

@@ -29,10 +29,10 @@ class Conjur::Command
         if e[:resource] && e[:resource].kind_of?(Hash)
           e[:resource] = e[:resource]['id']
         end
-        s = "[#{Time.at(e[:timestamp])}] "
+        s = "[#{Time.parse(e[:timestamp])}] "
         s << " #{e[:conjur_user]}"
         s << " (as #{e[:conjur_role]})" if e[:conjur_role] != e[:conjur_user]
-        formatter = SHORT_FORMATS["#{e[:asset]}:#{e[:action]}"]
+        formatter = SHORT_FORMATS["#{e[:kind]}:#{e[:action]}"]
         if formatter
           s << " " << formatter.call(e)
         else
@@ -62,11 +62,11 @@ class Conjur::Command
       end
       
       def show_audit_events events, options
-        events.reverse!
+        events = [events] unless events.kind_of?(Array)
         if options[:short]
-          events.each{|e| puts short_event_format(e)}
+          events.map(&:to_h).each{|e| puts short_event_format(e)}
         else
-          puts JSON.pretty_generate(events)
+          events.map(&:to_h).each{|e| puts JSON.pretty_generate(e) }
         end
       end
 
@@ -85,38 +85,30 @@ class Conjur::Command
           c.switch [:f, :follow]
           
           c.action do |global_options, options, args|
-            options = extract_audit_options options
-            if options[:follow]
-              Conjur::Audit::Follower.new do |merge_options|
-                instance_exec(args, options.merge(merge_options), &block)
-              end.follow do |events|
-                show_audit_events events, options
-              end
-            else
-              show_audit_events instance_exec(args, options, &block), options
-            end
+            options = extract_audit_options options 
+            instance_exec(args, options, &block)
           end
         end
       end
     end
 
+    desc "Show all audit events visible to the current user"
+    audit_feed_command :all do |args, options|
+      api.audit(options){ |es| show_audit_events es, options }
+    end
     
     desc "Show audit events related to a role"
-    arg_name 'role?'
+    arg_name 'role'
     audit_feed_command :role do |args, options|
-      if id = args.shift 
-        method_name, method_args = :audit_role, [full_resource_id(id), options]
-      else
-        method_name, method_args = :audit_current_role, [options]
-      end
-      api.send method_name, *method_args
+      id = full_resource_id(require_arg(args, "role"))
+      api.audit_role(id, options){ |es| show_audit_events es, options }
     end
     
     desc "Show audit events related to a resource"
     arg_name 'resource'
     audit_feed_command :resource do |args, options|
       id = full_resource_id(require_arg args, "resource")
-      api.audit_resource id, options
+      api.audit_resource(id, options){|es| show_audit_events es, options} 
     end
   end
 end

data/lib/conjur/command/init.rb

@@ -56,20 +56,30 @@ class Conjur::Command::Init < Conjur::Command
     c.action do |global_options,options,args|
       hl = HighLine.new $stdin, $stderr
 
-      account = options[:account] || hl.ask("Enter your account name: ")
-      hostname = options[:hostname] || hl.ask("Enter the hostname of your Conjur endpoint: ")
+      # using .to_s to overcome https://github.com/JEG2/highline/issues/69
+      account = options[:account] || hl.ask("Enter your account name: ").to_s
+      hostname = options[:hostname] || hl.ask("Enter the hostname (and optional port) of your Conjur endpoint: ").to_s
       
       if (certificate = options[:certificate]).blank?
         unless hostname.blank?
-          certificate = `echo | openssl s_client -connect #{hostname}:443  2>/dev/null | openssl x509 -fingerprint`
+          connect_hostname = if hostname.include?(':')
+            hostname
+          else
+            hostname + ':443'
+          end
+          certificate = \
+            `echo | openssl s_client -connect #{connect_hostname}  2>/dev/null | openssl x509 -fingerprint`
           exit_now! "Unable to retrieve certificate from #{hostname}" if certificate.blank?
           
           lines = certificate.split("\n")
           fingerprint = lines[0]
           certificate = lines[1..-1].join("\n")
-          
+
+          puts
           puts fingerprint
 
+          puts "\nPlease verify this certificate on the appliance using command:
+                openssl x509 -fingerprint -noout -in ~conjur/etc/ssl/conjur.pem\n\n"
           exit_now! unless hl.ask("Trust this certificate (yes/no): ").strip == "yes"
         end
       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.7.0"
+  VERSION = "4.7.1"
   ::Version=VERSION
 end

data/spec/command/audit_spec.rb

@@ -5,7 +5,7 @@ describe Conjur::Command::Audit, logged_in: true do
 
   def expect_api_call method, *args
     api.should_receive(method.to_sym).with(*args).and_return events
-    described_class.should_receive(:show_audit_events).with(events, an_instance_of(Hash))
+    #described_class.should_receive(:show_audit_events).with(events, an_instance_of(Hash))
   end
 
   def invoke_expecting_api_call method, *args
@@ -28,7 +28,6 @@ describe Conjur::Command::Audit, logged_in: true do
 
   def self.it_calls_the_api command, api_method, *api_args, &block
     describe_command_success command, api_method, *api_args, &block
-    accepts_pagination_params command, api_method, *api_args, &block
   end
 
 
@@ -43,27 +42,7 @@ describe Conjur::Command::Audit, logged_in: true do
     end
   end
 
-  def self.accepts_pagination_params cmd, api_method, *api_method_args, &block
-    context "with valid pagination options" do
-      expected_opts   = {limit: 12, offset: 2}
-      api_method_args = case api_method_args.last
-      when Hash
-        api_method_args[0..-2] << api_method_args.last.merge(expected_opts)
-      else
-        api_method_args.dup << expected_opts
-      end
-      describe_command_success cmd + " --limit 12 --offset 2", api_method, *api_method_args, &block
-    end
-    context "with garbage pagination options" do
-      it_fails cmd + " --limit hiythere", RuntimeError, /expected an integer for limit/i
-      it_fails cmd + " --offset hiythere", RuntimeError, /expected an integer for offset/i
-    end
-  end
-
   describe "audit:role" do
-    context "without an argument" do
-      it_calls_the_api "audit:role", :audit_current_role, {}
-    end
     context "with an argument" do
       context "of a full id" do
         it_calls_the_api "audit:role foo:bar:baz", :audit_role, 'foo:bar:baz', {}
@@ -97,4 +76,8 @@ describe Conjur::Command::Audit, logged_in: true do
       end
     end
   end
+  
+  describe "audit:all" do
+    it_calls_the_api "audit:all", :audit, {}
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjur-cli
 version: !ruby/object:Gem::Version
-  version: 4.7.0
+  version: 4.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-14 00:00:00.000000000 Z
+date: 2014-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: conjur-api
@@ -19,7 +19,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.7.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.7.2
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -218,7 +218,6 @@ files:
 - .gitignore
 - .kateproject
 - .project
-- .tamr.rb.swp
 - Gemfile
 - LICENSE
 - README.md
@@ -301,7 +300,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1938562320841533221
+      hash: 2027099206837494229
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -310,7 +309,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1938562320841533221
+      hash: 2027099206837494229
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25