summaryrefslogtreecommitdiffstats
path: root/ipaserver/plugins/caacl.py
diff options
context:
space:
mode:
authorFraser Tweedale <ftweedal@redhat.com>2017-01-25 15:51:46 +1000
committerTomas Krizek <tkrizek@redhat.com>2017-03-03 12:09:57 +0100
commit2066a80be21258d9311ae374fe124d9ac3b79acd (patch)
tree7b5536c786aa4a374815c234767a3f1663ab64d8 /ipaserver/plugins/caacl.py
parent223a48b6d9916069971f79ab324ead26fa21c79d (diff)
downloadfreeipa-2066a80be21258d9311ae374fe124d9ac3b79acd.tar.gz
freeipa-2066a80be21258d9311ae374fe124d9ac3b79acd.tar.xz
freeipa-2066a80be21258d9311ae374fe124d9ac3b79acd.zip
Remove redundant principal_type argument
Minor refactor to remove the redundant 'principal_type' argument from 'caacl_check' and associated functions. Part of: https://pagure.io/freeipa/issue/5011 Reviewed-By: Tomas Krizek <tkrizek@redhat.com>
Diffstat (limited to 'ipaserver/plugins/caacl.py')
-rw-r--r--ipaserver/plugins/caacl.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/ipaserver/plugins/caacl.py b/ipaserver/plugins/caacl.py
index a7817c4cf..ff1178ad7 100644
--- a/ipaserver/plugins/caacl.py
+++ b/ipaserver/plugins/caacl.py
@@ -151,7 +151,13 @@ def _acl_make_rule(principal_type, obj):
return rule
-def acl_evaluate(principal_type, principal, ca_id, profile_id):
+def acl_evaluate(principal, ca_id, profile_id):
+ if principal.is_user:
+ principal_type = 'user'
+ elif principal.is_host:
+ principal_type = 'host'
+ else:
+ principal_type = 'service'
req = _acl_make_request(principal_type, principal, ca_id, profile_id)
acls = api.Command.caacl_find(no_members=False)['result']
rules = [_acl_make_rule(principal_type, obj) for obj in acls]