+ {% if 'bulk_edit' in actions %}
+ {% bulk_edit_button model query_params=request.GET %}
+ {% endif %}
+ {% if 'bulk_rename' in actions %}
+ {% with bulk_rename_view=model|validated_viewname:"bulk_rename" %}
+
+
+ {% endwith %}
+ {% endif %}
+
+ {% if 'bulk_delete' in actions %}
+ {% bulk_delete_button model query_params=request.GET %}
+ {% endif %}
+{% endblock %}
diff --git a/netbox/templates/dcim/platform.html b/netbox/templates/dcim/platform.html
index a974f9f93..29f405b6e 100644
--- a/netbox/templates/dcim/platform.html
+++ b/netbox/templates/dcim/platform.html
@@ -44,17 +44,6 @@
diff --git a/netbox/templates/users/user.html b/netbox/templates/users/user.html
index fe03f41ed..18c07c1cc 100644
--- a/netbox/templates/users/user.html
+++ b/netbox/templates/users/user.html
@@ -32,7 +32,7 @@
{% trans "Active" %}
- {% checkmark object.active %}
+ {% checkmark object.is_active %}
{% trans "Staff" %}
diff --git a/netbox/users/api/serializers.py b/netbox/users/api/serializers.py
index 1f4bf4ea0..75ab877cf 100644
--- a/netbox/users/api/serializers.py
+++ b/netbox/users/api/serializers.py
@@ -1,11 +1,12 @@
from django.conf import settings
+from django.contrib.auth import authenticate
from django.contrib.auth import get_user_model
from django.contrib.auth.models import Group
from django.contrib.contenttypes.models import ContentType
from drf_spectacular.utils import extend_schema_field
from drf_spectacular.types import OpenApiTypes
from rest_framework import serializers
-from rest_framework.exceptions import PermissionDenied
+from rest_framework.exceptions import AuthenticationFailed, PermissionDenied
from netbox.api.fields import ContentTypeField, IPNetworkSerializer, SerializedPKRelatedField
from netbox.api.serializers import ValidatedModelSerializer
@@ -107,9 +108,42 @@ class TokenSerializer(ValidatedModelSerializer):
return super().validate(data)
-class TokenProvisionSerializer(serializers.Serializer):
- username = serializers.CharField()
- password = serializers.CharField()
+class TokenProvisionSerializer(TokenSerializer):
+ user = NestedUserSerializer(
+ read_only=True
+ )
+ username = serializers.CharField(
+ write_only=True
+ )
+ password = serializers.CharField(
+ write_only=True
+ )
+ last_used = serializers.DateTimeField(
+ read_only=True
+ )
+ key = serializers.CharField(
+ read_only=True
+ )
+
+ class Meta:
+ model = Token
+ fields = (
+ 'id', 'url', 'display', 'user', 'created', 'expires', 'last_used', 'key', 'write_enabled', 'description',
+ 'allowed_ips', 'username', 'password',
+ )
+
+ def validate(self, data):
+ # Validate the username and password
+ username = data.pop('username')
+ password = data.pop('password')
+ user = authenticate(request=self.context.get('request'), username=username, password=password)
+ if user is None:
+ raise AuthenticationFailed("Invalid username/password")
+
+ # Inject the user into the validated data
+ data['user'] = user
+
+ return data
class ObjectPermissionSerializer(ValidatedModelSerializer):
diff --git a/netbox/users/api/views.py b/netbox/users/api/views.py
index 9cf5b1ac5..62a32c71b 100644
--- a/netbox/users/api/views.py
+++ b/netbox/users/api/views.py
@@ -1,3 +1,4 @@
+import logging
from django.contrib.auth import authenticate
from django.contrib.auth import get_user_model
from django.contrib.auth.models import Group
@@ -63,34 +64,21 @@ class TokenProvisionView(APIView):
@extend_schema(
request=serializers.TokenProvisionSerializer,
responses={
- 201: serializers.TokenSerializer,
+ 201: serializers.TokenProvisionSerializer,
401: OpenApiTypes.OBJECT,
}
)
def post(self, request):
- serializer = serializers.TokenProvisionSerializer(data=request.data)
- serializer.is_valid()
+ serializer = serializers.TokenProvisionSerializer(data=request.data, context={'request': request})
+ serializer.is_valid(raise_exception=True)
+ self.perform_create(serializer)
+ return Response(serializer.data, status=HTTP_201_CREATED)
- # Authenticate the user account based on the provided credentials
- username = serializer.data.get('username')
- password = serializer.data.get('password')
- if not username or not password:
- raise AuthenticationFailed("Username and password must be provided to provision a token.")
- user = authenticate(request=request, username=username, password=password)
- if user is None:
- raise AuthenticationFailed("Invalid username/password")
-
- # Create a new Token for the User
- token = Token(user=user)
- token.save()
- data = serializers.TokenSerializer(token, context={'request': request}).data
- # Manually append the token key, which is normally write-only
- data['key'] = token.key
-
- return Response(data, status=HTTP_201_CREATED)
-
- def get_serializer_class(self):
- return serializers.TokenSerializer
+ def perform_create(self, serializer):
+ model = serializer.Meta.model
+ logger = logging.getLogger(f'netbox.api.views.TokenProvisionView')
+ logger.info(f"Creating new {model._meta.verbose_name}")
+ serializer.save()
#
diff --git a/netbox/users/tests/test_api.py b/netbox/users/tests/test_api.py
index 859dd0b83..001142410 100644
--- a/netbox/users/tests/test_api.py
+++ b/netbox/users/tests/test_api.py
@@ -141,17 +141,25 @@ class TokenTest(
"""
Test the provisioning of a new REST API token given a valid username and password.
"""
- data = {
+ user_credentials = {
'username': 'user1',
'password': 'abc123',
}
- user = User.objects.create_user(**data)
+ user = User.objects.create_user(**user_credentials)
+
+ data = {
+ **user_credentials,
+ 'description': 'My API token',
+ 'expires': '2099-12-31T23:59:59Z',
+ }
url = reverse('users-api:token_provision')
response = self.client.post(url, data, format='json', **self.header)
self.assertEqual(response.status_code, 201)
self.assertIn('key', response.data)
self.assertEqual(len(response.data['key']), 40)
+ self.assertEqual(response.data['description'], data['description'])
+ self.assertEqual(response.data['expires'], data['expires'])
token = Token.objects.get(user=user)
self.assertEqual(token.key, response.data['key'])
diff --git a/netbox/users/views.py b/netbox/users/views.py
index 7ff9a8a4d..2e7a47c12 100644
--- a/netbox/users/views.py
+++ b/netbox/users/views.py
@@ -68,7 +68,7 @@ class UserView(generic.ObjectView):
template_name = 'users/user.html'
def get_extra_context(self, request, instance):
- changelog = ObjectChange.objects.restrict(request.user, 'view').filter(user=request.user)[:20]
+ changelog = ObjectChange.objects.restrict(request.user, 'view').filter(user=instance)[:20]
changelog_table = ObjectChangeTable(changelog)
return {
diff --git a/netbox/utilities/templatetags/navigation.py b/netbox/utilities/templatetags/navigation.py
index 4a229e952..7534d7034 100644
--- a/netbox/utilities/templatetags/navigation.py
+++ b/netbox/utilities/templatetags/navigation.py
@@ -26,11 +26,14 @@ def nav(context: Context) -> Dict:
for group in menu.groups:
items = []
for item in group.items:
- if user.has_perms(item.permissions):
- buttons = [
- button for button in item.buttons if user.has_perms(button.permissions)
- ]
- items.append((item, buttons))
+ if not user.has_perms(item.permissions):
+ continue
+ if item.staff_only and not user.is_staff:
+ continue
+ buttons = [
+ button for button in item.buttons if user.has_perms(button.permissions)
+ ]
+ items.append((item, buttons))
if items:
groups.append((group, items))
if groups:
diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py
index cbe953040..173d7047b 100644
--- a/netbox/virtualization/views.py
+++ b/netbox/virtualization/views.py
@@ -397,7 +397,6 @@ class VirtualMachineRenderConfigView(generic.ObjectView):
template_name = 'virtualization/virtualmachine/render_config.html'
tab = ViewTab(
label=_('Render Config'),
- permission='extras.view_configtemplate',
weight=2100
)
diff --git a/requirements.txt b/requirements.txt
index b313f98d6..54f1334ed 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
bleach==6.0.0
-Django==4.2.4
+Django==4.2.5
django-cors-headers==4.2.0
django-debug-toolbar==4.2.0
django-filter==23.2
@@ -12,23 +12,23 @@ django-rich==1.7.0
django-rq==2.8.1
django-tables2==2.6.0
django-taggit==4.0.0
-django-timezone-field==5.1
+django-timezone-field==6.0
djangorestframework==3.14.0
drf-spectacular==0.26.4
-drf-spectacular-sidecar==2023.8.1
+drf-spectacular-sidecar==2023.9.1
feedparser==6.0.10
graphene-django==3.0.0
gunicorn==21.2.0
Jinja2==3.1.2
Markdown==3.3.7
-mkdocs-material==9.2.5
-mkdocstrings[python-legacy]==0.22.0
+mkdocs-material==9.2.7
+mkdocstrings[python-legacy]==0.23.0
netaddr==0.8.0
Pillow==10.0.0
psycopg[binary,pool]==3.1.10
PyYAML==6.0.1
sentry-sdk==1.30.0
-social-auth-app-django==5.2.0
+social-auth-app-django==5.3.0
social-auth-core[openidconnect]==4.4.2
svgwrite==1.4.3
tablib==3.5.0