NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-21 03:27:21 -06:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Fixes #5408: Fix updating secrets without setting new plaintext

Browse Source
This commit is contained in:
Jeremy Stretch 2020-12-03 15:22:44 -05:00
parent d75696b30a
commit 584b8109a0
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/release-notes/version-2.9.md
View File

@ -7,6 +7,7 @@
* [#5383](https://github.com/netbox-community/netbox/issues/5383) - Fix setting user password via REST API * [#5383](https://github.com/netbox-community/netbox/issues/5383) - Fix setting user password via REST API
* [#5396](https://github.com/netbox-community/netbox/issues/5396) - Fix uniqueness constraint for virtual machine names * [#5396](https://github.com/netbox-community/netbox/issues/5396) - Fix uniqueness constraint for virtual machine names
* [#5407](https://github.com/netbox-community/netbox/issues/5407) - Add direct link to secret on secrets list * [#5407](https://github.com/netbox-community/netbox/issues/5407) - Add direct link to secret on secrets list
* [#5408](https://github.com/netbox-community/netbox/issues/5408) - Fix updating secrets without setting new plaintext
--- ---

26
netbox/secrets/views.py
View File

@ -108,13 +108,14 @@ class SecretEditView(ObjectEditView):
if form.is_valid(): if form.is_valid():
logger.debug("Form validation was successful") logger.debug("Form validation was successful")
secret = form.save(commit=False)
# We must have a session key in order to create a secret or update the plaintext of an existing secret # We must have a session key in order to set the plaintext of a Secret
if (form.cleaned_data['plaintext'] or secret.pk is None) and session_key is None: if form.cleaned_data['plaintext'] and session_key is None:
logger.debug("Unable to proceed: No session key was provided with the request") logger.debug("Unable to proceed: No session key was provided with the request")
form.add_error(None, "No session key was provided with the request. Unable to encrypt secret data.") form.add_error(None, "No session key was provided with the request. Unable to encrypt secret data.")
else: elif form.cleaned_data['plaintext']:
master_key = None master_key = None
try: try:
sk = SessionKey.objects.get(userkey__user=request.user) sk = SessionKey.objects.get(userkey__user=request.user)
@ -125,19 +126,18 @@ class SecretEditView(ObjectEditView):
if master_key is not None: if master_key is not None:
logger.debug("Successfully resolved master key for encryption") logger.debug("Successfully resolved master key for encryption")
secret = form.save(commit=False) secret.plaintext = str(form.cleaned_data['plaintext'])
if form.cleaned_data['plaintext']:
secret.plaintext = str(form.cleaned_data['plaintext'])
secret.encrypt(master_key) secret.encrypt(master_key)
secret.save()
form.save_m2m()
msg = '{} secret'.format('Created' if not form.instance.pk else 'Modified') secret.save()
logger.info(f"{msg} {secret} (PK: {secret.pk})") form.save_m2m()
msg = '{} <a href="{}">{}</a>'.format(msg, secret.get_absolute_url(), escape(secret))
messages.success(request, mark_safe(msg))
return redirect(self.get_return_url(request, secret)) msg = '{} secret'.format('Created' if not form.instance.pk else 'Modified')
logger.info(f"{msg} {secret} (PK: {secret.pk})")
msg = f'{msg} <a href="{secret.get_absolute_url()}">{escape(secret)}</a>'
messages.success(request, mark_safe(msg))
return redirect(self.get_return_url(request, secret))
else: else:
logger.debug("Form validation failed") logger.debug("Form validation failed")