Merge pull request #38 from netboxlabs/develop

🚚 release

Author: mfiedorowicz

README.md

@@ -55,7 +55,7 @@ PLUGINS_CONFIG = {
         # User allowed for NetBox to Diode communication
         "netbox_to_diode_username": "netbox-to-diode",
 
-        # # User allowed for data ingestion
+        # User allowed for data ingestion
         "diode_username": "diode-ingestion",
     },
 }

netbox_diode_plugin/migrations/0001_initial.py

@@ -24,18 +24,13 @@ def _read_secret(secret_name, default=None):
             return f.readline().strip()
 
 
-def _create_user_with_token(
-    apps, user_category, username, group, is_superuser: bool = False
-):
+def _create_user_with_token(apps, user_category, username, group):
     User = apps.get_model(netbox_settings.AUTH_USER_MODEL)
     """Create a user with the given username and API key if it does not exist."""
     try:
         user = User.objects.get(username=username)
     except User.DoesNotExist:
-        if is_superuser:
-            user = User.objects.create_superuser(username=username, is_active=True)
-        else:
-            user = User.objects.create(username=username, is_active=True)
+        user = User.objects.create(username=username, is_active=True)
 
     user.groups.add(*[group.id])
 
@@ -56,22 +51,10 @@ def configure_plugin(apps, schema_editor):
     Group = apps.get_model("users", "Group")
     group, _ = Group.objects.get_or_create(name="diode")
 
-    diode_to_netbox_user_id = None
-
-    for user_category, username in get_diode_usernames().items():
-        is_superuser = user_category in ("netbox_to_diode",)
-        user = _create_user_with_token(
-            apps, user_category, username, group, is_superuser
-        )
-        if user_category == "diode_to_netbox":
-            diode_to_netbox_user_id = user.id
-
     app_config = django_apps.get_app_config("netbox_diode_plugin")
-
     create_contenttypes(app_config, verbosity=0)
 
     ContentType = apps.get_model("contenttypes", "ContentType")
-
     diode_plugin_object_type = ContentType.objects.get(
         app_label="netbox_diode_plugin", model="diode"
     )
@@ -81,9 +64,16 @@ def configure_plugin(apps, schema_editor):
         name="Diode",
         actions=["add", "view"],
     )
+    permission.object_types.set([diode_plugin_object_type.id])
+
+    diode_to_netbox_user_id = None
+
+    for user_category, username in get_diode_usernames().items():
+        user = _create_user_with_token(apps, user_category, username, group)
+        if user_category == "diode_to_netbox":
+            diode_to_netbox_user_id = user.id
 
     permission.users.set([diode_to_netbox_user_id])
-    permission.object_types.set([diode_plugin_object_type.id])
 
 
 class Migration(migrations.Migration):

netbox_diode_plugin/migrations/0005_revoke_superuser_status.py

@@ -0,0 +1,36 @@
+#!/usr/bin/env python
+# Copyright 2024 NetBox Labs Inc
+"""Diode Netbox Plugin - Database migrations."""
+
+from django.db import migrations
+
+from netbox_diode_plugin.plugin_config import get_diode_usernames
+
+
+def revoke_superuser_status(apps, schema_editor):
+    """Revoke superuser status."""
+    diode_usernames = get_diode_usernames().values()
+    User = apps.get_model("users", "User")
+    users = User.objects.filter(username__in=diode_usernames, groups__name="diode")
+
+    for user in users:
+        user.is_staff = False
+        user.is_superuser = False
+        user.save()
+
+
+class Migration(migrations.Migration):
+    """0005_revoke_superuser_status migration."""
+
+    dependencies = [
+        ("netbox_diode_plugin", "0001_initial"),
+        ("netbox_diode_plugin", "0002_setting"),
+        ("netbox_diode_plugin", "0003_clear_permissions"),
+        ("netbox_diode_plugin", "0004_rename_legacy_users"),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            code=revoke_superuser_status, reverse_code=migrations.RunPython.noop
+        ),
+    ]