From 26fc06b817d51e4713e8d435531d6c01c1a45f5a Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 30 Sep 2025 15:10:53 -0400 Subject: [PATCH 1/4] Fixes #20248: Tweak help text to avoid error when compiling translations --- netbox/ipam/models/ip.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox/ipam/models/ip.py b/netbox/ipam/models/ip.py index cef979d3f..b31c9a14b 100644 --- a/netbox/ipam/models/ip.py +++ b/netbox/ipam/models/ip.py @@ -548,7 +548,7 @@ class IPRange(ContactsMixin, PrimaryModel): mark_utilized = models.BooleanField( verbose_name=_('mark utilized'), default=False, - help_text=_("Report space as 100% utilized") + help_text=_("Report space as fully utilized") ) clone_fields = ( From f23eb53312f740f308785013c6ee6b4a338ce025 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 2 Oct 2025 05:02:10 +0000 Subject: [PATCH 2/4] Update source translation strings --- netbox/translations/en/LC_MESSAGES/django.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/netbox/translations/en/LC_MESSAGES/django.po b/netbox/translations/en/LC_MESSAGES/django.po index 0bec6111d..265540c60 100644 --- a/netbox/translations/en/LC_MESSAGES/django.po +++ b/netbox/translations/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2025-10-01 05:02+0000\n" +"POT-Creation-Date: 2025-10-02 05:01+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -10919,8 +10919,7 @@ msgid "Prevent the creation of IP addresses within this range" msgstr "" #: netbox/ipam/models/ip.py:551 -#, python-format -msgid "Report space as 100% utilized" +msgid "Report space as fully utilized" msgstr "" #: netbox/ipam/models/ip.py:560 From 5f77d684e1fbdbc6214408559c473e2ffcb3a8f3 Mon Sep 17 00:00:00 2001 From: Martin Hauser Date: Thu, 2 Oct 2025 22:49:18 +0200 Subject: [PATCH 3/4] chore(core): Remove unused imports in plugins and migrations Cleans up unused imports across `plugins.py` and a migration file. Closes #20482 --- netbox/core/plugins.py | 1 - netbox/dcim/migrations/0188_racktype.py | 2 -- 2 files changed, 3 deletions(-) diff --git a/netbox/core/plugins.py b/netbox/core/plugins.py index 0a5bd8fe3..15f640b86 100644 --- a/netbox/core/plugins.py +++ b/netbox/core/plugins.py @@ -1,6 +1,5 @@ import datetime import importlib -import importlib.util from dataclasses import dataclass, field from typing import Optional diff --git a/netbox/dcim/migrations/0188_racktype.py b/netbox/dcim/migrations/0188_racktype.py index 7c36e03ba..1b5fd25c8 100644 --- a/netbox/dcim/migrations/0188_racktype.py +++ b/netbox/dcim/migrations/0188_racktype.py @@ -3,9 +3,7 @@ import django.db.models.deletion import taggit.managers from django.db import migrations, models -import utilities.fields import utilities.json -import utilities.ordering class Migration(migrations.Migration): From c094699dc0dd4abf56c711261b0c83789b1f63a8 Mon Sep 17 00:00:00 2001 From: Jason Novinger Date: Thu, 2 Oct 2025 16:27:31 -0500 Subject: [PATCH 4/4] Fixes #20484: Configure CodeQL to exclude URL redirect false positives --- .github/codeql/codeql-config.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/codeql/codeql-config.yml b/.github/codeql/codeql-config.yml index f763ef6df..d5453e19f 100644 --- a/.github/codeql/codeql-config.yml +++ b/.github/codeql/codeql-config.yml @@ -1,3 +1,11 @@ paths-ignore: # Ignore compiled JS - netbox/project-static/dist + +query-filters: + # Exclude py/url-redirection: NetBox uses safe_for_redirect() wrapper function + # which validates all redirects via Django's url_has_allowed_host_and_scheme(). + # CodeQL's taint tracking doesn't recognize wrapper functions without custom + # query configuration. See #20484. + - exclude: + id: py/url-redirection