pe_rbac 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 858d59d7f1c47371a5f8379f5a9aa271d2ad6078
-  data.tar.gz: 0f2bd35912191340c9978a0d08547d87bb6dc09b
+  metadata.gz: b68ee5976cd98508a5b2c2c05c3812f84079c838
+  data.tar.gz: ddb64bdd13aeea1f9ae5f6c248a6b657e1711821
 SHA512:
-  metadata.gz: 07a17310e5e1369d72a97eba970a34dd5d33b919eac5a4ae8d9bbca6145ccd5c7692ffc955285a4229aaf00a065f02fd66471e8f56f80ad4299271018eb6d7a1
-  data.tar.gz: 6ade6201c2003bcab6790d99086dfb4d4519ab9e2d226bc805406f0a246e438115dc7dd37b1ac16f721af0c12d1853acf9e46a03fcd0282610d7e03b4e3e8a82
+  metadata.gz: 6bb111f203b9d472937fdec79ed90cdaf4f9cdcd43b1ebe42e8afb8020128c4e5eb45fa75d11b4e3bde3ee6373bd65dd991cdb4c99ef304e2f14a9ec706b6623
+  data.tar.gz: 101a4b969b827edd2fa07f1efde04648e81bb98a1e4e2fc3d8d67167021d6821b569d01b14ab87cb83f7e6066d5b9c7980729f78d83e6b3e05208d8fd4149264

data/README.md

@@ -43,9 +43,20 @@ pe_rbac puppetdb --password t0ps3cret
 pe_rbac puppetdb --allow-write --password t0ps3cret
 ```
 
+### Resetting a user password
+```
+pe_rbac reset_password
+```
+Change the password for `admin` to `changeme`
+
+```
+pe_rbac reset_password --username foo --password 12345678
+```
+Reset the password for the `foo` user to `12345678`
+
 ### Ruby API
-An *IN FLUX* Ruby API exists, see code for more info.  This WILL change (well it 
-will if I do any more development work on this...) - expect module names, 
+An *IN FLUX* Ruby API exists, see code for more info.  This WILL change (well it
+will if I do any more development work on this...) - expect module names,
 functions, etc. to change.  In particular, I'm planning:
 * Sub-modules/file reorgs
 * tests!
@@ -69,4 +80,3 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/[USERN
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-

data/exe/pe_rbac

@@ -20,6 +20,8 @@ Escort::App.create do |app|
       email     = options[:global][:commands][cmd][:options][:email]
 
       role_ids = PeRbac::get_role_ids(role)
+      # always returns an array even though there should only be one match
+      role_data = PeRbac::get_role(role_ids.first)
 
       perms = [{
         "object_type" => "tokens",
@@ -31,7 +33,7 @@ Escort::App.create do |app|
       PeRbac::update_role(
         role,
         nil,
-        perms,
+        PeRbac::merge_permissions(role_data['permissions'], perms)
       )
 
       PeRbac::ensure_user(username, email, username, password, role_ids)

data/lib/pe_rbac.rb

@@ -249,6 +249,29 @@ module PeRbac
     end
   end
 
+  # return a new array of permissions, adding the permission `ensure` to the
+  # existing permissions if required
+  def self.merge_permissions(existing, ensure_perms)
+    # duplicate existing array of hash
+    permissions = existing.map do |e| e.dup end
+
+    ensure_perms.each { |ensure_perm|
+      ensure_perm_exists = false
+      existing.each { |existing_perm|
+        if  existing_perm['object_type']  == ensure_perm['object_type'] and
+            existing_perm['action']       == ensure_perm['action'] and
+            existing_perm['instance']     == ensure_perm['instance']
+          ensure_perm_exists = true
+        end
+      }
+      if ! ensure_perm_exists
+        permissions.push(ensure_perm)
+      end
+    }
+
+    permissions
+  end
+
   private
 
   def self._request(method, path, payload=nil, raw=false)

data/lib/pe_rbac/version.rb

@@ -1,3 +1,3 @@
 module PeRbac
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pe_rbac
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Geoff Williams
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-29 00:00:00.000000000 Z
+date: 2017-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -106,9 +106,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Ruby API for Puppet Enterprise RBAC
 test_files: []
-has_rdoc: