mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Fixes #1312: Catch error when attempting to activate a user key with an invalid private key

Browse Source
This commit is contained in:
Jeremy Stretch
2017-07-12 10:06:13 -04:00
parent dc77400ab1
commit af9fa85cc1
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
netbox/secrets/admin.py
View File

@ -42,13 +42,15 @@ class UserKeyAdmin(admin.ModelAdmin):
if 'activate' in request.POST: if 'activate' in request.POST:
form = ActivateUserKeyForm(request.POST) form = ActivateUserKeyForm(request.POST)
if form.is_valid(): if form.is_valid():
try:
master_key = my_userkey.get_master_key(form.cleaned_data['secret_key']) master_key = my_userkey.get_master_key(form.cleaned_data['secret_key'])
if master_key is not None:
for uk in form.cleaned_data['_selected_action']: for uk in form.cleaned_data['_selected_action']:
uk.activate(master_key) uk.activate(master_key)
return redirect('admin:secrets_userkey_changelist') return redirect('admin:secrets_userkey_changelist')
except ValueError: else:
messages.error(request, "Invalid private key provided. Unable to retrieve master key.") messages.error(
request, "Invalid private key provided. Unable to retrieve master key.", extra_tags='error'
)
else: else:
form = ActivateUserKeyForm(initial={'_selected_action': request.POST.getlist(admin.ACTION_CHECKBOX_NAME)}) form = ActivateUserKeyForm(initial={'_selected_action': request.POST.getlist(admin.ACTION_CHECKBOX_NAME)})