Merge 00d8dd75d6 into c10d4e71c7

Merge pull request #1533 from netbox-community/renovate/sentry-sdk-2.x
Update dependency sentry-sdk to v2.41.0
2025-12-10 22:02:37 +00:00 · 2025-10-14 14:30:40 +02:00 · 2025-10-14 07:17:32 +02:00 · 2025-10-14 04:46:28 +00:00 · 2025-10-14 06:45:35 +02:00 · 2025-10-14 01:45:18 +00:00
5 changed files with 14 additions and 3 deletions
--- 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
--- 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})
+
+

 #########################
 #                       #
--- 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
--- a/requirements-container.txt
+++ b/requirements-container.txt
@ -1,6 +1,6 @@
 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
-sentry-sdk[django]==2.40.0
+sentry-sdk[django]==2.41.0
--- 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',
+}
Author	SHA1	Message	Date
renovate[bot]	13a52c4c30	Merge `00d8dd75d6` into `c10d4e71c7`	2025-10-14 14:30:40 +02:00
Tobias Genannt	c10d4e71c7	Merge pull request #1533 from netbox-community/renovate/sentry-sdk-2.x Some checks are pending push / Checks syntax of our code (push) Waiting to run Details push / Builds new NetBox Docker Images (./build-latest.sh, ubuntu-24.04) (push) Waiting to run Details push / Builds new NetBox Docker Images (./build-latest.sh, ubuntu-24.04-arm) (push) Waiting to run Details push / Builds new NetBox Docker Images (./build.sh feature, ubuntu-24.04) (push) Waiting to run Details push / Builds new NetBox Docker Images (./build.sh feature, ubuntu-24.04-arm) (push) Waiting to run Details push / Builds new NetBox Docker Images (./build.sh main, ubuntu-24.04) (push) Waiting to run Details push / Builds new NetBox Docker Images (./build.sh main, ubuntu-24.04-arm) (push) Waiting to run Details push / Builds new NetBox Docker Images (PRERELEASE=true ./build-latest.sh, ubuntu-24.04) (push) Waiting to run Details push / Builds new NetBox Docker Images (PRERELEASE=true ./build-latest.sh, ubuntu-24.04-arm) (push) Waiting to run Details Update dependency sentry-sdk to v2.41.0	2025-10-14 07:17:32 +02:00
renovate[bot]	85615a9bea	Update dependency sentry-sdk to v2.41.0	2025-10-14 04:46:28 +00:00
Tobias Genannt	1abb784f9b	Merge pull request #1535 from netbox-community/renovate/dulwich-0.x Update dependency dulwich to v0.24.3	2025-10-14 06:45:35 +02:00
renovate[bot]	f89f907408	Update dependency dulwich to v0.24.3	2025-10-14 01:45:18 +00:00
Tobias Genannt	6b7121564b	Merge pull request #1532 from tobiasge/new-api-token Some checks failed push / Checks syntax of our code (push) Has been cancelled Details push / Builds new NetBox Docker Images (./build-latest.sh, ubuntu-24.04) (push) Has been cancelled Details push / Builds new NetBox Docker Images (./build-latest.sh, ubuntu-24.04-arm) (push) Has been cancelled Details push / Builds new NetBox Docker Images (./build.sh feature, ubuntu-24.04) (push) Has been cancelled Details push / Builds new NetBox Docker Images (./build.sh feature, ubuntu-24.04-arm) (push) Has been cancelled Details push / Builds new NetBox Docker Images (./build.sh main, ubuntu-24.04) (push) Has been cancelled Details push / Builds new NetBox Docker Images (./build.sh main, ubuntu-24.04-arm) (push) Has been cancelled Details push / Builds new NetBox Docker Images (PRERELEASE=true ./build-latest.sh, ubuntu-24.04) (push) Has been cancelled Details push / Builds new NetBox Docker Images (PRERELEASE=true ./build-latest.sh, ubuntu-24.04-arm) (push) Has been cancelled Details Support new API_TOKEN format	2025-10-10 11:36:01 +02:00
Tobias Genannt	1f0ef020a9	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	2025-10-08 08:26:27 +02:00