knife-acl 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a6cd528b66d124ccda12a6687e70adcbe6dce96
-  data.tar.gz: 5c4aa8c1dd51003dbebd0044cf8e220803fb8267
+  metadata.gz: 7b20c4e70c404b3dfdc0238406b653168047c862
+  data.tar.gz: 34507d1236c7c0027dc4a774aa252ba0e3f4f34a
 SHA512:
-  metadata.gz: fb58b805be9445328c3e5540b2bcd94254553412428434856bcf7ad3211397f2bdaa59242e26c0eac0392f014e29858993a65ebabbe70f98e6dc64ba3b1f46a2
-  data.tar.gz: 0b08abdb3fb96a0f02fbd68331b4dbb2c0db182f0df978e86f6daf8ad4746d91ce6a67c38a0259fb3f6ad1de55634716032bd87d3b3242e71c25d34292dee997
+  metadata.gz: 0135c44d7e10b6f1614f3f7f00d0dd711f97707ce6f1b69eed057ad7f50e60c4dc5e1e288903ad8e44f060d8660224c58d7e9ab908d0060be0b03be4de524f52
+  data.tar.gz: b77b9b865d6291356250578edb2c0899d1c57160c3ccab25322dcb6266eea45a030a317fd7961df6770bef2867e77aa47abf6f9e15ebdcc58b8b75eeda9bf984

data/README.md

@@ -10,8 +10,8 @@ All commands assume a working knife configuration for an admin user of a Chef or
 Reference:
 
 1. [Chef Server Permissions PDF](https://github.com/chef/chef-server/blob/master/doc/ChefServerPermissions_v1.3.pdf)
-2. [Chef Server Permissions Docs](http://docs.chef.io/server/server_orgs.html#permissions)
-3. [Chef Server Groups Docs](http://docs.chef.io/server/server_orgs.html#groups)
+2. [Chef Server Permissions Docs](https://docs.chef.io/server/server_orgs.html#permissions)
+3. [Chef Server Groups Docs](https://docs.chef.io/server/server_orgs.html#groups)
 
 ### Installation
 
@@ -378,6 +378,12 @@ knife acl remove group clients containers clients create,read,update,delete,gran
 knife acl add group users containers clients read,delete
 knife acl remove group users containers clients create,update,grant
 
+knife acl add group admins containers cookbook_artifacts create,read,update,delete,grant
+knife acl add group clients containers cookbook_artifacts read
+knife acl remove group clients containers cookbook_artifacts create,update,delete,grant
+knife acl add group users containers cookbook_artifacts create,read,update,delete
+knife acl remove group users containers cookbook_artifacts grant
+
 knife acl add group admins containers cookbooks create,read,update,delete,grant
 knife acl add group clients containers cookbooks read
 knife acl remove group clients containers cookbooks create,update,delete,grant
@@ -396,6 +402,11 @@ knife acl remove group clients containers environments create,update,delete,gran
 knife acl add group users containers environments create,read,update,delete
 knife acl remove group users containers environments grant
 
+knife acl add group admins containers groups create,read,update,delete,grant
+knife acl remove group clients containers groups create,read,update,delete,grant
+knife acl add group users containers groups read
+knife acl remove group users containers groups create,update,delete,grant
+
 knife acl add group admins containers nodes create,read,update,delete,grant
 knife acl add group clients containers nodes create,read
 knife acl remove group clients containers nodes update,delete,grant
@@ -430,7 +441,7 @@ knife acl remove group users containers sandboxes read,update,delete,grant
 
 Unless otherwise specified all works in this repository are
 
-Copyright 2013-2015 Chef Software, Inc.
+Copyright 2013-2016 Chef Software, Inc.
 
 |||
 | ------------- |-------------:|

data/lib/chef/knife/acl_add.rb

@@ -1,7 +1,7 @@
 #
-# Author:: Steven Danna (steve@opscode.com)
+# Author:: Steven Danna (steve@chef.io)
 # Author:: Jeremiah Snapp (jeremiah@chef.io)
-# Copyright:: Copyright 2011--2015 Chef Software, Inc.
+# Copyright:: Copyright 2011-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/chef/knife/acl_base.rb

@@ -1,7 +1,7 @@
 #
-# Author:: Steven Danna (steve@opscode.com)
+# Author:: Steven Danna (steve@chef.io)
 # Author:: Jeremiah Snapp (<jeremiah@chef.io>)
-# Copyright:: Copyright 2011--2015 Chef Software, Inc.
+# Copyright:: Copyright 2011-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -77,7 +77,7 @@ module OpscodeAcl
     end
 
     def get_acl(object_type, object_name)
-      rest.get_rest("#{object_type}/#{object_name}/_acl")
+      rest.get_rest("#{object_type}/#{object_name}/_acl?detail=granular")
     end
 
     def get_ace(object_type, object_name, perm)
@@ -92,8 +92,16 @@ module OpscodeAcl
 
         case member_type
         when "client", "user"
-          next if ace['actors'].include?(member_name)
-          ace['actors'] << member_name
+          # Our PUT body depends on the type of reply we get from _acl?detail=granular
+          # When the server replies with json attributes  'users' and 'clients',
+          # we'll want to modify entries under the same keys they arrived.- their presence
+          # in the body tells us that CS will accept them in a PUT.
+          # Older version of chef-server will continue to use 'actors' for a combined list
+          # and expect the same in the body.
+          key = "#{member_type}s"
+          key = 'actors' unless ace.has_key? key
+          next if ace[key].include?(member_name)
+          ace[key] << member_name
         when "group"
           next if ace['groups'].include?(member_name)
           ace['groups'] << member_name
@@ -111,8 +119,10 @@ module OpscodeAcl
 
         case member_type
         when "client", "user"
-          next unless ace['actors'].include?(member_name)
-          ace['actors'].delete(member_name)
+          key = "#{member_type}s"
+          key = 'actors' unless ace.has_key? key
+          next unless ace[key].include?(member_name)
+          ace[key].delete(member_name)
         when "group"
           next unless ace['groups'].include?(member_name)
           ace['groups'].delete(member_name)

data/lib/chef/knife/acl_bulk_add.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Jeremiah Snapp (jeremiah@chef.io)
-# Copyright:: Copyright 2011--2015 Chef Software, Inc.
+# Copyright:: Copyright 2011-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/chef/knife/acl_bulk_remove.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Jeremiah Snapp (jeremiah@chef.io)
-# Copyright:: Copyright 2011--2015 Chef Software, Inc.
+# Copyright:: Copyright 2011-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/chef/knife/acl_remove.rb

@@ -1,7 +1,7 @@
 #
-# Author:: Steven Danna (steve@opscode.com)
+# Author:: Steven Danna (steve@chef.io)
 # Author:: Jeremiah Snapp (jeremiah@chef.io)
-# Copyright:: Copyright 2011--2015 Chef Software, Inc.
+# Copyright:: Copyright 2011-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/chef/knife/acl_show.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Steven Danna (steve@opscode.com)
-# Copyright:: Copyright 2011--2014 Chef Software, Inc.
+# Author:: Steven Danna (steve@chef.io)
+# Copyright:: Copyright 2011-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -38,6 +38,14 @@ module OpscodeAcl
       validate_object_type!(object_type)
       validate_object_name!(object_name)
       acl = get_acl(object_type, object_name)
+      PERM_TYPES.each do |perm|
+        # Filter out the actors field if we have
+        # users and clients.  Note that if one is present,
+        # both will be - but we're checking both for completeness.
+        if acl[perm].has_key?('users') && acl[perm].has_key?('clients')
+          acl[perm].delete 'actors'
+        end
+      end
       ui.output acl
     end
   end

data/lib/chef/knife/group_add.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Seth Falcon (<seth@chef.io>)
 # Author:: Jeremiah Snapp (<jeremiah@chef.io>)
-# Copyright:: Copyright 2011--2015 Chef Software, Inc.
+# Copyright:: Copyright 2011-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/chef/knife/group_create.rb

@@ -1,7 +1,7 @@
 #
-# Author:: Seth Falcon (<seth@opscode.com>)
+# Author:: Seth Falcon (<seth@chef.io>)
 # Author:: Jeremiah Snapp (<jeremiah@chef.io>)
-# Copyright:: Copyright 2011--2015 Chef Software, Inc.
+# Copyright:: Copyright 2011-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/chef/knife/group_destroy.rb

@@ -1,7 +1,7 @@
 #
-# Author:: Christopher Maier (<cm@opscode.com>)
+# Author:: Christopher Maier (<cm@chef.io>)
 # Author:: Jeremiah Snapp (<jeremiah@chef.io>)
-# Copyright:: Copyright 2015 Opscode, Inc.
+# Copyright:: Copyright 2015-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/chef/knife/group_list.rb

@@ -1,7 +1,7 @@
 #
-# Author:: Seth Falcon (<seth@opscode.com>)
+# Author:: Seth Falcon (<seth@chef.io>)
 # Author:: Jeremiah Snapp (<jeremiah@chef.io>)
-# Copyright:: Copyright 2011--2015 Chef Software, Inc.
+# Copyright:: Copyright 2011-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/chef/knife/group_remove.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Seth Falcon (<seth@chef.io>)
 # Author:: Jeremiah Snapp (<jeremiah@chef.io>)
-# Copyright:: Copyright 2011--2015 Chef Software, Inc.
+# Copyright:: Copyright 2011-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/chef/knife/group_show.rb

@@ -1,7 +1,7 @@
 #
-# Author:: Seth Falcon (<seth@opscode.com>)
+# Author:: Seth Falcon (<seth@chef.io>)
 # Author:: Jeremiah Snapp (<jeremiah@chef.io>)
-# Copyright:: Copyright 2011--2015 Chef Software, Inc.
+# Copyright:: Copyright 2011-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/chef/knife/user_dissociate.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Steven Danna (<steve@opscode.com>)
-# Copyright:: Copyright 2011--2014 Chef Software, Inc.
+# Author:: Steven Danna (<steve@chef.io>)
+# Copyright:: Copyright 2011-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/chef/knife/user_invite_add.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Steven Danna (<steve@opscode.com>)
-# Copyright:: Copyright 2011--2014 Chef Software, Inc.
+# Author:: Steven Danna (<steve@chef.io>)
+# Copyright:: Copyright 2011-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/chef/knife/user_invite_list.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Steven Danna (<steve@opscode.com>)
-# Copyright:: Copyright 2011--2014 Chef Software, Inc.
+# Author:: Steven Danna (<steve@chef.io>)
+# Copyright:: Copyright 2011-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/chef/knife/user_invite_recind.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Steven Danna (<steve@opscode.com>)
-# Copyright:: Copyright 2011--2014 Chef Software, Inc.
+# Author:: Steven Danna (<steve@chef.io>)
+# Copyright:: Copyright 2011-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/chef/knife/user_list.rb

@@ -1,7 +1,7 @@
 #
-# Author:: Seth Falcon (<seth@opscode.com>)
+# Author:: Seth Falcon (<seth@chef.io>)
 # Author:: Jeremiah Snapp (<jeremiah@chef.io>)
-# Copyright:: Copyright 2011--2015 Chef Software, Inc.
+# Copyright:: Copyright 2011-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,7 +21,7 @@ module OpscodeAcl
   class UserList < Chef::Knife
     category "OPSCODE HOSTED CHEF ACCESS CONTROL"
     banner "knife user list"
-    
+
     deps do
       require 'pp'
     end

data/lib/chef/knife/user_show.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Steven Danna (<steve@opscode.com>)
-# Copyright:: Copyright 2011--2014 Chef Software, Inc.
+# Author:: Steven Danna (<steve@chef.io>)
+# Copyright:: Copyright 2011-2016 Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/knife-acl/version.rb

@@ -1,3 +1,3 @@
 module KnifeACL
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-acl
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Seth Falcon
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-26 00:00:00.000000000 Z
+date: 2016-09-01 00:00:00.000000000 Z
 dependencies: []
 description: Knife plugin to manupulate Chef server access control lists
 email: support@chef.io
@@ -59,9 +59,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Knife plugin to manupulate Chef server access control lists
 test_files: []
-has_rdoc: