{% if request.user.is_superuser %}
{% trans "Admin" %}
- {% elif request.user.is_staff %}
- {% trans "Staff" %}
{% else %}
{% trans "User" %}
{% endif %}
diff --git a/netbox/templates/media_failure.html b/netbox/templates/media_failure.html
index 8f357aea1..50ee1b63f 100644
--- a/netbox/templates/media_failure.html
+++ b/netbox/templates/media_failure.html
@@ -37,7 +37,7 @@
path. Refer to
the installation documentation for further guidance.
{% endblocktrans %}
- {% if request.user.is_staff or request.user.is_superuser %}
+ {% if request.user.is_superuser %}
STATIC_ROOT: {{ settings.STATIC_ROOT }}STATIC_URL: {{ settings.STATIC_URL }}{% trans "Active" %} |
{% checkmark object.is_active %} |
-
- | {% trans "Staff" %} |
- {% checkmark object.is_staff %} |
-
| {% trans "Superuser" %} |
{% checkmark object.is_superuser %} |
diff --git a/netbox/users/api/serializers_/users.py b/netbox/users/api/serializers_/users.py
index 7b4dc5a07..da2aa1820 100644
--- a/netbox/users/api/serializers_/users.py
+++ b/netbox/users/api/serializers_/users.py
@@ -52,7 +52,7 @@ class UserSerializer(ValidatedModelSerializer):
model = User
fields = (
'id', 'url', 'display_url', 'display', 'username', 'password', 'first_name', 'last_name', 'email',
- 'is_staff', 'is_active', 'date_joined', 'last_login', 'groups', 'permissions',
+ 'is_active', 'date_joined', 'last_login', 'groups', 'permissions',
)
brief_fields = ('id', 'url', 'display', 'username')
extra_kwargs = {
diff --git a/netbox/users/filtersets.py b/netbox/users/filtersets.py
index af769e437..4e1510410 100644
--- a/netbox/users/filtersets.py
+++ b/netbox/users/filtersets.py
@@ -81,7 +81,7 @@ class UserFilterSet(BaseFilterSet):
class Meta:
model = User
fields = (
- 'id', 'username', 'first_name', 'last_name', 'email', 'date_joined', 'last_login', 'is_staff', 'is_active',
+ 'id', 'username', 'first_name', 'last_name', 'email', 'date_joined', 'last_login', 'is_active',
'is_superuser',
)
diff --git a/netbox/users/forms/bulk_edit.py b/netbox/users/forms/bulk_edit.py
index 7c50f1ed1..bca417b3d 100644
--- a/netbox/users/forms/bulk_edit.py
+++ b/netbox/users/forms/bulk_edit.py
@@ -37,11 +37,6 @@ class UserBulkEditForm(BulkEditForm):
widget=BulkEditNullBooleanSelect,
label=_('Active')
)
- is_staff = forms.NullBooleanField(
- required=False,
- widget=BulkEditNullBooleanSelect,
- label=_('Staff status')
- )
is_superuser = forms.NullBooleanField(
required=False,
widget=BulkEditNullBooleanSelect,
@@ -50,7 +45,7 @@ class UserBulkEditForm(BulkEditForm):
model = User
fieldsets = (
- FieldSet('first_name', 'last_name', 'is_active', 'is_staff', 'is_superuser'),
+ FieldSet('first_name', 'last_name', 'is_active', 'is_superuser'),
)
nullable_fields = ('first_name', 'last_name')
diff --git a/netbox/users/forms/bulk_import.py b/netbox/users/forms/bulk_import.py
index 748338a64..f478dedbf 100644
--- a/netbox/users/forms/bulk_import.py
+++ b/netbox/users/forms/bulk_import.py
@@ -23,8 +23,7 @@ class UserImportForm(CSVModelForm):
class Meta:
model = User
fields = (
- 'username', 'first_name', 'last_name', 'email', 'password', 'is_staff',
- 'is_active', 'is_superuser'
+ 'username', 'first_name', 'last_name', 'email', 'password', 'is_active', 'is_superuser'
)
def save(self, *args, **kwargs):
diff --git a/netbox/users/forms/filtersets.py b/netbox/users/forms/filtersets.py
index 750b77ba4..61e55949c 100644
--- a/netbox/users/forms/filtersets.py
+++ b/netbox/users/forms/filtersets.py
@@ -29,7 +29,7 @@ class UserFilterForm(NetBoxModelFilterSetForm):
fieldsets = (
FieldSet('q', 'filter_id',),
FieldSet('group_id', name=_('Group')),
- FieldSet('is_active', 'is_staff', 'is_superuser', name=_('Status')),
+ FieldSet('is_active', 'is_superuser', name=_('Status')),
)
group_id = DynamicModelMultipleChoiceField(
queryset=Group.objects.all(),
@@ -43,13 +43,6 @@ class UserFilterForm(NetBoxModelFilterSetForm):
),
label=_('Is Active'),
)
- is_staff = forms.NullBooleanField(
- required=False,
- widget=forms.Select(
- choices=BOOLEAN_WITH_BLANK_CHOICES
- ),
- label=_('Is Staff'),
- )
is_superuser = forms.NullBooleanField(
required=False,
widget=forms.Select(
diff --git a/netbox/users/forms/model_forms.py b/netbox/users/forms/model_forms.py
index 505104c03..127e43e5a 100644
--- a/netbox/users/forms/model_forms.py
+++ b/netbox/users/forms/model_forms.py
@@ -192,7 +192,7 @@ class UserForm(forms.ModelForm):
fieldsets = (
FieldSet('username', 'password', 'confirm_password', 'first_name', 'last_name', 'email', name=_('User')),
FieldSet('groups', name=_('Groups')),
- FieldSet('is_active', 'is_staff', 'is_superuser', name=_('Status')),
+ FieldSet('is_active', 'is_superuser', name=_('Status')),
FieldSet('object_permissions', name=_('Permissions')),
)
@@ -200,7 +200,7 @@ class UserForm(forms.ModelForm):
model = User
fields = [
'username', 'first_name', 'last_name', 'email', 'groups', 'object_permissions',
- 'is_active', 'is_staff', 'is_superuser',
+ 'is_active', 'is_superuser',
]
def __init__(self, *args, **kwargs):
diff --git a/netbox/users/graphql/filters.py b/netbox/users/graphql/filters.py
index 60a80181b..07f28bb88 100644
--- a/netbox/users/graphql/filters.py
+++ b/netbox/users/graphql/filters.py
@@ -27,7 +27,6 @@ class UserFilter(BaseObjectTypeFilterMixin):
last_name: FilterLookup[str] | None = strawberry_django.filter_field()
email: FilterLookup[str] | None = strawberry_django.filter_field()
is_superuser: FilterLookup[bool] | None = strawberry_django.filter_field()
- is_staff: FilterLookup[bool] | None = strawberry_django.filter_field()
is_active: FilterLookup[bool] | None = strawberry_django.filter_field()
date_joined: DatetimeFilterLookup[datetime] | None = strawberry_django.filter_field()
last_login: DatetimeFilterLookup[datetime] | None = strawberry_django.filter_field()
diff --git a/netbox/users/graphql/types.py b/netbox/users/graphql/types.py
index c5b338553..5231194e5 100644
--- a/netbox/users/graphql/types.py
+++ b/netbox/users/graphql/types.py
@@ -25,7 +25,7 @@ class GroupType(BaseObjectType):
@strawberry_django.type(
User,
fields=[
- 'id', 'username', 'first_name', 'last_name', 'email', 'is_staff', 'is_active', 'date_joined', 'groups',
+ 'id', 'username', 'first_name', 'last_name', 'email', 'is_active', 'date_joined', 'groups',
],
filters=UserFilter,
pagination=True
diff --git a/netbox/users/migrations/0012_user_remove_is_staff.py b/netbox/users/migrations/0012_user_remove_is_staff.py
new file mode 100644
index 000000000..04f90107d
--- /dev/null
+++ b/netbox/users/migrations/0012_user_remove_is_staff.py
@@ -0,0 +1,15 @@
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('users', '0011_concrete_objecttype'),
+ ]
+
+ operations = [
+ migrations.RemoveField(
+ model_name='user',
+ name='is_staff',
+ ),
+ ]
diff --git a/netbox/users/models/users.py b/netbox/users/models/users.py
index b5308f8d5..4a7e917b3 100644
--- a/netbox/users/models/users.py
+++ b/netbox/users/models/users.py
@@ -1,12 +1,16 @@
+from django.contrib.auth.base_user import AbstractBaseUser
from django.contrib.auth.models import (
- AbstractUser,
GroupManager as DjangoGroupManager,
Permission,
+ PermissionsMixin,
UserManager as DjangoUserManager
)
+from django.contrib.auth.validators import UnicodeUsernameValidator
from django.core.exceptions import ValidationError
+from django.core.mail import send_mail
from django.db import models
from django.urls import reverse
+from django.utils import timezone
from django.utils.translation import gettext_lazy as _
from utilities.querysets import RestrictedQuerySet
@@ -68,10 +72,48 @@ class Group(models.Model):
class UserManager(DjangoUserManager.from_queryset(RestrictedQuerySet)):
- pass
+
+ def create_user(self, username, email=None, password=None, **extra_fields):
+ extra_fields.setdefault("is_superuser", False)
+ return self._create_user(username, email, password, **extra_fields)
-class User(AbstractUser):
+class User(AbstractBaseUser, PermissionsMixin):
+ username = models.CharField(
+ _("username"),
+ max_length=150,
+ unique=True,
+ help_text=_("Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only."),
+ validators=[UnicodeUsernameValidator()],
+ error_messages={
+ "unique": _("A user with that username already exists."),
+ },
+ )
+ first_name = models.CharField(
+ _("first name"),
+ max_length=150,
+ blank=True,
+ )
+ last_name = models.CharField(
+ _("last name"),
+ max_length=150,
+ blank=True,
+ )
+ email = models.EmailField(
+ _("email address"),
+ blank=True,
+ )
+ is_active = models.BooleanField(
+ _("active"),
+ default=True,
+ help_text=_(
+ "Designates whether this user should be treated as active. Unselect this instead of deleting accounts."
+ ),
+ )
+ date_joined = models.DateTimeField(
+ _("date joined"),
+ default=timezone.now,
+ )
groups = models.ManyToManyField(
to='users.Group',
verbose_name=_('groups'),
@@ -87,6 +129,11 @@ class User(AbstractUser):
objects = UserManager()
+ # Ensure compatibility with Django's stock User model
+ EMAIL_FIELD = "email"
+ USERNAME_FIELD = "username"
+ REQUIRED_FIELDS = ["email"]
+
class Meta:
ordering = ('username',)
verbose_name = _('user')
@@ -98,7 +145,25 @@ class User(AbstractUser):
def clean(self):
super().clean()
+ # Normalize email address
+ self.email = self.__class__.objects.normalize_email(self.email)
+
# Check for any existing Users with names that differ only in case
model = self._meta.model
if model.objects.exclude(pk=self.pk).filter(username__iexact=self.username).exists():
raise ValidationError(_("A user with this username already exists."))
+
+ def get_full_name(self):
+ """
+ Return the first_name plus the last_name, with a space in between.
+ """
+ full_name = "%s %s" % (self.first_name, self.last_name)
+ return full_name.strip()
+
+ def get_short_name(self):
+ """Return the short name for the user."""
+ return self.first_name
+
+ def email_user(self, subject, message, from_email=None, **kwargs):
+ """Send an email to this user."""
+ send_mail(subject, message, from_email, [self.email], **kwargs)
diff --git a/netbox/users/tables.py b/netbox/users/tables.py
index fc2f9702d..40cbeca47 100644
--- a/netbox/users/tables.py
+++ b/netbox/users/tables.py
@@ -38,9 +38,6 @@ class UserTable(NetBoxTable):
is_active = columns.BooleanColumn(
verbose_name=_('Is Active'),
)
- is_staff = columns.BooleanColumn(
- verbose_name=_('Is Staff'),
- )
is_superuser = columns.BooleanColumn(
verbose_name=_('Is Superuser'),
)
@@ -51,8 +48,8 @@ class UserTable(NetBoxTable):
class Meta(NetBoxTable.Meta):
model = User
fields = (
- 'pk', 'id', 'username', 'first_name', 'last_name', 'email', 'groups', 'is_active', 'is_staff',
- 'is_superuser', 'last_login',
+ 'pk', 'id', 'username', 'first_name', 'last_name', 'email', 'groups', 'is_active', 'is_superuser',
+ 'last_login',
)
default_columns = ('pk', 'username', 'first_name', 'last_name', 'email', 'is_active')
diff --git a/netbox/users/tests/test_filtersets.py b/netbox/users/tests/test_filtersets.py
index 8b683b346..e15df0d18 100644
--- a/netbox/users/tests/test_filtersets.py
+++ b/netbox/users/tests/test_filtersets.py
@@ -30,7 +30,6 @@ class UserTestCase(TestCase, BaseFilterSetTests):
first_name='Hank',
last_name='Hill',
email='hank@stricklandpropane.com',
- is_staff=True,
is_superuser=True
),
User(
@@ -98,10 +97,6 @@ class UserTestCase(TestCase, BaseFilterSetTests):
params = {'is_active': True}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
- def test_is_staff(self):
- params = {'is_staff': True}
- self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1)
-
def test_is_superuser(self):
params = {'is_superuser': True}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1)
diff --git a/netbox/utilities/api.py b/netbox/utilities/api.py
index 0aec1daef..6e7ce5ffb 100644
--- a/netbox/utilities/api.py
+++ b/netbox/utilities/api.py
@@ -6,6 +6,7 @@ from django.db.models.fields.related import ManyToOneRel, RelatedField
from django.urls import reverse
from django.utils.module_loading import import_string
from django.utils.translation import gettext_lazy as _
+from rest_framework.permissions import BasePermission
from rest_framework.serializers import Serializer
from rest_framework.views import get_view_name as drf_get_view_name
@@ -16,6 +17,7 @@ from .query import count_related, dict_to_filter_params
from .string import title
__all__ = (
+ 'IsSuperuser',
'get_annotations_for_serializer',
'get_graphql_type_for_model',
'get_prefetches_for_serializer',
@@ -27,6 +29,14 @@ __all__ = (
)
+class IsSuperuser(BasePermission):
+ """
+ Allows access only to superusers.
+ """
+ def has_permission(self, request, view):
+ return bool(request.user and request.user.is_superuser)
+
+
def get_serializer_for_model(model, prefix=''):
"""
Return the appropriate REST API serializer for the given model.
diff --git a/netbox/utilities/datetime.py b/netbox/utilities/datetime.py
index d54ea7c46..e3853cd99 100644
--- a/netbox/utilities/datetime.py
+++ b/netbox/utilities/datetime.py
@@ -20,9 +20,4 @@ def datetime_from_timestamp(value):
"""
Convert an ISO 8601 or RFC 3339 timestamp to a datetime object.
"""
- # Work around UTC issue for Python < 3.11; see
- # https://docs.python.org/3/library/datetime.html#datetime.datetime.fromisoformat
- # TODO: Remove this once Python 3.10 is no longer supported
- if type(value) is str and value.endswith('Z'):
- value = f'{value[:-1]}+00:00'
return datetime.datetime.fromisoformat(value)
diff --git a/netbox/utilities/templatetags/navigation.py b/netbox/utilities/templatetags/navigation.py
index 176996aa1..2c7ce18dd 100644
--- a/netbox/utilities/templatetags/navigation.py
+++ b/netbox/utilities/templatetags/navigation.py
@@ -30,7 +30,7 @@ def nav(context):
continue
if not user.has_perms(item.permissions):
continue
- if item.staff_only and not user.is_staff:
+ if item.staff_only and not user.is_superuser:
continue
buttons = [
button for button in item.buttons if user.has_perms(button.permissions)
diff --git a/pyproject.toml b/pyproject.toml
index ca437c649..bd84e8bb6 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@
[project]
name = "netbox"
version = "4.4.0"
-requires-python = ">=3.10"
+requires-python = ">=3.12"
description = "The premier source of truth powering network automation."
readme = "README.md"
license = "Apache-2.0"
@@ -15,9 +15,9 @@ classifiers = [
"Natural Language :: English",
"Programming Language :: Python",
"Programming Language :: Python :: 3 :: Only",
- "Programming Language :: Python :: 3.10",
- "Programming Language :: Python :: 3.11",
"Programming Language :: Python :: 3.12",
+ "Programming Language :: Python :: 3.13",
+ "Programming Language :: Python :: 3.14",
]
[project.urls]
@@ -28,7 +28,7 @@ Issues = "https://github.com/netbox-community/netbox/issues"
[tool.black]
line-length = 120
-target_version = ['py310', 'py311', 'py312']
+target_version = ['py312', 'py313', 'py314']
skip-string-normalization = true
[tool.isort]
diff --git a/upgrade.sh b/upgrade.sh
index 75a3ffc7f..ac4788def 100755
--- a/upgrade.sh
+++ b/upgrade.sh
@@ -4,7 +4,7 @@
# This script will invoke Python with the value of the PYTHON environment
# variable (if set), or fall back to "python3". Note that NetBox v4.0+ requires
-# Python 3.10 or later.
+# Python 3.12 or later.
# Parse arguments
if [[ "$1" == "--readonly" ]]; then
@@ -22,15 +22,15 @@ VIRTUALENV="$(pwd -P)/venv"
PYTHON="${PYTHON:-python3}"
# Validate the minimum required Python version
-COMMAND="${PYTHON} -c 'import sys; exit(1 if sys.version_info < (3, 10) else 0)'"
+COMMAND="${PYTHON} -c 'import sys; exit(1 if sys.version_info < (3, 12) else 0)'"
PYTHON_VERSION=$(eval "${PYTHON} -V")
eval $COMMAND || {
echo "--------------------------------------------------------------------"
echo "ERROR: Unsupported Python version: ${PYTHON_VERSION}. NetBox requires"
- echo "Python 3.10 or later. To specify an alternate Python executable, set"
+ echo "Python 3.12 or later. To specify an alternate Python executable, set"
echo "the PYTHON environment variable. For example:"
echo ""
- echo " sudo PYTHON=/usr/bin/python3.10 ./upgrade.sh"
+ echo " sudo PYTHON=/usr/bin/python3.12 ./upgrade.sh"
echo ""
echo "To show your current Python version: ${PYTHON} -V"
echo "--------------------------------------------------------------------"