diff --git a/apps/rbac/builtin.py b/apps/rbac/builtin.py index e15386bea..a36ee5eea 100644 --- a/apps/rbac/builtin.py +++ b/apps/rbac/builtin.py @@ -18,14 +18,18 @@ user_perms = ( ('assets', 'asset', 'match', 'asset'), ('assets', 'systemuser', 'match', 'systemuser'), ('assets', 'node', 'match', 'node'), + ("ops", "adhoc", "*", "*"), + ("ops", "playbook", "*", "*"), + ("ops", "job", "*", "*"), + ("ops", "jobexecution", "*", "*"), ) system_user_perms = ( - ('authentication', 'connectiontoken', 'add,change,view', 'connectiontoken'), - ('authentication', 'temptoken', 'add,change,view', 'temptoken'), - ('authentication', 'accesskey', '*', '*'), - ('tickets', 'ticket', 'view', 'ticket'), -) + user_perms + _view_all_joined_org_perms + ('authentication', 'connectiontoken', 'add,change,view', 'connectiontoken'), + ('authentication', 'temptoken', 'add,change,view', 'temptoken'), + ('authentication', 'accesskey', '*', '*'), + ('tickets', 'ticket', 'view', 'ticket'), + ) + user_perms + _view_all_joined_org_perms _auditor_perms = ( ('rbac', 'menupermission', 'view', 'audit'), @@ -41,7 +45,6 @@ auditor_perms = user_perms + _auditor_perms system_auditor_perms = system_user_perms + _auditor_perms + _view_root_perms - app_exclude_perms = [ ('users', 'user', 'add,delete', 'user'), ('orgs', 'org', 'add,delete,change', 'org'),