IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix problem testing for mutual exclusivity in hbac plugin.

Browse Source 
This should fix the hbac tests.
This commit is contained in:
Rob Crittenden 2010-10-11 10:07:15 -04:00
parent dff2ff8300
commit fe7d97a3d9
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ipalib/plugins/hbac.py
View File

@ -80,6 +80,18 @@ from ipalib import AccessTime, Password, Str, StrEnum
from ipalib.plugins.baseldap import *
from ipalib import _, ngettext
def is_all(options, attribute):
"""
See if options[attribute] is lower-case 'all' in a safe way.
"""
if attribute in options and \
options[attribute] is not None and \
options[attribute].lower() == 'all':
return True
else:
return False
class hbac(LDAPObject):
"""
HBAC object.
@ -233,17 +245,13 @@ class hbac_mod(LDAPUpdate):
def pre_callback(self, ldap, dn, entry_attrs, attrs_list, *keys, **options):
(dn, entry_attrs) = ldap.get_entry(dn, attrs_list)
if 'usercategory' in options and options['usercategory'].lower() == 'all' and \
'memberuser' in entry_attrs:
if is_all(options, 'usercategory') and 'memberuser' in entry_attrs:
raise errors.MutuallyExclusiveError(reason="user category cannot be set to 'all' while there are allowed users")
if 'hostcategory' in options and options['hostcategory'].lower() == 'all' and \
'memberhost' in entry_attrs:
if is_all(options, 'hostcategory') and 'memberhost' in entry_attrs:
raise errors.MutuallyExclusiveError(reason="host category cannot be set to 'all' while there are allowed hosts")
if 'sourcehostcategory' in options and options['sourcehostcategory'].lower() == 'all' and \
'sourcehost' in entry_attrs:
if is_all(options, 'sourcehostcategory') and 'sourcehost' in entry_attrs:
raise errors.MutuallyExclusiveError(reason="sourcehost category cannot be set to 'all' while there are allowed source hosts")
if 'servicecategory' in options and options['servicecategory'].lower() == 'all' and \
'memberservice' in entry_attrs:
if is_all(options, 'servicecategory') and 'memberservice' in entry_attrs:
raise errors.MutuallyExclusiveError(reason="service category cannot be set to 'all' while there are allowed services")
return dn