Ruff: Add and fix DTZ002 & DTZ011 + reorg some timezone components

Author: kiblik

dojo/filters.py

@@ -2,8 +2,8 @@
 import decimal
 import logging
 import warnings
-import zoneinfo
 from datetime import datetime, timedelta
+from zoneinfo import ZoneInfo
 
 import six
 import tagulous
@@ -97,8 +97,6 @@
 
 logger = logging.getLogger(__name__)
 
-local_tz = zoneinfo.ZoneInfo(get_system_setting("time_zone"))
-
 BOOLEAN_CHOICES = (("false", "No"), ("true", "Yes"))
 EARLIEST_FINDING = None
 
@@ -125,7 +123,8 @@ def vulnerability_id_filter(queryset, name, value):
 
 
 def now():
-    return datetime.today().replace(tzinfo=local_tz)
+    local_tz = ZoneInfo(get_system_setting("time_zone"))
+    return datetime.now(tz=local_tz)
 
 
 class NumberInFilter(filters.BaseInFilter, filters.NumberFilter):
@@ -199,6 +198,7 @@ def __init__(self, *args, **kwargs):
     def filter(self, qs, value):
         earliest_finding = get_earliest_finding(qs)
         if earliest_finding is not None:
+            local_tz = ZoneInfo(get_system_setting("time_zone"))
             start_date = datetime.combine(
                 earliest_finding.date, datetime.min.time()).replace(tzinfo=local_tz)
             self.start_date = _truncate(start_date - timedelta(days=1))
@@ -823,6 +823,7 @@ class MetricsDateRangeFilter(ChoiceFilter):
     def any(self, qs, name):
         earliest_finding = get_earliest_finding(qs)
         if earliest_finding is not None:
+            local_tz = ZoneInfo(get_system_setting("time_zone"))
             start_date = datetime.combine(
                 earliest_finding.date, datetime.min.time()).replace(tzinfo=local_tz)
             self.start_date = _truncate(start_date - timedelta(days=1))
@@ -831,6 +832,7 @@ def any(self, qs, name):
         return None
 
     def current_month(self, qs, name):
+        local_tz = ZoneInfo(get_system_setting("time_zone"))
         self.start_date = datetime(now().year, now().month, 1, 0, 0, 0).replace(tzinfo=local_tz)
         self.end_date = now()
         return qs.filter(**{
@@ -839,6 +841,7 @@ def current_month(self, qs, name):
         })
 
     def current_year(self, qs, name):
+        local_tz = ZoneInfo(get_system_setting("time_zone"))
         self.start_date = datetime(now().year, 1, 1, 0, 0, 0).replace(tzinfo=local_tz)
         self.end_date = now()
         return qs.filter(**{
@@ -889,6 +892,7 @@ def filter(self, qs, value):
             return qs
         earliest_finding = get_earliest_finding(qs)
         if earliest_finding is not None:
+            local_tz = ZoneInfo(get_system_setting("time_zone"))
             start_date = datetime.combine(
                 earliest_finding.date, datetime.min.time()).replace(tzinfo=local_tz)
             self.start_date = _truncate(start_date - timedelta(days=1))

dojo/forms.py

@@ -3,8 +3,9 @@
 import pickle
 import re
 import warnings
-from datetime import date, datetime
+from datetime import datetime
 from pathlib import Path
+from zoneinfo import ZoneInfo
 
 import tagulous
 from crispy_forms.bootstrap import InlineCheckboxes, InlineRadios
@@ -188,7 +189,8 @@ def __init__(self, attrs=None, years=None, *, required=True):
         if years:
             self.years = years
         else:
-            this_year = date.today().year
+            local_tz = ZoneInfo(get_system_setting("time_zone"))
+            this_year = datetime.now(tz=local_tz).year
             self.years = list(range(this_year - 10, this_year + 1))
 
     def render(self, name, value, attrs=None, renderer=None):
@@ -642,7 +644,8 @@ def clean_tags(self):
     # date can only be today or in the past, not the future
     def clean_scan_date(self):
         date = self.cleaned_data.get("scan_date", None)
-        if date and date.date() > datetime.today().date():
+        local_tz = ZoneInfo(get_system_setting("time_zone"))
+        if date and date.date() > datetime.now(tz=local_tz).date():
             msg = "The date cannot be in the future!"
             raise forms.ValidationError(msg)
         return date
@@ -3582,7 +3585,8 @@ class Meta:
     def clean_expiration(self):
         expiration = self.cleaned_data.get("expiration", None)
         if expiration:
-            today = datetime.today().date()
+            local_tz = ZoneInfo(get_system_setting("time_zone"))
+            today = datetime.now(tz=local_tz).date()
             if expiration < today:
                 msg = "The expiration cannot be in the past"
                 raise forms.ValidationError(msg)

dojo/management/commands/csv_findings_export.py

@@ -1,13 +1,13 @@
 import csv
-import zoneinfo
 from pathlib import Path
+from zoneinfo import ZoneInfo
 
 from django.core.management.base import BaseCommand
 
 from dojo.models import Finding
 from dojo.utils import get_system_setting
 
-locale = zoneinfo.ZoneInfo(get_system_setting("time_zone"))
+locale = ZoneInfo(get_system_setting("time_zone"))
 
 """
 Author: Aaron Weaver

dojo/management/commands/dedupe.py

@@ -1,5 +1,5 @@
 import logging
-import zoneinfo
+from zoneinfo import ZoneInfo
 
 from django.core.management.base import BaseCommand
 
@@ -12,7 +12,7 @@
     mass_model_updater,
 )
 
-locale = zoneinfo.ZoneInfo(get_system_setting("time_zone"))
+locale = ZoneInfo(get_system_setting("time_zone"))
 
 logger = logging.getLogger(__name__)
 deduplicationLogger = logging.getLogger("dojo.specific-loggers.deduplication")

dojo/management/commands/import_surveys.py

@@ -1,13 +1,13 @@
-import zoneinfo
 from pathlib import Path
+from zoneinfo import ZoneInfo
 
 from django.core.management.base import BaseCommand
 from django.db import connection
 
 from dojo.models import TextQuestion
 from dojo.utils import get_system_setting
 
-locale = zoneinfo.ZoneInfo(get_system_setting("time_zone"))
+locale = ZoneInfo(get_system_setting("time_zone"))
 
 """
 Author: Cody Maffucci

dojo/management/commands/push_to_jira_update.py

@@ -1,5 +1,5 @@
 import logging
-import zoneinfo
+from zoneinfo import ZoneInfo
 
 from django.core.management.base import BaseCommand
 
@@ -9,7 +9,7 @@
 
 logger = logging.getLogger(__name__)
 
-locale = zoneinfo.ZoneInfo(get_system_setting("time_zone"))
+locale = ZoneInfo(get_system_setting("time_zone"))
 
 """
 Author: Aaron Weaver

dojo/management/commands/rename_mend_findings.py

@@ -1,6 +1,6 @@
 import logging
 import re
-import zoneinfo
+from zoneinfo import ZoneInfo
 
 from django.core.management.base import BaseCommand
 
@@ -10,7 +10,7 @@
 
 logger = logging.getLogger(__name__)
 
-locale = zoneinfo.ZoneInfo(get_system_setting("time_zone"))
+locale = ZoneInfo(get_system_setting("time_zone"))
 
 """
 Author: Aaron Weaver

dojo/management/commands/stamp_finding_last_reviewed.py

@@ -1,4 +1,4 @@
-import zoneinfo
+from zoneinfo import ZoneInfo
 
 from auditlog.models import LogEntry
 from django.contrib.contenttypes.models import ContentType
@@ -7,7 +7,7 @@
 from dojo.models import Finding
 from dojo.utils import get_system_setting
 
-locale = zoneinfo.ZoneInfo(get_system_setting("time_zone"))
+locale = ZoneInfo(get_system_setting("time_zone"))
 
 """
 Authors: Jay Paz

dojo/metrics/views.py

@@ -3,7 +3,8 @@
 import logging
 import operator
 from calendar import monthrange
-from datetime import date, datetime, timedelta
+from datetime import datetime, timedelta
+from zoneinfo import ZoneInfo
 
 from dateutil.relativedelta import relativedelta
 from django.contrib import messages
@@ -769,14 +770,15 @@ def view_engineer(request, eid):
 
     # -------------
     # Details table
+    local_tz = ZoneInfo(get_system_setting("time_zone"))
     details = sorted(
         (
             [
                 f.test.engagement.product.prod_type.name,
                 f.test.engagement.product.name,
                 f.severity,
                 f.title,
-                (date.today() - f.date).days,
+                (datetime.now(tz=local_tz).date() - f.date).days,
                 "Accepted" if f.risk_accepted else "Active",
                 f.reporter,
             ]
@@ -850,7 +852,8 @@ def view_engineer(request, eid):
 
 def _age_buckets(qs):
     """Return aged high/critical finding counts in one SQL round-trip."""
-    today = date.today()
+    local_tz = ZoneInfo(get_system_setting("time_zone"))
+    today = datetime.now(tz=local_tz).date()
     return qs.aggregate(
         lt=Count("id", filter=Q(date__gte=today - timedelta(days=30))),
         ls=Count("id", filter=Q(date__lte=today - timedelta(days=30), date__gt=today - timedelta(days=60))),

dojo/models.py

@@ -4,12 +4,12 @@
 import logging
 import re
 import warnings
-import zoneinfo
 from contextlib import suppress
 from datetime import datetime, timedelta
 from decimal import Decimal
 from pathlib import Path
 from uuid import uuid4
+from zoneinfo import available_timezones
 
 import dateutil
 import hyperlink
@@ -438,7 +438,7 @@ class System_Settings(models.Model):
     url_prefix = models.CharField(max_length=300, default="", blank=True, help_text=_("URL prefix if DefectDojo is installed in it's own virtual subdirectory."))
     team_name = models.CharField(max_length=100, default="", blank=True)
     time_zone = models.CharField(max_length=50,
-                                 choices=[(tz, tz) for tz in zoneinfo.available_timezones()],
+                                 choices=[(tz, tz) for tz in available_timezones()],
                                  default="UTC", blank=False)
     enable_product_grade = models.BooleanField(default=False, verbose_name=_("Enable Product Grading"), help_text=_("Displays a grade letter next to a product to show the overall health."))
     product_grade = models.CharField(max_length=800, blank=True)