Merge pull request #1636 from netbox-community/develop

Version 4.0.2

.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 }}

Dockerfile

@@ -1,7 +1,7 @@
 ARG FROM
 FROM ${FROM} AS builder
 
-COPY --from=ghcr.io/astral-sh/uv:0.9 /uv /usr/local/bin/
+COPY --from=ghcr.io/astral-sh/uv:0.10 /uv /usr/local/bin/
 RUN export DEBIAN_FRONTEND=noninteractive \
     && apt-get update -qq \
     && apt-get upgrade \

VERSION

@@ -1 +1 @@
-4.0.0
+4.0.2

configuration/configuration.py

@@ -317,6 +317,14 @@ SOCIAL_AUTH_OKTA_OPENIDCONNECT_API_URL = environ.get('SOCIAL_AUTH_OKTA_OPENIDCON
 SOCIAL_AUTH_GOOGLE_OAUTH2_KEY = environ.get('SOCIAL_AUTH_GOOGLE_OAUTH2_KEY')
 SOCIAL_AUTH_GOOGLE_OAUTH2_SECRET = _read_secret('google_oauth2_secret', environ.get('SOCIAL_AUTH_GOOGLE_OAUTH2_SECRET', ''))
 
+# OIDC Configuration
+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','/')
+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
 # version check or use the URL below to check for release in the official NetBox repository.
 RELEASE_CHECK_URL = environ.get('RELEASE_CHECK_URL', None)
@@ -363,3 +371,6 @@ TIME_ZONE = environ.get('TIME_ZONE', 'UTC')
 
 # If true disables miscellaneous functionality which depends on access to the Internet.
 ISOLATED_DEPLOYMENT = _environ_get_and_map('ISOLATED_DEPLOYMENT', 'False', _AS_BOOL)
+
+# Enables or disables the NetBox Copilot agent globally. When enabled, users can opt to toggle the agent individually.
+COPILOT_ENABLED = _environ_get_and_map('COPILOT_ENABLED', 'True', _AS_BOOL)

docker-compose.yml

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

env/netbox.env

@@ -42,3 +42,12 @@ SKIP_SUPERUSER=true
 # SOCIAL_AUTH_GOOGLE_OAUTH2_KEY=your_google_client_id
 # SOCIAL_AUTH_GOOGLE_OAUTH2_SECRET=your_google_client_secret
 WEBHOOKS_ENABLED=true
+
+# Configuration for OIDC
+# REMOTE_AUTH_BACKEND='social_core.backends.open_id_connect.OpenIdConnectAuth'
+# SOCIAL_AUTH_OIDC_OIDC_ENDPOINT='https://example.org'
+# SOCIAL_AUTH_OIDC_KEY=''
+# SOCIAL_AUTH_OIDC_SECRET=''
+# SOCIAL_AUTH_OIDC_SCOPE=openid profile email roles
+# LOGOUT_REDIRECT_URL='https://example.org'
+# SOCIAL_AUTH_OIDC_JWT_ALGORITHMS=RS256

requirements-container.txt

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