From c8d766a95bc6d4f1110bf8f4f45623bd2e05daaf Mon Sep 17 00:00:00 2001 From: Tobias Genannt Date: Tue, 8 Jul 2025 07:33:49 +0200 Subject: [PATCH 01/17] Use our example file in the Readme --- README.md | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index d5af477..74b1ad7 100644 --- a/README.md +++ b/README.md @@ -39,12 +39,9 @@ There is a more complete [_Getting Started_ guide on our wiki][wiki-getting-star ```bash git clone -b release https://github.com/netbox-community/netbox-docker.git cd netbox-docker -tee docker-compose.override.yml < Date: Fri, 26 Sep 2025 10:42:24 +0000 Subject: [PATCH 02/17] Update dependency dulwich to v0.24.2 --- requirements-container.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-container.txt b/requirements-container.txt index e285b55..1fa64b9 100644 --- a/requirements-container.txt +++ b/requirements-container.txt @@ -1,5 +1,5 @@ django-auth-ldap==5.2.0 -dulwich==0.24.1 +dulwich==0.24.2 python3-saml==1.16.0 --no-binary lxml --no-binary xmlsec From 88bc5cf8d6c91cd8b88428f1e5ab9da7692ff2c0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 6 Oct 2025 13:37:57 +0000 Subject: [PATCH 03/17] Update dependency sentry-sdk to v2.40.0 --- requirements-container.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-container.txt b/requirements-container.txt index 1fa64b9..c65b635 100644 --- a/requirements-container.txt +++ b/requirements-container.txt @@ -3,4 +3,4 @@ dulwich==0.24.2 python3-saml==1.16.0 --no-binary lxml --no-binary xmlsec -sentry-sdk[django]==2.39.0 +sentry-sdk[django]==2.40.0 From 7067475a81a7bd0591c03a3285a6fe90544f4421 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 8 Oct 2025 05:08:30 +0000 Subject: [PATCH 04/17] Update ghcr.io/astral-sh/uv Docker tag to v0.9 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 452b44c..b398e9c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ ARG FROM FROM ${FROM} AS builder -COPY --from=ghcr.io/astral-sh/uv:0.8 /uv /usr/local/bin/ +COPY --from=ghcr.io/astral-sh/uv:0.9 /uv /usr/local/bin/ RUN export DEBIAN_FRONTEND=noninteractive \ && apt-get update -qq \ && apt-get upgrade \ From 1f0ef020a9d1372f6786d55c907870a46493a818 Mon Sep 17 00:00:00 2001 From: Tobias Genannt Date: Wed, 8 Oct 2025 08:12:59 +0200 Subject: [PATCH 05/17] Support new API_TOKEN format Allows configuration the new API_TOKEN_PEPPERS setting from an ENV variable or secret file. Feature request: https://github.com/netbox-community/netbox/issues/20210 Pull request: https://github.com/netbox-community/netbox/pull/20477 --- .github/workflows/push.yml | 3 ++- configuration/configuration.py | 5 +++++ env/netbox.env | 1 + test-configuration/test_config.py | 4 ++++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index a4833e1..f4b6305 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -36,12 +36,13 @@ jobs: SUPPRESS_POSSUM: true LINTER_RULES_PATH: / VALIDATE_ALL_CODEBASE: false + VALIDATE_BIOME_FORMAT: false VALIDATE_CHECKOV: false VALIDATE_DOCKERFILE: false + VALIDATE_GITHUB_ACTIONS_ZIZMOR: false VALIDATE_GITLEAKS: false VALIDATE_JSCPD: false VALIDATE_TRIVY: false - VALIDATE_GITHUB_ACTIONS_ZIZMOR: false FILTER_REGEX_EXCLUDE: (.*/)?(LICENSE|configuration/.*) EDITORCONFIG_FILE_NAME: .editorconfig-checker.json DOCKERFILE_HADOLINT_FILE_NAME: .hadolint.yaml diff --git a/configuration/configuration.py b/configuration/configuration.py index 6125e2b..8dfa736 100644 --- a/configuration/configuration.py +++ b/configuration/configuration.py @@ -116,6 +116,11 @@ REDIS = { # https://docs.djangoproject.com/en/stable/ref/settings/#std:setting-SECRET_KEY SECRET_KEY = _read_secret('secret_key', environ.get('SECRET_KEY', '')) +API_TOKEN_PEPPERS = {} +if api_token_pepper := _read_secret('api_token_pepper_1', environ.get('API_TOKEN_PEPPER_1', '')): + API_TOKEN_PEPPERS.update({1: api_token_pepper}) + + ######################### # # diff --git a/env/netbox.env b/env/netbox.env index c89844f..52fca3b 100644 --- a/env/netbox.env +++ b/env/netbox.env @@ -1,3 +1,4 @@ +API_TOKEN_PEPPER_1=Qy+F=OTeGskWQ(wTMgjc+NPPlz6YwFXY=KHIIg=wpYXT&e(6u8 CORS_ORIGIN_ALLOW_ALL=True DB_HOST=postgres DB_NAME=netbox diff --git a/test-configuration/test_config.py b/test-configuration/test_config.py index 308d437..10f414c 100644 --- a/test-configuration/test_config.py +++ b/test-configuration/test_config.py @@ -10,3 +10,7 @@ PLUGINS = [ ALLOW_TOKEN_RETRIEVAL = True DEFAULT_PERMISSIONS = {} + +API_TOKEN_PEPPERS = { + 1: 'TEST-VALUE-DO-NOT-USE-TEST-VALUE-DO-NOT-USE-TEST-VALUE-DO-NOT-USE', +} From f89f9074083660d01947962e725264fa0063cf3d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 14 Oct 2025 01:45:18 +0000 Subject: [PATCH 06/17] Update dependency dulwich to v0.24.3 --- requirements-container.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-container.txt b/requirements-container.txt index c65b635..ec870bc 100644 --- a/requirements-container.txt +++ b/requirements-container.txt @@ -1,5 +1,5 @@ django-auth-ldap==5.2.0 -dulwich==0.24.2 +dulwich==0.24.3 python3-saml==1.16.0 --no-binary lxml --no-binary xmlsec From 85615a9bea38dcd44a368b38435dfe20a27faa48 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 14 Oct 2025 04:46:28 +0000 Subject: [PATCH 07/17] Update dependency sentry-sdk to v2.41.0 --- requirements-container.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-container.txt b/requirements-container.txt index ec870bc..6710500 100644 --- a/requirements-container.txt +++ b/requirements-container.txt @@ -3,4 +3,4 @@ dulwich==0.24.3 python3-saml==1.16.0 --no-binary lxml --no-binary xmlsec -sentry-sdk[django]==2.40.0 +sentry-sdk[django]==2.41.0 From 95bcfeb69d0fc9fba273452f5b3b2fae3fe21f7d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 14 Oct 2025 21:08:52 +0000 Subject: [PATCH 08/17] Update dependency dulwich to v0.24.4 --- requirements-container.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-container.txt b/requirements-container.txt index 6710500..83a3ac4 100644 --- a/requirements-container.txt +++ b/requirements-container.txt @@ -1,5 +1,5 @@ django-auth-ldap==5.2.0 -dulwich==0.24.3 +dulwich==0.24.4 python3-saml==1.16.0 --no-binary lxml --no-binary xmlsec From 07258394d151fc27c67a6db822a8a408fc588570 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 15 Oct 2025 10:43:52 +0000 Subject: [PATCH 09/17] Update dependency sentry-sdk to v2.42.0 --- requirements-container.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-container.txt b/requirements-container.txt index 83a3ac4..608b117 100644 --- a/requirements-container.txt +++ b/requirements-container.txt @@ -3,4 +3,4 @@ dulwich==0.24.4 python3-saml==1.16.0 --no-binary lxml --no-binary xmlsec -sentry-sdk[django]==2.41.0 +sentry-sdk[django]==2.42.0 From 56d27f84a7791adc918761d32a092804f2f29515 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 16 Oct 2025 14:11:49 +0000 Subject: [PATCH 10/17] Update dependency dulwich to v0.24.5 --- requirements-container.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-container.txt b/requirements-container.txt index 608b117..551fd69 100644 --- a/requirements-container.txt +++ b/requirements-container.txt @@ -1,5 +1,5 @@ django-auth-ldap==5.2.0 -dulwich==0.24.4 +dulwich==0.24.5 python3-saml==1.16.0 --no-binary lxml --no-binary xmlsec From eb2822a978fdba91dd45200a0a902dac3de2eff4 Mon Sep 17 00:00:00 2001 From: Willard Nilges Date: Sun, 19 Oct 2025 01:17:23 -0400 Subject: [PATCH 11/17] Fix typo in error message for Unit configuration --- docker/launch-netbox.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/launch-netbox.sh b/docker/launch-netbox.sh index 6cc63ba..11da1de 100755 --- a/docker/launch-netbox.sh +++ b/docker/launch-netbox.sh @@ -36,7 +36,7 @@ load_configuration() { http://localhost/config ) if [ "$RESP_CODE" != "200" ]; then - echo "⚠️ Could no load Unit configuration" + echo "⚠️ Could not load Unit configuration" kill "$(cat /opt/unit/unit.pid)" return 1 fi From b0aad0dfda909d6456e098902eff5a308a87721a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 19 Oct 2025 12:45:34 +0000 Subject: [PATCH 12/17] Update dependency dulwich to v0.24.6 --- requirements-container.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-container.txt b/requirements-container.txt index 551fd69..570f05d 100644 --- a/requirements-container.txt +++ b/requirements-container.txt @@ -1,5 +1,5 @@ django-auth-ldap==5.2.0 -dulwich==0.24.5 +dulwich==0.24.6 python3-saml==1.16.0 --no-binary lxml --no-binary xmlsec From 73bbf17d6bed7ef35b112e1ee3a0479447ddccd6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 20 Oct 2025 15:32:40 +0000 Subject: [PATCH 13/17] Update dependency sentry-sdk to v2.42.1 --- requirements-container.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-container.txt b/requirements-container.txt index 570f05d..89e3ac6 100644 --- a/requirements-container.txt +++ b/requirements-container.txt @@ -3,4 +3,4 @@ dulwich==0.24.6 python3-saml==1.16.0 --no-binary lxml --no-binary xmlsec -sentry-sdk[django]==2.42.0 +sentry-sdk[django]==2.42.1 From 2d6d5058fe803f412ff2276d5975766217db300d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 23 Oct 2025 12:46:08 +0000 Subject: [PATCH 14/17] Update dependency dulwich to v0.24.7 --- requirements-container.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-container.txt b/requirements-container.txt index 89e3ac6..6e197a1 100644 --- a/requirements-container.txt +++ b/requirements-container.txt @@ -1,5 +1,5 @@ django-auth-ldap==5.2.0 -dulwich==0.24.6 +dulwich==0.24.7 python3-saml==1.16.0 --no-binary lxml --no-binary xmlsec From 3f0f4e7160121e688f270f550cbb0eb6ee7f690a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 29 Oct 2025 19:47:17 +0000 Subject: [PATCH 15/17] Update dependency sentry-sdk to v2.43.0 --- requirements-container.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-container.txt b/requirements-container.txt index 6e197a1..a64f051 100644 --- a/requirements-container.txt +++ b/requirements-container.txt @@ -3,4 +3,4 @@ dulwich==0.24.7 python3-saml==1.16.0 --no-binary lxml --no-binary xmlsec -sentry-sdk[django]==2.42.1 +sentry-sdk[django]==2.43.0 From 35473e755b94a1b90d7c31f2cc4a4bf4c60c907e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 30 Oct 2025 03:30:40 +0000 Subject: [PATCH 16/17] Update dependency dulwich to v0.24.8 --- requirements-container.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-container.txt b/requirements-container.txt index 6e197a1..1c83807 100644 --- a/requirements-container.txt +++ b/requirements-container.txt @@ -1,5 +1,5 @@ django-auth-ldap==5.2.0 -dulwich==0.24.7 +dulwich==0.24.8 python3-saml==1.16.0 --no-binary lxml --no-binary xmlsec From 4965e7e988a0b6d5dc4d09829657e5bcb1305b84 Mon Sep 17 00:00:00 2001 From: Tobias Genannt Date: Mon, 10 Nov 2025 10:28:40 +0100 Subject: [PATCH 17/17] Preparation for 3.4.2 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 47b322c..a423d42 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.4.1 +3.4.2 \ No newline at end of file