From eb59ee7a7d65c300b4c06d207cbeef335ed05127 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 12 Jul 2017 10:06:13 -0400 Subject: [PATCH] Fixes #1312: Catch error when attempting to activate a user key with an invalid private key --- netbox/secrets/admin.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/netbox/secrets/admin.py b/netbox/secrets/admin.py index 3780dccd2..ac7a91fd6 100644 --- a/netbox/secrets/admin.py +++ b/netbox/secrets/admin.py @@ -42,13 +42,15 @@ class UserKeyAdmin(admin.ModelAdmin): if 'activate' in request.POST: form = ActivateUserKeyForm(request.POST) 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']: uk.activate(master_key) return redirect('admin:secrets_userkey_changelist') - except ValueError: - messages.error(request, "Invalid private key provided. Unable to retrieve master key.") + else: + messages.error( + request, "Invalid private key provided. Unable to retrieve master key.", extra_tags='error' + ) else: form = ActivateUserKeyForm(initial={'_selected_action': request.POST.getlist(admin.ACTION_CHECKBOX_NAME)})