summaryrefslogtreecommitdiffstats
path: root/ipalib/plugins
diff options
context:
space:
mode:
authorAlexander Bokovoy <abokovoy@redhat.com>2011-07-07 18:58:18 +0300
committerMartin Kosek <mkosek@redhat.com>2011-07-13 12:02:46 +0200
commitb93e0b8bbfaa1e9252b3d096ef9251493654dec2 (patch)
treee261bcb0bfdccf12be4a152b55eb8ff341b9d542 /ipalib/plugins
parentf534445e26ebfca38afe1c834ba088cbcbc24e37 (diff)
downloadfreeipa-b93e0b8bbfaa1e9252b3d096ef9251493654dec2.tar.gz
freeipa-b93e0b8bbfaa1e9252b3d096ef9251493654dec2.tar.xz
freeipa-b93e0b8bbfaa1e9252b3d096ef9251493654dec2.zip
Convert nsaccountlock to always work as bool towards Python code
https://fedorahosted.org/freeipa/ticket/1259 Python code will see nsaccountlock as bool. JavaScript code will also see it as bool. This allows native boolean operations with the lock field. Passes both CLI and WebUI tests.
Diffstat (limited to 'ipalib/plugins')
-rw-r--r--ipalib/plugins/user.py27
1 files changed, 16 insertions, 11 deletions
diff --git a/ipalib/plugins/user.py b/ipalib/plugins/user.py
index 105814d5f..f0ee8f5b8 100644
--- a/ipalib/plugins/user.py
+++ b/ipalib/plugins/user.py
@@ -69,11 +69,19 @@ NO_UPG_MAGIC = '__no_upg__'
def validate_nsaccountlock(entry_attrs):
if 'nsaccountlock' in entry_attrs:
- if not isinstance(entry_attrs['nsaccountlock'], basestring):
- raise errors.OnlyOneValueAllowed(attr='nsaccountlock')
- if entry_attrs['nsaccountlock'].lower() not in ('true','false'):
- raise errors.ValidationError(name='nsaccountlock', error='must be TRUE or FALSE')
-
+ nsaccountlock = entry_attrs['nsaccountlock']
+ if not isinstance(nsaccountlock, (bool, Bool)):
+ if not isinstance(nsaccountlock, basestring):
+ raise errors.OnlyOneValueAllowed(attr='nsaccountlock')
+ if nsaccountlock.lower() not in ('true','false'):
+ raise errors.ValidationError(name='nsaccountlock', error='must be TRUE or FALSE')
+
+def convert_nsaccountlock(entry_attrs):
+ if not 'nsaccountlock' in entry_attrs:
+ entry_attrs['nsaccountlock'] = False
+ else:
+ nsaccountlock = Bool('temp')
+ entry_attrs['nsaccountlock'] = nsaccountlock.convert(entry_attrs['nsaccountlock'][0])
class user(LDAPObject):
"""
@@ -428,8 +436,7 @@ class user_mod(LDAPUpdate):
return dn
def post_callback(self, ldap, dn, entry_attrs, *keys, **options):
- if not 'nsaccountlock' in entry_attrs:
- entry_attrs['nsaccountlock'] = [u'False']
+ convert_nsaccountlock(entry_attrs)
self.obj._convert_manager(entry_attrs, **options)
return dn
@@ -460,8 +467,7 @@ class user_find(LDAPSearch):
for entry in entries:
(dn, attrs) = entry
self.obj._convert_manager(attrs, **options)
- if not 'nsaccountlock' in attrs:
- attrs['nsaccountlock'] = [u'False']
+ convert_nsaccountlock(attrs)
msg_summary = ngettext(
'%(count)d user matched', '%(count)d users matched', 0
@@ -475,8 +481,7 @@ class user_show(LDAPRetrieve):
Display information about a user.
"""
def post_callback(self, ldap, dn, entry_attrs, *keys, **options):
- if not 'nsaccountlock' in entry_attrs:
- entry_attrs['nsaccountlock'] = [u'False']
+ convert_nsaccountlock(entry_attrs)
self.obj._convert_manager(entry_attrs, **options)
return dn