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

Author: kiblik

dojo/filters.py

@@ -3,6 +3,7 @@
 import logging
 import warnings
 from datetime import datetime, timedelta
+from zoneinfo import ZoneInfo
 
 import six
 import tagulous
@@ -816,6 +817,7 @@ class MetricsDateRangeFilter(ChoiceFilter):
     def any(self, qs, name):
         earliest_finding = get_earliest_finding(qs)
         if earliest_finding is not None:
+            ZoneInfo(get_system_setting("time_zone"))
             start_date = datetime.combine(
                 earliest_finding.date, datetime.min.time()).replace(tzinfo=tzinfo())
             self.start_date = _truncate(start_date - timedelta(days=1))
@@ -882,6 +884,7 @@ def filter(self, qs, value):
             return qs
         earliest_finding = get_earliest_finding(qs)
         if earliest_finding is not None:
+            ZoneInfo(get_system_setting("time_zone"))
             start_date = datetime.combine(
                 earliest_finding.date, datetime.min.time()).replace(tzinfo=tzinfo())
             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/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/survey/views.py

@@ -1,5 +1,6 @@
 import pickle
-from datetime import date, timedelta
+from datetime import datetime, timedelta
+from zoneinfo import ZoneInfo
 
 from django.contrib import messages
 from django.contrib.admin.utils import NestedObjects
@@ -51,7 +52,7 @@
     System_Settings,
     TextQuestion,
 )
-from dojo.utils import add_breadcrumb, get_page_items, get_setting
+from dojo.utils import add_breadcrumb, get_page_items, get_setting, get_system_setting
 
 
 @user_is_authorized(Engagement, Permissions.Engagement_Edit, "eid")
@@ -136,7 +137,8 @@ def answer_questionnaire(request, eid, sid):
         if questions_are_valid:
             survey.completed = True
             survey.responder = request.user
-            survey.answered_on = date.today()
+            local_tz = ZoneInfo(get_system_setting("time_zone"))
+            survey.answered_on = datetime.now(tz=local_tz).date()
             survey.save()
             messages.add_message(
                 request,
@@ -788,7 +790,8 @@ def answer_empty_survey(request, esid):
         if questions_are_valid:
             survey.completed = True
             survey.responder = request.user if not request.user.is_anonymous else None
-            survey.answered_on = date.today()
+            local_tz = ZoneInfo(get_system_setting("time_zone"))
+            survey.answered_on = datetime.now(tz=local_tz).date()
             survey.save()
             general_survey.num_responses += 1
             general_survey.save()

dojo/tasks.py

@@ -1,5 +1,6 @@
 import logging
-from datetime import date, timedelta
+from datetime import datetime, timedelta
+from zoneinfo import ZoneInfo
 
 from auditlog.models import LogEntry
 from celery.utils.log import get_task_logger
@@ -13,7 +14,7 @@
 from dojo.celery import app
 from dojo.models import Alerts, Announcement, Endpoint, Engagement, Finding, Product, System_Settings, User
 from dojo.notifications.helper import create_notification
-from dojo.utils import calculate_grade, sla_compute_and_notify
+from dojo.utils import calculate_grade, get_system_setting, sla_compute_and_notify
 
 logger = get_task_logger(__name__)
 deduplicationLogger = logging.getLogger("dojo.specific-loggers.deduplication")
@@ -98,7 +99,8 @@ def flush_auditlog(*args, **kwargs):
         return
 
     logger.info("Running Cleanup Task for Logentries with %d Months retention", retention_period)
-    retention_date = date.today() - relativedelta(months=retention_period)
+    local_tz = ZoneInfo(get_system_setting("time_zone"))
+    retention_date = datetime.now(tz=local_tz).date() - relativedelta(months=retention_period)
     subset = LogEntry.objects.filter(timestamp__date__lt=retention_date)
     event_count = subset.count()
     logger.debug("Initially received %d Logentries", event_count)

dojo/test/views.py

@@ -5,6 +5,7 @@
 import time
 from datetime import datetime
 from functools import reduce
+from zoneinfo import ZoneInfo
 
 from django.contrib import messages
 from django.contrib.admin.utils import NestedObjects
@@ -692,7 +693,8 @@ def add_temp_finding(request, tid, fid):
 
             new_finding.tags = form.cleaned_data["tags"]
             new_finding.cvssv3 = finding.cvssv3
-            new_finding.date = form.cleaned_data["date"] or datetime.today()
+            local_tz = ZoneInfo(get_system_setting("time_zone"))
+            new_finding.date = form.cleaned_data["date"] or datetime.now(tz=local_tz).date()
 
             finding_helper.update_finding_status(new_finding, request.user)
 

dojo/tools/hydra/parser.py

@@ -1,10 +1,12 @@
 import json
 import logging
-from datetime import date
+from datetime import datetime
+from zoneinfo import ZoneInfo
 
 from django.utils.dateparse import parse_datetime
 
 from dojo.models import Endpoint, Finding
+from dojo.utils import get_system_setting
 
 logger = logging.getLogger(__name__)
 
@@ -78,7 +80,7 @@ def __extract_finding(
             title="Weak username / password combination found for " + host,
             date=parse_datetime(metadata.date)
             if metadata.date
-            else date.today(),
+            else datetime.now(tz=ZoneInfo(get_system_setting("time_zone"))).date(),
             severity="High",
             description=host
             + " on port "

dojo/tools/noseyparker/parser.py

@@ -1,8 +1,10 @@
 import hashlib
 import json
 from datetime import datetime
+from zoneinfo import ZoneInfo
 
 from dojo.models import Finding
+from dojo.utils import get_system_setting
 
 
 class NoseyParkerParser:
@@ -82,6 +84,7 @@ def version_0_16_0(self, line, test):
                 self.dupes[key] = finding
             else:
                 self.dupes[key] = True
+                local_tz = ZoneInfo(get_system_setting("time_zone"))
                 # Create Finding object
                 finding = Finding(
                     test=test,
@@ -90,7 +93,7 @@ def version_0_16_0(self, line, test):
                     description=description,
                     severity="High",
                     mitigation="Reset the account/token and remove from source code. Store secrets/tokens/passwords in secret managers or secure vaults.",
-                    date=datetime.today().strftime("%Y-%m-%d"),
+                    date=datetime.now(tz=local_tz).strftime("%Y-%m-%d"),
                     verified=False,
                     active=True,
                     is_mitigated=False,
@@ -142,6 +145,7 @@ def version_0_22_0(self, line, test):
                 self.dupes[key] = finding
             else:
                 self.dupes[key] = True
+                local_tz = ZoneInfo(get_system_setting("time_zone"))
                 # Create Finding object
                 finding = Finding(
                     test=test,
@@ -150,7 +154,7 @@ def version_0_22_0(self, line, test):
                     description=description,
                     severity="High",
                     mitigation="Reset the account/token and remove from source code. Store secrets/tokens/passwords in secret managers or secure vaults.",
-                    date=datetime.today().strftime("%Y-%m-%d"),
+                    date=datetime.now(tz=local_tz).strftime("%Y-%m-%d"),
                     verified=False,
                     active=True,
                     is_mitigated=False,

ruff.toml

@@ -42,7 +42,7 @@ select = [
    "A",
    "COM",
    "C4",
-   "DTZ003", "DTZ004", "DTZ012", "DTZ901",
+   "DTZ002", "DTZ003", "DTZ004", "DTZ01", "DTZ901",
    "T10",
    "DJ003", "DJ01",
    "EM",

unittests/test_flush_auditlog.py

@@ -1,12 +1,14 @@
 import logging
-from datetime import UTC, date, datetime
+from datetime import UTC, datetime
+from zoneinfo import ZoneInfo
 
 from auditlog.models import LogEntry
 from dateutil.relativedelta import relativedelta
 from django.test import override_settings
 
 from dojo.models import Finding
 from dojo.tasks import flush_auditlog
+from dojo.utils import get_system_setting
 
 from .dojo_test_case import DojoTestCase
 
@@ -25,9 +27,10 @@ def test_flush_auditlog_disabled(self):
 
     @override_settings(AUDITLOG_FLUSH_RETENTION_PERIOD=0)
     def test_delete_all_entries(self):
-        entries_before = LogEntry.objects.filter(timestamp__date__lt=date.today()).count()
+        local_tz = ZoneInfo(get_system_setting("time_zone"))
+        entries_before = LogEntry.objects.filter(timestamp__date__lt=datetime.now(tz=local_tz).date()).count()
         flush_auditlog()
-        entries_after = LogEntry.objects.filter(timestamp__date__lt=date.today()).count()
+        entries_after = LogEntry.objects.filter(timestamp__date__lt=datetime.now(tz=local_tz).date()).count()
         # we have three old log entries in our testdata
         self.assertEqual(entries_before - 3, entries_after)