conjur-cli 2.1.6 → 2.1.7

data/lib/conjur/authn.rb

@@ -9,6 +9,10 @@ module Conjur::Authn
       get_credentials(options)
     end
     
+    def authenticate(options = {})
+      Conjur::API.authenticate(*get_credentials(options))
+    end
+    
     def delete_credentials
       netrc.delete host
       netrc.save

data/lib/conjur/command/authn.rb

@@ -29,6 +29,22 @@ DESC
     end
   end
   
+  desc "Obtains an authentication token using the current logged-in user"
+  command :authenticate do |c|
+    c.arg_name 'header'
+    c.desc "Base64 encode the result and format as an HTTP Authorization header"
+    c.switch [:H,:header]
+
+    c.action do |global_options,options,args|
+      token = Conjur::Authn.authenticate(options)
+      if options[:header]
+        puts "Authorization: Token token=\"#{Base64.strict_encode64(token.to_json)}\""
+      else
+        puts token
+      end
+    end
+  end
+  
   desc "Logs out"
   command :logout do |c|
     c.action do

data/lib/conjur/command/resources.rb

@@ -62,6 +62,19 @@ class Conjur::Command::Resources < Conjur::Command
       api.resource([ Conjur.account, kind, id ].join(':')).deny privilege, role
     end
   end
+  
+  desc "Check whether a role has a privilege on a resource"
+  arg_name "kind resource-id role privilege"
+  command :check do |c|
+    c.action do |global_options,options,args|
+      kind = args.shift or raise "Missing parameter: resource-kind"
+      resource_id = args.shift or raise "Missing parameter: resource-id"
+      role = args.shift or raise "Missing parameter: role"
+      privilege = args.shift or raise "Missing parameter: privilege"
+      role = api.role(role)
+      puts role.permitted? kind, resource_id, privilege
+    end
+  end
 
   desc "Grant ownership on a resource to a new owner"
   arg_name "kind resource-id owner"

data/lib/conjur/version.rb

@@ -1,3 +1,3 @@
 module Conjur
-  VERSION = "2.1.6"
+  VERSION = "2.1.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjur-cli
 version: !ruby/object:Gem::Version
-  version: 2.1.6
+  version: 2.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-17 00:00:00.000000000 Z
+date: 2013-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: conjur-api
@@ -152,7 +152,6 @@ files:
 - lib/conjur/command/field.rb
 - lib/conjur/command/groups.rb
 - lib/conjur/command/hosts.rb
-- lib/conjur/command/permissions.rb
 - lib/conjur/command/resources.rb
 - lib/conjur/command/roles.rb
 - lib/conjur/command/secrets.rb

data/lib/conjur/command/permissions.rb

@@ -1,48 +0,0 @@
-require 'conjur/authn'
-require 'conjur/command'
-
-class Conjur::Command::Resources < Conjur::Command
-  self.prefix = :permission
-  
-  desc "Grants permission on a resource to a role"
-  arg_name "resource-kind"
-  arg_name "resource-id"
-  arg_name "role"
-  arg_name "privilege"
-  command :grant do |c|
-    c.desc "Whether to give the grant option"
-    c.switch :grant
-    
-    c.action do |global_options,options,args|
-      kind = args.shift or raise "Missing parameter: resource-kind"
-      resource_id = args.shift or raise "Missing parameter: resource-id"
-      role = args.shift or raise "Missing parameter: role"
-      privilege = args.shift or raise "Missing parameter: privilege"
-      resource = api.resource(kind, resource_id)
-      options = {}
-      options[:grant_option] = true if options[:grant]
-      resource.permit privilege, role, options
-    end
-  end
-  
-  desc "Check whether a role has a privilege on a resource"
-  arg_name "resource-kind"
-  arg_name "resource-id"
-  arg_name "role"
-  arg_name "privilege"
-  command :check do |c|
-    c.action do |global_options,options,args|
-      kind = args.shift or raise "Missing parameter: resource-kind"
-      resource_id = args.shift or raise "Missing parameter: resource-id"
-      role = args.shift or raise "Missing parameter: role"
-      privilege = args.shift or raise "Missing parameter: privilege"
-      role = api.role(role)
-      begin
-        role.permitted? kind, resource_id, privilege
-        puts "true"
-      rescue RestClient::ResourceNotFound
-        puts "false"
-      end
-    end
-  end
-end