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 bug that prevented single-character fields

Browse Source 
Fix bug in exception handling where we were sending the wrong thing as detail.
Basically we were catching an LDAP error, generating an IPAError from it,
 catching that, then setting the detail of the 2nd exception to another IPAError
 rather than the root exception. This caused anything looking at e.detail to
 crap out

Resolves 432136
This commit is contained in:
Rob Crittenden 2008-02-11 16:32:54 -05:00
parent 5b1e7e3a5f
commit 73a674ed49
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ipa-server/xmlrpc-server/funcs.py
View File

@ -486,7 +486,7 @@ class IPAServer:
# get to LDAP, like: # get to LDAP, like:
# TypeError: ('expected a string in the list', None) # TypeError: ('expected a string in the list', None)
for k in user.keys(): for k in user.keys():
if not user[k] or len(user[k]) == 0 or (len(user[k]) == 1 and '' in user[k]): if not user[k] or len(user[k]) == 0 or (isinstance(user[k],list) and len(user[k]) == 1 and '' in user[k]):
del user[k] del user[k]
dn="uid=%s,%s,%s" % (ldap.dn.escape_dn_chars(user['uid']), dn="uid=%s,%s,%s" % (ldap.dn.escape_dn_chars(user['uid']),
@ -516,6 +516,8 @@ class IPAServer:
default_group = self.get_entry_by_dn(group_dn, ['dn','gidNumber'], opts) default_group = self.get_entry_by_dn(group_dn, ['dn','gidNumber'], opts)
if default_group: if default_group:
user['gidnumber'] = default_group.get('gidnumber') user['gidnumber'] = default_group.get('gidnumber')
except ipaerror.exception_for(ipaerror.LDAP_DATABASE_ERROR), e:
raise ipaerror.gen_exception(ipaerror.LDAP_DATABASE_ERROR, message=None, nested_exception=e.detail)
except ipaerror.exception_for(ipaerror.LDAP_DATABASE_ERROR): except ipaerror.exception_for(ipaerror.LDAP_DATABASE_ERROR):
# Fake an LDAP error so we can return something useful to the user # Fake an LDAP error so we can return something useful to the user
raise ipaerror.gen_exception(ipaerror.LDAP_NOT_FOUND, "No default group for new users can be found.") raise ipaerror.gen_exception(ipaerror.LDAP_NOT_FOUND, "No default group for new users can be found.")
@ -545,10 +547,14 @@ class IPAServer:
res = conn.addEntry(entry) res = conn.addEntry(entry)
except TypeError, e: except TypeError, e:
raise ipaerror.gen_exception(ipaerror.LDAP_DATABASE_ERROR, "There is a problem with one of the data types.") raise ipaerror.gen_exception(ipaerror.LDAP_DATABASE_ERROR, "There is a problem with one of the data types.")
except ipaerror.exception_for(ipaerror.LDAP_DATABASE_ERROR), e:
raise ipaerror.gen_exception(ipaerror.LDAP_DATABASE_ERROR, message=None, nested_exception=e.detail)
except Exception, e: except Exception, e:
raise ipaerror.gen_exception(ipaerror.LDAP_DATABASE_ERROR, e) raise ipaerror.gen_exception(ipaerror.LDAP_DATABASE_ERROR, nested_exception=e)
try: try:
self.add_user_to_group(user.get('uid'), group_dn, opts) self.add_user_to_group(user.get('uid'), group_dn, opts)
except ipaerror.exception_for(ipaerror.LDAP_DATABASE_ERROR), e:
raise ipaerror.gen_exception(ipaerror.LDAP_DATABASE_ERROR, message=None, nested_exception=e.detail)
except Exception, e: except Exception, e:
raise ipaerror.gen_exception(ipaerror.LDAP_DATABASE_ERROR, "The user was created but adding to group %s failed" % group_dn) raise ipaerror.gen_exception(ipaerror.LDAP_DATABASE_ERROR, "The user was created but adding to group %s failed" % group_dn)
finally: finally:

4
ipa-server/xmlrpc-server/ipaxmlrpc.py
View File

@ -175,8 +175,8 @@ class ModXMLRPCRequestHandler(object):
except ipaerror.IPAError, e: except ipaerror.IPAError, e:
self.traceback = True self.traceback = True
if (isinstance(e.detail, ldap.LDAPError)): if (isinstance(e.detail, ldap.LDAPError)) and len(e.detail[0].get('desc') > 1):
err = ": %s: %s" % (e.detail.args[0]['desc'], e.detail.args[0].get('info','')) err = ": %s: %s" % (e.detail[0].get('desc'), e.detail[0].get('info',''))
response = dumps(Fault(e.code, str(e) + err)) response = dumps(Fault(e.code, str(e) + err))
else: else:
response = dumps(Fault(e.code, str(e))) response = dumps(Fault(e.code, str(e)))