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 #1132: Prompt user to unlock session key when importing secrets

Browse Source
This commit is contained in:
Jeremy Stretch
2017-05-03 11:47:28 -04:00
parent 9d9de6b2a3
commit 7eb9c8265c
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
netbox/project-static/js/secrets.js
View File

@ -15,8 +15,11 @@ $(document).ready(function() {
}); });
// Adding/editing a secret // Adding/editing a secret
$('form.requires-session-key').submit(function(event) { $('form').submit(function(event) {
if ($('#id_plaintext').val() && document.cookie.indexOf('session_key') == -1) { if (
$(this).find('input.requires-session-key').filter(function() {return this.value == ""}) &&
document.cookie.indexOf('session_key') == -1
) {
$('#privkey_modal').modal('show'); $('#privkey_modal').modal('show');
event.preventDefault(); event.preventDefault();
} }

4
netbox/secrets/forms.py
View File

@ -48,7 +48,7 @@ class SecretRoleForm(BootstrapMixin, forms.ModelForm):
class SecretForm(BootstrapMixin, forms.ModelForm): class SecretForm(BootstrapMixin, forms.ModelForm):
plaintext = forms.CharField(max_length=65535, required=False, label='Plaintext', plaintext = forms.CharField(max_length=65535, required=False, label='Plaintext',
widget=forms.PasswordInput()) widget=forms.PasswordInput(attrs={'class': 'requires-session-key'}))
plaintext2 = forms.CharField(max_length=65535, required=False, label='Plaintext (verify)', plaintext2 = forms.CharField(max_length=65535, required=False, label='Plaintext (verify)',
widget=forms.PasswordInput()) widget=forms.PasswordInput())
@ -82,7 +82,7 @@ class SecretFromCSVForm(forms.ModelForm):
class SecretImportForm(BootstrapMixin, BulkImportForm): class SecretImportForm(BootstrapMixin, BulkImportForm):
csv = CSVDataField(csv_form=SecretFromCSVForm) csv = CSVDataField(csv_form=SecretFromCSVForm, widget=forms.Textarea(attrs={'class': 'requires-session-key'}))
class SecretBulkEditForm(BootstrapMixin, BulkEditForm): class SecretBulkEditForm(BootstrapMixin, BulkEditForm):

2
netbox/templates/secrets/secret_edit.html
View File

@ -5,7 +5,7 @@
{% block title %}{% if secret.pk %}Editing {{ secret }}{% else %}Add a Secret{% endif %}{% endblock %} {% block title %}{% if secret.pk %}Editing {{ secret }}{% else %}Add a Secret{% endif %}{% endblock %}
{% block content %} {% block content %}
<form action="." method="post" class="form form-horizontal requires-session-key"> <form action="." method="post" class="form form-horizontal">
{% csrf_token %} {% csrf_token %}
{{ form.private_key }} {{ form.private_key }}
<div class="row"> <div class="row">