pe_rbac 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3014fbdf37cd61996d946ca5ffc913381c487f43
-  data.tar.gz: e7843fbae2230eaa7cbdc54c7713a986f5fce735
+  metadata.gz: 56e58098a25e422d8137e4efadf5b370379528ae
+  data.tar.gz: ae014b2b5aaab17146877eeac905852a8459d81e
 SHA512:
-  metadata.gz: 274adf65e4a1070b83a6d7eaa5b488dccfc6ce75beb1017390eb11dcd6ca75708c4f537f2232fcbf7a6ff683c462ec6b9ec83c956ee95a2716c4438c20e416f5
-  data.tar.gz: 76167510d42307e88eea42dcdd1e3e16d4908ba33373a5579a9068c30a67a37e756f1b51b9db71861e88112e408d8dffd23a791112e2636cd209442bb211c85a
+  metadata.gz: e3f574eac122619ffb1d0ee39c4a041762af5c7b9ee14c625051658f5c06fdaa54f73b6f76205bb8c644931e26d46cf704d4ebc70b771fb3c1de9627fcaf2318
+  data.tar.gz: b5c016384239f66d858660140d31d46f5d64b8aeab8d3225dbc419c0383314a9a6d5ee190b45593452504854b21050a506295f7c3d6d26da220e1e79b3a9cfc6

data/exe/pe_rbac

@@ -171,7 +171,7 @@ Escort::App.create do |app|
   app.command :reset_password do |command|
     command.summary "Reset a logon password"
     command.description "Obtain a reset token and then reset a password"
-    command.action do |options, arguments|\
+    command.action do |options, arguments|
       # fixme - obtain automatically
       cmd         = :reset_password
       username    = options[:global][:commands][cmd][:options][:username]
@@ -193,4 +193,11 @@ Escort::App.create do |app|
     end
   end
 
+  app.command :show_permissions do |command|
+    command.summary "Show available permissions"
+    command.action do |options, arguments|
+      PeRbac::Action::show_permissions()
+    end
+  end
+
 end

data/lib/pe_rbac/action.rb

@@ -15,6 +15,9 @@
 
 require 'pe_rbac/core'
 require 'pe_rbac/user'
+require 'pe_rbac/permission'
+require 'json'
+
 module PeRbac
   module Action
 
@@ -63,6 +66,10 @@ module PeRbac
       status
     end
 
+    def self.show_permissions
+      resp = PeRbac::Permission::get_permissions
+      puts JSON.pretty_generate(resp)
+    end
 
   end
 end

data/lib/pe_rbac/permission.rb

@@ -24,5 +24,34 @@ module PeRbac
       resp = PeRbac::Core::request(:get, "/types")
       resp ? JSON.parse(resp.body) : false
     end
+
+    # Not all requested permissions may be avaiable per use (change between
+    # versions).  To mitigate this, requeste the list of all valid permissions
+    # and remove any permissions that are not in the list from the final list of
+    # permissions to request
+    def self.safe_permissions(want_perms)
+      safe_perms  = []
+      valid_perms = Permission::get_permissions()
+
+      if want_perms
+        want_perms.each { |wp|
+          valid = false
+          valid_perms.each { |vp|
+            if  wp['object_type'] == vp['object_type']
+              vp['actions'].each { |va|
+                # scan for valid action inside object permissions
+                if wp['action'] == va['name']
+                  valid = true
+                end
+              }
+            end
+          }
+          if valid
+            safe_perms << wp
+          end
+        }
+      end
+      safe_perms
+    end
   end
 end

data/lib/pe_rbac/role.rb

@@ -53,8 +53,10 @@ module PeRbac
 
     # https://docs.puppet.com/pe/latest/rbac_roles_v1.html#post-roles
     def self.create_role(display_name, description=display_name, permissions=[], user_ids=[], group_ids=[])
+      safe_perms = Permission::safe_permissions(permissions)
+
       role = {
-        "permissions"   => permissions,
+        "permissions"   => safe_perms,
         "user_ids"      => Array(user_ids),
         "group_ids"     => Array(group_ids),
         "display_name"  => display_name,
@@ -65,12 +67,13 @@ module PeRbac
 
     def self.update_role(display_name, description=nil, permissions=nil, user_ids=nil, group_ids=nil)
       role_id = get_role_id(display_name)
+      safe_perms = Permission::safe_permissions(permissions)
       status = false
       if role_id
         role = get_role(role_id)
         role['display_name']  = display_name ? display_name : role['display_name']
         role['description']   = description ? display_name : role['description']
-        role['permissions']   = permissions ? permissions : role['permissions']
+        role['permissions']   = safe_perms ? safe_perms : role['permissions']
         role['user_ids']      = user_ids ? Array(user_ids) : role['user_ids']
         role['group_ids']     = group_ids ? Array(group_ids) : role['group_ids']
 
@@ -79,5 +82,6 @@ module PeRbac
       end
       status
     end
+
   end
 end

data/lib/pe_rbac/version.rb

@@ -14,5 +14,5 @@
 # limitations under the License.
 
 module PeRbac
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/pe_rbac.gemspec

@@ -34,4 +34,6 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "rest-client", "2.0.0"
   spec.add_runtime_dependency "escort", "0.4.0"
+  spec.add_runtime_dependency "json", "2.0.3"
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pe_rbac
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Geoff Williams
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-14 00:00:00.000000000 Z
+date: 2017-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -164,6 +164,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.4.0
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.0.3
 description: Programatically do stuff with Puppet Enterprise RBAC
 email:
 - geoff@geoffwilliams.me.uk
@@ -211,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Ruby API for Puppet Enterprise RBAC