chore: resolve upstream conflicts and sync parsers

Author: ArnaavSinghSandhu

dojo/db_migrations/max_migration.txt

@@ -1 +1,2 @@
 0260_github_conf_base_url
+0259_locations

dojo/metrics/utils.py

@@ -339,7 +339,11 @@ class MetricsType(_MetricsTypeEntry, Enum):
     ENDPOINT = ("finding__severity", "mitigated")
 
 
+<<<<<<< HEAD
 def query_counts(
+=======
+def query_counts[MetricsQuerySet: (QuerySet[Finding], QuerySet[Endpoint_Status])](
+>>>>>>> upstream/dev
     open_qs: MetricsQuerySet,
     active_qs: MetricsQuerySet,
     accepted_qs: MetricsQuerySet,

dojo/models.py

@@ -1092,7 +1092,9 @@ def save(self, *args, **kwargs):
                     super(Product, product).save()
                 # launch the async task to update all finding sla expiration dates
                 from dojo.sla_config.helpers import async_update_sla_expiration_dates_sla_config_sync  # noqa: I001, PLC0415 circular import
-                async_update_sla_expiration_dates_sla_config_sync(self, products, severities=severities)
+                from dojo.celery_dispatch import dojo_dispatch_task  # noqa: PLC0415 circular import
+
+                dojo_dispatch_task(async_update_sla_expiration_dates_sla_config_sync, self, products, severities=severities)
 
     def clean(self):
         sla_days = [self.critical, self.high, self.medium, self.low]
@@ -1252,7 +1254,9 @@ def save(self, *args, **kwargs):
                     super(SLA_Configuration, sla_config).save()
                 # launch the async task to update all finding sla expiration dates
                 from dojo.sla_config.helpers import async_update_sla_expiration_dates_sla_config_sync  # noqa: I001, PLC0415 circular import
-                async_update_sla_expiration_dates_sla_config_sync(sla_config, Product.objects.filter(id=self.id))
+                from dojo.celery_dispatch import dojo_dispatch_task  # noqa: PLC0415 circular import
+
+                dojo_dispatch_task(async_update_sla_expiration_dates_sla_config_sync, sla_config, Product.objects.filter(id=self.id))
 
     def get_absolute_url(self):
         return reverse("view_product", args=[str(self.id)])

dojo/tools/chefinspect/parser.py

@@ -15,7 +15,7 @@ def get_description_for_scan_types(self, scan_type):
 
     def convert_score(self, raw_value):
         val = float(raw_value)
-        if val == 0.0:
+        if val == 0:
             return "Info"
         if val < 0.4:
             return "Low"

dojo/tools/nancy/parser.py

@@ -38,7 +38,7 @@ def convert_cvss_score(self, raw_value):
         if raw_value is None:
             return "Info"
         val = float(raw_value)
-        if val == 0.0:
+        if val == 0:
             return "Info"
         if val < 4.0:
             return "Low"

dojo/tools/nmap/parser.py

@@ -159,7 +159,7 @@ def convert_cvss_score(self, raw_value):
         Critical 	9.0-10.0
         """
         val = float(raw_value)
-        if val == 0.0:
+        if val == 0:
             return "Info"
         if val < 4.0:
             return "Low"

dojo/tools/openvas/parser_v1/xml_parser.py

@@ -78,7 +78,7 @@ def get_findings(self, filename, test):
 
     def convert_cvss_score(self, raw_value):
         val = float(raw_value)
-        if val == 0.0:
+        if val == 0:
             return "Info"
         if val < 4.0:
             return "Low"

dojo/tools/ssh_audit/parser.py

@@ -26,7 +26,7 @@ def convert_cvss_score(self, raw_value):
         Critical 	9.0-10.0
         """
         val = float(raw_value)
-        if val == 0.0:
+        if val == 0:
             return "Info"
         if val < 4.0:
             return "Low"

dojo/tools/trivy/parser.py

@@ -64,7 +64,7 @@ def convert_cvss_score(self, raw_value):
         if raw_value is None:
             return "Info"
         val = float(raw_value)
-        if val == 0.0:
+        if val == 0:
             return "Info"
         if val < 4.0:
             return "Low"

requirements-lint.txt

@@ -1 +1,2 @@
-ruff==0.15.0
+ruff==0.15.0
+ruff==0.15.1