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

Add additional detail to error messages.

Browse Source 
This runs the risk of showing too much and confusing users but on the other
hand it often includes required information detailing why the error
occurred such as what attribute the user lacks write access too and why
changing a password failed.

438057
This commit is contained in:
Rob Crittenden 2008-03-25 09:48:23 -04:00
parent 402187c838
commit 1a1e020258
5 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ipa-server/ipa-gui/ipagui/subcontrollers/delegation.py
View File

@ -144,7 +144,7 @@ class DelegationController(IPAController):
pass pass
except ipaerror.IPAError, e: except ipaerror.IPAError, e:
turbogears.flash("Delgate add failed: " + str(e) + "<br/>" + e.detail[0]['desc']) turbogears.flash("Delgate add failed: " + str(e) + "<br/>" + e.detail[0].get('desc','') + ". " + e.detail[0].get('info',''))
return dict(form=delegate_form, delegate=kw, return dict(form=delegate_form, delegate=kw,
tg_template='ipagui.templates.delegatenew') tg_template='ipagui.templates.delegatenew')
@ -174,7 +174,7 @@ class DelegationController(IPAController):
return dict(form=delegate_form, delegate=delegate) return dict(form=delegate_form, delegate=delegate)
except (SyntaxError, ipaerror.IPAError), e: except (SyntaxError, ipaerror.IPAError), e:
turbogears.flash("Delegation edit failed: " + str(e) + "<br/>" + e.detail[0]['desc']) turbogears.flash("Delegation edit failed: " + str(e) + "<br/>" + e.detail[0].get('desc','') + ". " + e.detail[0].get('info',''))
raise turbogears.redirect('/delegate/list') raise turbogears.redirect('/delegate/list')
@ -259,7 +259,7 @@ class DelegationController(IPAController):
turbogears.flash("delegate updated") turbogears.flash("delegate updated")
raise turbogears.redirect('/delegate/list') raise turbogears.redirect('/delegate/list')
except (SyntaxError, ipaerror.IPAError), e: except (SyntaxError, ipaerror.IPAError), e:
turbogears.flash("Delegation update failed: " + str(e) + "<br/>" + e.detail[0]['desc']) turbogears.flash("Delegation update failed: " + str(e) + "<br/>" + e.detail[0].get('desc','') + ". " + e.detail[0].get('info',''))
return dict(form=delegate_form, delegate=kw, return dict(form=delegate_form, delegate=kw,
tg_template='ipagui.templates.delegateedit') tg_template='ipagui.templates.delegateedit')
@ -272,7 +272,7 @@ class DelegationController(IPAController):
try: try:
aci_entry = client.get_aci_entry(aci_fields) aci_entry = client.get_aci_entry(aci_fields)
except ipaerror.IPAError, e: except ipaerror.IPAError, e:
turbogears.flash("Delegation list failed: " + str(e) + "<br/>" + e.detail[0]['desc']) turbogears.flash("Delegation list failed: " + str(e) + "<br/>" + e.detail[0].get('desc','') + ". " + e.detail[0].get('info',''))
raise turbogears.redirect('/') raise turbogears.redirect('/')
aci_str_list = aci_entry.getValues('aci') aci_str_list = aci_entry.getValues('aci')
@ -351,7 +351,7 @@ class DelegationController(IPAController):
turbogears.flash("delegate deleted") turbogears.flash("delegate deleted")
raise turbogears.redirect('/delegate/list') raise turbogears.redirect('/delegate/list')
except (SyntaxError, ipaerror.IPAError), e: except (SyntaxError, ipaerror.IPAError), e:
turbogears.flash("Delegation deletion failed: " + str(e) + "<br/>" + e.detail[0]['desc']) turbogears.flash("Delegation deletion failed: " + str(e) + "<br/>" + e.detail[0].get('desc','') + ". " + e.detail[0].get('info',''))
raise turbogears.redirect('/delegate/list') raise turbogears.redirect('/delegate/list')
@expose("ipagui.templates.delegategroupsearch") @expose("ipagui.templates.delegategroupsearch")

12
ipa-server/ipa-gui/ipagui/subcontrollers/group.py
View File

@ -101,7 +101,7 @@ class GroupController(IPAController):
return dict(form=group_new_form, group=kw, return dict(form=group_new_form, group=kw,
tg_template='ipagui.templates.groupnew') tg_template='ipagui.templates.groupnew')
except ipaerror.IPAError, e: except ipaerror.IPAError, e:
turbogears.flash("Group add failed: " + str(e) + "<br/>" + e.detail[0]['desc']) turbogears.flash("Group add failed: " + str(e) + "<br/>" + e.detail[0].get('desc','') + ". " + e.detail[0].get('info',''))
return dict(form=group_new_form, group=kw, return dict(form=group_new_form, group=kw,
tg_template='ipagui.templates.groupnew') tg_template='ipagui.templates.groupnew')
@ -293,7 +293,7 @@ class GroupController(IPAController):
# #
kw['group_orig'] = b64encode(dumps(new_group.toDict())) kw['group_orig'] = b64encode(dumps(new_group.toDict()))
except ipaerror.IPAError, e: except ipaerror.IPAError, e:
turbogears.flash("Group update failed: " + str(e) + "<br/>" + e.detail[0]['desc']) turbogears.flash("Group update failed: " + str(e) + "<br/>" + e.detail[0].get('desc','') + ". " + e.detail[0].get('info',''))
return dict(form=group_edit_form, group=kw, members=member_dicts, return dict(form=group_edit_form, group=kw, members=member_dicts,
tg_template='ipagui.templates.groupedit') tg_template='ipagui.templates.groupedit')
@ -322,7 +322,7 @@ class GroupController(IPAController):
kw['dnadd'] = failed_adds kw['dnadd'] = failed_adds
group_modified = True group_modified = True
except ipaerror.IPAError, e: except ipaerror.IPAError, e:
turbogears.flash("Updating group membership failed: " + str(e) + "<br/>" + e.detail[0]['desc']) turbogears.flash("Updating group membership failed: " + str(e) + "<br/>" + e.detail[0].get('desc','') + ". " + e.detail[0].get('info',''))
return dict(form=group_edit_form, group=kw, members=member_dicts, return dict(form=group_edit_form, group=kw, members=member_dicts,
tg_template='ipagui.templates.groupedit') tg_template='ipagui.templates.groupedit')
@ -340,7 +340,7 @@ class GroupController(IPAController):
kw['dndel'] = failed_dels kw['dndel'] = failed_dels
group_modified = True group_modified = True
except ipaerror.IPAError, e: except ipaerror.IPAError, e:
turbogears.flash("Updating group membership failed: " + str(e) + "<br/>" + e.detail[0]['desc']) turbogears.flash("Updating group membership failed: " + str(e) + "<br/>" + e.detail[0].get('desc','') + ". " + e.detail[0].get('info',''))
return dict(form=group_edit_form, group=kw, members=member_dicts, return dict(form=group_edit_form, group=kw, members=member_dicts,
tg_template='ipagui.templates.groupedit') tg_template='ipagui.templates.groupedit')
@ -391,7 +391,7 @@ class GroupController(IPAController):
turbogears.flash("These results are truncated.<br />" + turbogears.flash("These results are truncated.<br />" +
"Please refine your search and try again.") "Please refine your search and try again.")
except ipaerror.IPAError, e: except ipaerror.IPAError, e:
turbogears.flash("Find groups failed: " + str(e) + "<br/>" + e.detail[0]['desc']) turbogears.flash("Find groups failed: " + str(e) + "<br/>" + e.detail[0].get('desc','') + ". " + e.detail[0].get('info',''))
raise turbogears.redirect("/group/list") raise turbogears.redirect("/group/list")
return dict(groups=groups, criteria=criteria, return dict(groups=groups, criteria=criteria,
@ -435,7 +435,7 @@ class GroupController(IPAController):
turbogears.flash("group deleted") turbogears.flash("group deleted")
raise turbogears.redirect('/group/list') raise turbogears.redirect('/group/list')
except (SyntaxError, ipaerror.IPAError), e: except (SyntaxError, ipaerror.IPAError), e:
turbogears.flash("Group deletion failed: " + str(e) + "<br/>" + e.detail[0]['desc']) turbogears.flash("Group deletion failed: " + str(e) + "<br/>" + e.detail[0].get('desc','') + ". " + e.detail[0].get('info',''))
raise turbogears.redirect('/group/list') raise turbogears.redirect('/group/list')
@validate(form=group_new_form) @validate(form=group_new_form)

2
ipa-server/ipa-gui/ipagui/subcontrollers/ipapolicy.py
View File

@ -198,7 +198,7 @@ class IPAPolicyController(IPAController):
turbogears.flash("IPA Policy updated") turbogears.flash("IPA Policy updated")
raise turbogears.redirect('/ipapolicy/show') raise turbogears.redirect('/ipapolicy/show')
except ipaerror.IPAError, e: except ipaerror.IPAError, e:
turbogears.flash("Policy update failed: " + str(e) + "<br/>" + e.detail[0]['desc']) turbogears.flash("Policy update failed: " + str(e) + "<br/>" + e.detail[0].get('desc','') + ". " + e.detail[0].get('info',''))
return dict(form=ipapolicy_edit_form, ipapolicy=kw, return dict(form=ipapolicy_edit_form, ipapolicy=kw,
tg_template='ipagui.templates.ipapolicyedit') tg_template='ipagui.templates.ipapolicyedit')

6
ipa-server/ipa-gui/ipagui/subcontrollers/principal.py
View File

@ -103,7 +103,7 @@ class PrincipalController(IPAController):
return dict(form=principal_new_form, principal=kw, return dict(form=principal_new_form, principal=kw,
tg_template='ipagui.templates.principalnew') tg_template='ipagui.templates.principalnew')
except ipaerror.IPAError, e: except ipaerror.IPAError, e:
turbogears.flash("Service principal add failed: " + str(e) + "<br/>" + e.detail[0]['desc']) turbogears.flash("Service principal add failed: " + str(e) + "<br/>" + e.detail[0].get('desc','') + ". " + e.detail[0].get('info',''))
return dict(form=principal_new_form, principal=kw, return dict(form=principal_new_form, principal=kw,
tg_template='ipagui.templates.principalnew') tg_template='ipagui.templates.principalnew')
@ -137,7 +137,7 @@ class PrincipalController(IPAController):
principals[i].setValue('hostname', h[0]) principals[i].setValue('hostname', h[0])
except ipaerror.IPAError, e: except ipaerror.IPAError, e:
turbogears.flash("principal list failed: " + str(e) + "<br/>" + e.detail[0]['desc']) turbogears.flash("principal list failed: " + str(e) + "<br/>" + e.detail[0].get('desc','') + ". " + e.detail[0].get('info',''))
raise turbogears.redirect("/principal/list") raise turbogears.redirect("/principal/list")
return dict(principals=principals, hostname=hostname, fields=ipagui.forms.principal.PrincipalFields()) return dict(principals=principals, hostname=hostname, fields=ipagui.forms.principal.PrincipalFields())
@ -184,7 +184,7 @@ class PrincipalController(IPAController):
turbogears.flash("Service principal deleted") turbogears.flash("Service principal deleted")
raise turbogears.redirect('/principal/list') raise turbogears.redirect('/principal/list')
except (SyntaxError, ipaerror.IPAError), e: except (SyntaxError, ipaerror.IPAError), e:
turbogears.flash("Service principal deletion failed: " + str(e) + "<br/>" + e.detail[0]['desc']) turbogears.flash("Service principal deletion failed: " + str(e) + "<br/>" + e.detail[0].get('desc','') + ". " + e.detail[0].get('info',''))
raise turbogears.redirect('/principal/list') raise turbogears.redirect('/principal/list')
@validate(form=principal_new_form) @validate(form=principal_new_form)

18
ipa-server/ipa-gui/ipagui/subcontrollers/user.py
View File

@ -237,7 +237,7 @@ class UserController(IPAController):
return dict(form=user_new_form, user=kw, return dict(form=user_new_form, user=kw,
tg_template='ipagui.templates.usernew') tg_template='ipagui.templates.usernew')
except ipaerror.IPAError, e: except ipaerror.IPAError, e:
turbogears.flash("User add failed: " + str(e) + "<br/>" + e.detail[0]['desc']) turbogears.flash("User add failed: " + str(e) + "<br/>" + e.detail[0].get('desc','') + ". " + e.detail[0].get('info',''))
return dict(form=user_new_form, user=kw, return dict(form=user_new_form, user=kw,
tg_template='ipagui.templates.usernew') tg_template='ipagui.templates.usernew')
@ -403,7 +403,7 @@ class UserController(IPAController):
except ipaerror.IPAError, e: except ipaerror.IPAError, e:
if uid is None: if uid is None:
uid = principal uid = principal
turbogears.flash("User edit failed: " + str(e) + "<br/>" + e.detail[0]['desc']) turbogears.flash("User edit failed: " + str(e) + "<br/>" + e.detail[0].get('desc','') + ". " + e.detail[0].get('info',''))
raise turbogears.redirect('/user/show', uid=uid) raise turbogears.redirect('/user/show', uid=uid)
@expose() @expose()
@ -537,7 +537,7 @@ class UserController(IPAController):
# too much work to figure out unless someone really screams # too much work to figure out unless someone really screams
pass pass
except ipaerror.IPAError, e: except ipaerror.IPAError, e:
turbogears.flash("User update failed: " + str(e) + "<br/>" + e.detail[0]['desc']) turbogears.flash("User update failed: " + str(e) + "<br/>" + e.detail[0].get('desc','') + ". " + e.detail[0].get('info',''))
return dict(form=user_edit_form, user=kw, return dict(form=user_edit_form, user=kw,
user_groups=user_groups_dicts, user_groups=user_groups_dicts,
tg_template='ipagui.templates.useredit') tg_template='ipagui.templates.useredit')
@ -549,7 +549,7 @@ class UserController(IPAController):
if password_change: if password_change:
rv = client.modifyPassword(orig_user_dict['krbprincipalname'], "", kw.get('krbprincipalkey')) rv = client.modifyPassword(orig_user_dict['krbprincipalname'], "", kw.get('krbprincipalkey'))
except ipaerror.IPAError, e: except ipaerror.IPAError, e:
turbogears.flash("User password change failed: " + str(e) + "<br/>" + e.detail[0]['desc']) turbogears.flash("User password change failed: " + str(e) + "<br/>" + e.detail[0].get('desc','') + ". " + e.detail[0].get('info',''))
return dict(form=user_edit_form, user=kw, return dict(form=user_edit_form, user=kw,
user_groups=user_groups_dicts, user_groups=user_groups_dicts,
tg_template='ipagui.templates.useredit') tg_template='ipagui.templates.useredit')
@ -610,7 +610,7 @@ class UserController(IPAController):
elif kw.get('nsAccountLock') == "true" and new_user.nsaccountlock != "true": elif kw.get('nsAccountLock') == "true" and new_user.nsaccountlock != "true":
client.mark_user_inactive(kw.get('uid')) client.mark_user_inactive(kw.get('uid'))
except ipaerror.IPAError, e: except ipaerror.IPAError, e:
turbogears.flash("User status change failed: " + str(e) + "<br/>" + e.detail[0]['desc']) turbogears.flash("User status change failed: " + str(e) + "<br/>" + e.detail[0].get('desc','') + ". " + e.detail[0].get('info',''))
return dict(form=user_edit_form, user=kw, return dict(form=user_edit_form, user=kw,
user_groups=user_groups_dicts, user_groups=user_groups_dicts,
tg_template='ipagui.templates.useredit') tg_template='ipagui.templates.useredit')
@ -637,7 +637,7 @@ class UserController(IPAController):
turbogears.flash("These results are truncated.<br />" + turbogears.flash("These results are truncated.<br />" +
"Please refine your search and try again.") "Please refine your search and try again.")
except ipaerror.IPAError, e: except ipaerror.IPAError, e:
turbogears.flash("User list failed: " + str(e) + "<br/>" + e.detail[0]['desc']) turbogears.flash("User list failed: " + str(e) + "<br/>" + e.detail[0].get('desc','') + ". " + e.detail[0].get('info',''))
raise turbogears.redirect("/user/list") raise turbogears.redirect("/user/list")
return dict(users=users, uid=uid, fields=ipagui.forms.user.UserFields()) return dict(users=users, uid=uid, fields=ipagui.forms.user.UserFields())
@ -680,7 +680,7 @@ class UserController(IPAController):
user_groups=user_groups, user_reports=user_reports, user_groups=user_groups, user_reports=user_reports,
user_manager=user_manager, user_secretary=user_secretary) user_manager=user_manager, user_secretary=user_secretary)
except ipaerror.IPAError, e: except ipaerror.IPAError, e:
turbogears.flash("User show failed: " + str(e) + "<br/>" + e.detail[0]['desc']) turbogears.flash("User show failed: " + str(e) + "<br/>" + e.detail[0].get('desc','') + ". " + e.detail[0].get('info',''))
raise turbogears.redirect("/") raise turbogears.redirect("/")
@expose() @expose()
@ -696,7 +696,7 @@ class UserController(IPAController):
turbogears.flash("user deleted") turbogears.flash("user deleted")
raise turbogears.redirect('/user/list') raise turbogears.redirect('/user/list')
except (SyntaxError, ipaerror.IPAError), e: except (SyntaxError, ipaerror.IPAError), e:
turbogears.flash("User deletion failed: " + str(e) + "<br/>" + e.detail[0]['desc']) turbogears.flash("User deletion failed: " + str(e) + "<br/>" + e.detail[0].get('desc','') + ". " + e.detail[0].get('info',''))
raise turbogears.redirect('/user/list') raise turbogears.redirect('/user/list')
@validate(form=user_new_form) @validate(form=user_new_form)
@ -818,7 +818,7 @@ class UserController(IPAController):
users_counter = users[0] users_counter = users[0]
users = users[1:] users = users[1:]
except ipaerror.IPAError, e: except ipaerror.IPAError, e:
turbogears.flash("search failed: " + str(e) + "<br/>" + e.detail[0]['desc']) turbogears.flash("search failed: " + str(e) + "<br/>" + e.detail[0].get('desc','') + ". " + e.detail[0].get('info',''))
return dict(users=users, criteria=criteria, return dict(users=users, criteria=criteria,
which_select=kw.get('which_select'), which_select=kw.get('which_select'),