Merge e130d69c5b into c861c0bcc5

- Use default for key
- Changed message to not print the token

.github/workflows/push.yml

@@ -19,8 +19,15 @@ jobs:
     runs-on: ubuntu-24.04
     name: Checks syntax of our code
     permissions:
+      # contents permission to clone the repository
       contents: read
       packages: read
+      # issues and pull-requests permissions to write results as pull
+      # request comments. Omit them if you don't need summary comments
+      issues: write
+      pull-requests: write
+      # To report GitHub Actions status checks. Omit if you don't need
+      # to update commit status
       statuses: write
     steps:
       - uses: actions/checkout@v6
@@ -77,7 +84,7 @@ jobs:
         uses: actions/checkout@v6
       - id: buildx-setup
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
       - id: arm-install-skopeo
         name: Install 'skopeo' on ARM64
         if: matrix.os == 'ubuntu-24.04-arm'

.github/workflows/release.yml

@@ -47,7 +47,7 @@ jobs:
       # docker.io
       - id: docker-io-login
         name: Login to docker.io
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           registry: docker.io
           username: ${{ secrets.dockerhub_username }}
@@ -55,7 +55,7 @@ jobs:
         if: steps.check-build-needed.outputs.skipped != 'true'
       - id: buildx-setup
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
         with:
           version: "lab:latest"
           driver: cloud
@@ -64,7 +64,7 @@ jobs:
       # quay.io
       - id: quay-io-login
         name: Login to Quay.io
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           registry: quay.io
           username: ${{ secrets.quayio_username }}
@@ -73,7 +73,7 @@ jobs:
       # ghcr.io
       - id: ghcr-io-login
         name: Login to GitHub Container Registry
-        uses: docker/login-action@v3
+        uses: docker/login-action@v4
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}

VERSION

@@ -1 +1 @@
-4.0.1
+4.0.2

configuration/configuration.py

@@ -322,7 +322,7 @@ SOCIAL_AUTH_OIDC_OIDC_ENDPOINT = environ.get('SOCIAL_AUTH_OIDC_OIDC_ENDPOINT')
 SOCIAL_AUTH_OIDC_KEY = environ.get('SOCIAL_AUTH_OIDC_KEY')
 SOCIAL_AUTH_OIDC_SECRET = _read_secret('oidc_secret', environ.get('SOCIAL_AUTH_OIDC_SECRET', ''))
 SOCIAL_AUTH_OIDC_SCOPE = _environ_get_and_map('SOCIAL_AUTH_OIDC_SCOPE', '', _AS_LIST)
-LOGOUT_REDIRECT_URL = environ.get('LOGOUT_REDIRECT_URL')
+LOGOUT_REDIRECT_URL = environ.get('LOGOUT_REDIRECT_URL','/')
 SOCIAL_AUTH_OIDC_JWT_ALGORITHMS = _environ_get_and_map('SOCIAL_AUTH_OIDC_JWT_ALGORITHMS', "RS256", _AS_LIST)
 
 # This repository is used to check whether there is a new release of NetBox available. Set to None to disable the

docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   netbox: &netbox
-    image: docker.io/netboxcommunity/netbox:${VERSION-v4.5-4.0.1}
+    image: docker.io/netboxcommunity/netbox:${VERSION-v4.5-4.0.2}
     depends_on:
       - postgres
       - redis

docker/super_user.py

@@ -19,18 +19,15 @@ def _read_secret(secret_name: str, default: str | None = None) -> str | None:
 su_name = environ.get("SUPERUSER_NAME", "admin")
 su_email = environ.get("SUPERUSER_EMAIL", "admin@example.com")
 su_password = _read_secret("superuser_password", environ.get("SUPERUSER_PASSWORD", "admin"))
-# Sets the superuser API Token, defaults to widely known default
 if not environ.get("SUPERUSER_API_TOKEN"):
-    print("⚠️ Warning: Defaulting to the old default admin token in your database. This token is widely known; please remove it.")
+    print("⚠️ Warning: Defaulting to the old default admin token. This token is widely known; please remove it.")
 su_api_token = _read_secret(
     "superuser_api_token",
     environ.get("SUPERUSER_API_TOKEN", "0123456789abcdef0123456789abcdef01234567"),
 )
-
-# Sets the superuser API key, defaults to a randomly generated key.
 su_api_key = _read_secret(
     "superuser_api_key",
-    environ.get("SUPERUSER_API_KEY"),
+    environ.get("SUPERUSER_API_KEY", "cae3ju9jeaqu"),
 )
 
 if not User.objects.filter(username=su_name):
@@ -44,5 +41,5 @@ if not User.objects.filter(username=su_name):
             t = Token.objects.create(user=u, token=su_api_token, version=TokenVersionChoices.V2, key=su_api_key)
         else:
             t = Token.objects.create(user=u, token=su_api_token, version=TokenVersionChoices.V2)
-        msg = f"💡 Superuser Username: {su_name}, E-Mail: {su_email}, API Token: {su_api_token} (use with '{t.get_auth_header_prefix()}<Your token>')"
+        msg = f"💡 Superuser Username: {su_name}, E-Mail: {su_email}, API Token: use with '{t.get_auth_header_prefix()}<Your token>'"
     print(msg)

requirements-container.txt

@@ -1,7 +1,7 @@
 django-auth-ldap==5.3.0
 dulwich==1.1.0
-granian[uvloop]==2.7.1
+granian[uvloop]==2.7.2
 python3-saml==1.16.0
 --no-binary lxml
 --no-binary xmlsec
-sentry-sdk[django]==2.53.0
+sentry-sdk[django]==2.54.0