conjur-cli 2.6.0 → 4.1.0

data/Gemfile

@@ -4,4 +4,4 @@ source 'https://rubygems.org'
 gemspec
 
 # when developing in parallel, you might want to uncomment the following:
-# gem 'conjur-api', git: 'https://github.com/inscitiv/api-ruby.git', branch: 'master'
+gem 'conjur-api', git: 'https://github.com/inscitiv/api-ruby.git', branch: 'master'

data/bin/conjur

@@ -1,4 +1,24 @@
 #!/usr/bin/env ruby
+#
+# Copyright (C) 2013 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 'conjur/cli'
 

data/bin/jsonfield

@@ -1,4 +1,24 @@
 #!/usr/bin/env ruby
+#
+# Copyright (C) 2013 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 'json'
 require 'methadone'

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', '~> 2.4'
+  gem.add_dependency 'conjur-api', '>=4.0'
   gem.add_dependency 'gli'
   gem.add_dependency 'highline'
   gem.add_dependency 'netrc'

data/lib/conjur.rb

@@ -1,2 +1,21 @@
+#
+# Copyright (C) 2013 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 "conjur/version"
-

data/lib/conjur/authn.rb

@@ -1,3 +1,23 @@
+#
+# Copyright (C) 2013 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 'highline'
 require 'conjur/api'
 require 'netrc'
@@ -66,4 +86,4 @@ module Conjur::Authn
       cls.new_from_key(*get_credentials(options))
     end
   end
-end
+end

data/lib/conjur/cli.rb

@@ -1,3 +1,23 @@
+#
+# Copyright (C) 2013 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 'gli'
 require 'conjur/config'
 require 'conjur/log'
@@ -68,4 +88,4 @@ module Conjur
       true
     end
   end
-end
+end

data/lib/conjur/command.rb

@@ -1,3 +1,23 @@
+#
+# Copyright (C) 2013 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.
+#
 module Conjur
   class Command
     @@api = nil
@@ -21,6 +41,28 @@ module Conjur
         @@api ||= Conjur::Authn.connect
       end
 
+      # injects account into 2-tokens id
+      def full_resource_id id
+        parts = id.split(':') unless id.nil? 
+        if id.blank? or parts.size < 2
+          raise "Expecting at least two tokens in #{id}"
+        end
+        if parts.size == 2
+          id = [conjur_account, parts].flatten.join(":")
+        end
+        id
+      end
+
+      # removes accounts from 3+-tokens id, extracts kind
+      def get_kind_and_id_from_args args, argname='id'
+        flat_id = require_arg(args, argname)
+        tokens=flat_id.split(':')
+        raise "At least 2 tokens expected in #{flat_id}" if tokens.size<2
+        tokens.shift if tokens.size>=3 # get rid of account
+        kind=tokens.shift.gsub('-','_')
+        [kind, tokens.join(':')]
+      end
+
       def conjur_account
         Conjur::Core::API.conjur_account
       end
@@ -45,4 +87,4 @@ module Conjur
       end
     end
   end
-end
+end

data/lib/conjur/command/assets.rb

@@ -1,3 +1,23 @@
+#
+# Copyright (C) 2013 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 'conjur/authn'
 require 'conjur/command'
 
@@ -5,22 +25,27 @@ class Conjur::Command::Assets < Conjur::Command
   self.prefix = :asset
 
   desc "Create an asset"
-  arg_name "kind id"
+  arg_name "kind:id"
   command :create do |c|
     acting_as_option(c)
     
     c.action do |global_options, options, args|
-      kind = require_arg(args, 'kind').gsub('-', '_')
-      
+      # NOTE: no generic functions there, as :id is optional
+      kind, id = require_arg(args, 'kind:id').split(':')
+      id = nil if id.blank?
+      kind.gsub!('-', '_')
+
+ 
       m = "create_#{kind}"
       record = if [ 1, -1 ].member?(api.method(m).arity)
-        id = args.shift
         if id
           options[:id] = id
         end
         api.send(m, options)
       else
-        id = require_arg(args, 'id')
+        unless id
+          raise "for kind #{kind} id should be specified explicitly after colon"
+        end
         api.send(m, id, options)
       end
       display(record, options)
@@ -28,21 +53,19 @@ class Conjur::Command::Assets < Conjur::Command
   end
   
   desc "Show an asset"
-  arg_name "kind id"
+  arg_name "id"
   command :show do |c|
     c.action do |global_options,options,args|
-      kind = require_arg(args, "kind").gsub('-', '_')
-      id = require_arg(args, "resource-id")
+      kind, id = get_kind_and_id_from_args(args, 'id')
       display api.send(kind, id).attributes
     end
   end
 
   desc "Checks for the existance of an asset"
-  arg_name "kind id"
+  arg_name "id"
   command :exists do |c|
     c.action do |global_options,options,args|
-      kind = require_arg(args, "kind").gsub('-', '_')
-      id = require_arg(args, "id")
+      kind, id = get_kind_and_id_from_args(args, 'id')
       puts api.send(kind, id).exists?
     end
   end
@@ -59,14 +82,13 @@ class Conjur::Command::Assets < Conjur::Command
   end
 
   desc "Add a member to an asset"
-  arg_name "kind id role-name member"
+  arg_name "id role-name member"
   command :"members:add" do |c|
     c.desc "Grant with admin option"
     c.flag [:a, :admin]
 
     c.action do |global_options, options, args|
-      kind = require_arg(args, "kind").gsub('-', '_')
-      id = require_arg(args, "resource-id")
+      kind, id = get_kind_and_id_from_args(args, 'id')
       role_name = require_arg(args, 'role-name')
       member = require_arg(args, 'member')
       admin_option = !options.delete(:admin).nil?
@@ -81,11 +103,10 @@ class Conjur::Command::Assets < Conjur::Command
   end
 
   desc "Remove a member from an asset"
-  arg_name "kind id role-name member"
+  arg_name "id role-name member"
   command :"members:remove" do |c|
     c.action do |global_options, options, args|
-      kind = require_arg(args, "kind").gsub('-', '_')
-      id = require_arg(args, "resource-id")
+      kind, id = get_kind_and_id_from_args(args, 'id')
       role_name = require_arg(args, 'role-name')
       member = require_arg(args, 'member')
       admin_option = !options.delete(:admin).nil?

data/lib/conjur/command/authn.rb

@@ -1,3 +1,23 @@
+#
+# Copyright (C) 2013 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 'conjur/authn'
 require 'conjur/command'
 
@@ -62,4 +82,4 @@ DESC
       end
     end
   end
-end
+end

data/lib/conjur/command/field.rb

@@ -1,3 +1,23 @@
+#
+# Copyright (C) 2013 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 'conjur/command'
 
 class Conjur::Command::Field < Conjur::Command

data/lib/conjur/command/groups.rb

@@ -1,3 +1,23 @@
+#
+# Copyright (C) 2013 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 'conjur/authn'
 require 'conjur/command'
 
@@ -61,4 +81,4 @@ class Conjur::Command::Groups < Conjur::Command
       puts "Membership revoked"
     end
   end
-end
+end

data/lib/conjur/command/hosts.rb

@@ -1,3 +1,23 @@
+#
+# Copyright (C) 2013 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 'conjur/authn'
 require 'conjur/command'
 
@@ -5,7 +25,7 @@ class Conjur::Command::Hosts < Conjur::Command
   self.prefix = :host
 
   desc "Create a new host"
-  arg_name "id?"
+  arg_name "host"
   command :create do |c|
     c.arg_name "password"
     c.flag [:p,:password]
@@ -30,4 +50,4 @@ class Conjur::Command::Hosts < Conjur::Command
       $stderr.puts "curl -L #{enrollment_url} | bash"
     end
   end
-end
+end