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

#68: Improved permissions-related error handling

Browse Source
This commit is contained in:
Jeremy Stretch
2016-07-06 17:22:10 -04:00
parent e7f21dea4b
commit 966ea45050
5 changed files with 62 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
netbox/secrets/api/views.py
View File

@ -4,6 +4,7 @@ from django.shortcuts import get_object_or_404
from rest_framework import generics from rest_framework import generics
from rest_framework import status from rest_framework import status
from rest_framework.exceptions import PermissionDenied
from rest_framework.permissions import IsAuthenticated from rest_framework.permissions import IsAuthenticated
from rest_framework.renderers import JSONRenderer from rest_framework.renderers import JSONRenderer
from rest_framework.response import Response from rest_framework.response import Response
@ -108,14 +109,15 @@ class SecretDetailView(generics.GenericAPIView):
{'error': ERR_USERKEY_INACTIVE}, {'error': ERR_USERKEY_INACTIVE},
status=status.HTTP_400_BAD_REQUEST status=status.HTTP_400_BAD_REQUEST
) )
if secret.decryptable_by(request.user): if not secret.decryptable_by(request.user):
master_key = uk.get_master_key(private_key) raise PermissionDenied(detail="You do not have permission to decrypt this secret.")
if master_key is None: master_key = uk.get_master_key(private_key)
return Response( if master_key is None:
{'error': ERR_PRIVKEY_INVALID}, return Response(
status=status.HTTP_400_BAD_REQUEST {'error': ERR_PRIVKEY_INVALID},
) status=status.HTTP_400_BAD_REQUEST
secret.decrypt(master_key) )
secret.decrypt(master_key)
serializer = self.get_serializer(secret) serializer = self.get_serializer(secret)
return Response(serializer.data) return Response(serializer.data)

0
netbox/secrets/templatetags/__init__.py Normal file
View File

12
netbox/secrets/templatetags/secret_helpers.py Normal file
View File

@ -0,0 +1,12 @@
from django import template
register = template.Library()
@register.filter()
def decryptable_by(secret, user):
"""
Determine whether a given User is permitted to decrypt a Secret.
"""
return secret.decryptable_by(user)

19
netbox/templates/secrets/inc/secret_tr.html
View File

@ -1,13 +1,20 @@
{% load secret_helpers %}
<tr> <tr>
<td><a href="{% url 'secrets:secret' pk=secret.pk %}">{{ secret.role }}</a></td> <td><a href="{% url 'secrets:secret' pk=secret.pk %}">{{ secret.role }}</a></td>
<td>{{ secret.name }}</td> <td>{{ secret.name }}</td>
<td id="secret_{{ secret.pk }}">********</td> <td id="secret_{{ secret.pk }}">********</td>
<td class="text-right"> <td class="text-right">
<button class="btn btn-xs btn-success unlock-secret" secret-id="{{ secret.pk }}"> {% if secret|decryptable_by:request.user %}
<i class="fa fa-lock"></i> Unlock <button class="btn btn-xs btn-success unlock-secret" secret-id="{{ secret.pk }}">
</button> <i class="fa fa-lock"></i> Unlock
<button class="btn btn-xs btn-danger lock-secret collapse" secret-id="{{ secret.pk }}"> </button>
<i class="fa fa-unlock-alt"></i> Lock <button class="btn btn-xs btn-danger lock-secret collapse" secret-id="{{ secret.pk }}">
</button> <i class="fa fa-unlock-alt"></i> Lock
</button>
{% else %}
<button class="btn btn-xs btn-default" disabled="disabled" title="Permission denied">
<i class="fa fa-lock"></i> Unlock
</button>
{% endif %}
</td> </td>
</tr> </tr>

46
netbox/templates/secrets/secret.html
View File

@ -1,5 +1,6 @@
{% extends '_base.html' %} {% extends '_base.html' %}
{% load static from staticfiles %} {% load static from staticfiles %}
{% load secret_helpers %}
{% block title %}Secret: {{ secret }}{% endblock %} {% block title %}Secret: {{ secret }}{% endblock %}
@ -67,28 +68,35 @@
</div> </div>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<div class="panel panel-default"> {% if secret|decryptable_by:request.user %}
<div class="panel-heading"> <div class="panel panel-default">
<strong>Secret Data</strong> <div class="panel-heading">
</div> <strong>Secret Data</strong>
<div class="panel-body"> </div>
<form id="secret_form"> <div class="panel-body">
{% csrf_token %} <form id="secret_form">
</form> {% csrf_token %}
<div class="row"> </form>
<div class="col-md-2">Secret</div> <div class="row">
<div class="col-md-8" id="secret_{{ secret.pk }}">********</div> <div class="col-md-2">Secret</div>
<div class="col-md-2 text-right"> <div class="col-md-8" id="secret_{{ secret.pk }}">********</div>
<button class="btn btn-xs btn-success unlock-secret" secret-id="{{ secret.pk }}"> <div class="col-md-2 text-right">
<i class="fa fa-lock"></i> Unlock <button class="btn btn-xs btn-success unlock-secret" secret-id="{{ secret.pk }}">
</button> <i class="fa fa-lock"></i> Unlock
<button class="btn btn-xs btn-danger lock-secret collapse" secret-id="{{ secret.pk }}"> </button>
<i class="fa fa-unlock-alt"></i> Lock <button class="btn btn-xs btn-danger lock-secret collapse" secret-id="{{ secret.pk }}">
</button> <i class="fa fa-unlock-alt"></i> Lock
</button>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> {% else %}
<div class="alert alert-warning">
<i class="glyphicon glyphicon-exclamation-sign" aria-hidden="true"></i>
You do not have permission to decrypt this secret.
</div>
{% endif %}
</div> </div>
</div> </div>