+
+
+
+ {{ .Title }}
+
+
+ {{ .Params.lead | safeHTML }}
+ Open The Docs + {{ .Content }} +
+
+
+
+
+
+ Getting Started
+Start your journey with DefectDojo with our New User Checklist.
+
+
+ Import Data
+Learn how to import data from 190+ supported security tools here.
+
+
+ Create Reports
+Use the Report Builder to present customizable reports of Findings.
+
+
+
+ {{ end -}}
+ {{ if eq $.Site.Language.LanguageName "English" }}
+
+
+
+
+
+
+ Join the Dojo community
+Check out live events, upcoming features and connect with other security professionals on our Community Page.
+
+
+ Sign up for a trial
+Ready to go Pro? Create an account here.
+
+
+ Reach out to Support
+Need some help? Pro users can send an email to support@defectdojo.com
+
+
+
+
+ Start building with Doks today
+ {{ i18n "get-started" }} +
+{{ end -}}
+
+{{ if site.Params.doks.headerBar -}}
+
+{{ end -}}
+
+
+ {{ with site.Params.doks.containerBreakpoint -}}
+ \d+)",
+ )
+ def link_engagement(self, request, pk, engagement_id):
+ # Get the answered survey
+ engagement_survey = self.get_object()
+ # Safely get the engagement
+ engagement = get_object_or_404(Engagement.objects, pk=engagement_id)
+ # Link the engagement
+ answered_survey, _ = Answered_Survey.objects.get_or_create(engagement=engagement, survey=engagement_survey)
+ # Send a favorable response
+ serialized_answered_survey = serializers.QuestionnaireAnsweredSurveySerializer(answered_survey)
+ return Response(serialized_answered_survey.data)
+
@extend_schema_view(**schema_with_prefetch())
class QuestionnaireAnsweredSurveyViewSet(
diff --git a/dojo/apps.py b/dojo/apps.py
index fd3a06575fd..4d4d07af50e 100755
--- a/dojo/apps.py
+++ b/dojo/apps.py
@@ -98,5 +98,5 @@ def get_model_fields(default_fields, extra_fields=()):
def get_model_default_fields(model):
return tuple(
field.name for field in model._meta.fields if
- isinstance(field, (models.CharField, models.TextField))
+ isinstance(field, models.CharField | models.TextField)
)
diff --git a/dojo/authorization/authorization.py b/dojo/authorization/authorization.py
index f663e215bad..ea37540fdee 100755
--- a/dojo/authorization/authorization.py
+++ b/dojo/authorization/authorization.py
@@ -51,7 +51,7 @@ def user_has_permission(user, obj, permission):
if user.is_superuser:
return True
- if isinstance(obj, Product_Type) or isinstance(obj, Product):
+ if isinstance(obj, Product_Type | Product):
# Global roles are only relevant for product types, products and their
# dependent objects
if user_has_global_permission(user, permission):
@@ -103,8 +103,10 @@ def user_has_permission(user, obj, permission):
):
return user_has_permission(user, obj.engagement.product, permission)
if (
- isinstance(obj, Finding) or isinstance(obj, Stub_Finding)
- ) and permission in Permissions.get_finding_permissions():
+ (isinstance(obj, Finding | Stub_Finding)
+ ) and permission in Permissions.get_finding_permissions()) or (
+ isinstance(obj, Finding_Group)
+ and permission in Permissions.get_finding_group_permissions()):
return user_has_permission(
user, obj.test.engagement.product, permission,
)
@@ -124,23 +126,17 @@ def user_has_permission(user, obj, permission):
if (
isinstance(obj, Endpoint)
and permission in Permissions.get_endpoint_permissions()
- ):
- return user_has_permission(user, obj.product, permission)
- if (
+ ) or (
isinstance(obj, Languages)
and permission in Permissions.get_language_permissions()
- ):
- return user_has_permission(user, obj.product, permission)
- if (
+ ) or ((
isinstance(obj, App_Analysis)
and permission in Permissions.get_technology_permissions()
- ):
- return user_has_permission(user, obj.product, permission)
- if (
+ ) or (
isinstance(obj, Product_API_Scan_Configuration)
and permission
in Permissions.get_product_api_scan_configuration_permissions()
- ):
+ )):
return user_has_permission(user, obj.product, permission)
if (
isinstance(obj, Product_Type_Member)
@@ -428,10 +424,7 @@ def get_product_groups_dict(user):
.select_related("role")
.filter(group__users=user)
):
- if pg_dict.get(product_group.product.id) is None:
- pgu_list = []
- else:
- pgu_list = pg_dict[product_group.product.id]
+ pgu_list = [] if pg_dict.get(product_group.product.id) is None else pg_dict[product_group.product.id]
pgu_list.append(product_group)
pg_dict[product_group.product.id] = pgu_list
return pg_dict
diff --git a/dojo/benchmark/views.py b/dojo/benchmark/views.py
index 04f4fb68e3b..0d0c7174b96 100755
--- a/dojo/benchmark/views.py
+++ b/dojo/benchmark/views.py
@@ -1,3 +1,4 @@
+import contextlib
import logging
from crum import get_current_user
@@ -37,10 +38,8 @@ def add_benchmark(queryset, product):
benchmark_product.control = requirement
requirements.append(benchmark_product)
- try:
+ with contextlib.suppress(Exception):
Benchmark_Product.objects.bulk_create(requirements)
- except Exception:
- pass
@user_is_authorized(Product, Permissions.Benchmark_Edit, "pid")
diff --git a/dojo/cred/queries.py b/dojo/cred/queries.py
index 28419772328..beb84129bab 100755
--- a/dojo/cred/queries.py
+++ b/dojo/cred/queries.py
@@ -11,10 +11,7 @@ def get_authorized_cred_mappings(permission, queryset=None):
if user is None:
return Cred_Mapping.objects.none()
- if queryset is None:
- cred_mappings = Cred_Mapping.objects.all().order_by("id")
- else:
- cred_mappings = queryset
+ cred_mappings = Cred_Mapping.objects.all().order_by("id") if queryset is None else queryset
if user.is_superuser:
return cred_mappings
diff --git a/dojo/cred/views.py b/dojo/cred/views.py
index 2fc373c3ac9..f8f7756e340 100755
--- a/dojo/cred/views.py
+++ b/dojo/cred/views.py
@@ -1,3 +1,4 @@
+import contextlib
import logging
from django.contrib import messages
@@ -585,10 +586,8 @@ def new_cred_finding(request, fid):
@user_is_authorized(Cred_User, Permissions.Credential_Delete, "ttid")
def delete_cred_controller(request, destination_url, id, ttid):
cred = None
- try:
+ with contextlib.suppress(Exception):
cred = Cred_Mapping.objects.get(pk=ttid)
- except:
- pass
if request.method == "POST":
tform = CredMappingForm(request.POST, instance=cred)
message = ""
diff --git a/dojo/db_migrations/0218_system_settings_enforce_verified_status_and_more.py b/dojo/db_migrations/0218_system_settings_enforce_verified_status_and_more.py
new file mode 100644
index 00000000000..beec72caffa
--- /dev/null
+++ b/dojo/db_migrations/0218_system_settings_enforce_verified_status_and_more.py
@@ -0,0 +1,23 @@
+# Generated by Django 5.0.9 on 2024-10-22 19:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('dojo', '0217_jira_project_enabled'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='system_settings',
+ name='enforce_verified_status',
+ field=models.BooleanField(default=True, help_text='When enabled, features such as product grading, jira integration, metrics, and reports will only interact with verified findings.', verbose_name='Enforce Verified Status'),
+ ),
+ migrations.AlterField(
+ model_name='jira_project',
+ name='push_all_issues',
+ field=models.BooleanField(blank=True, default=False, help_text='Automatically create JIRA tickets for verified findings, assuming enforce_verified_status is True, or for all findings otherwise. Once linked, the JIRA ticket will continue to sync, regardless of status in DefectDojo.'),
+ ),
+ ]
diff --git a/dojo/decorators.py b/dojo/decorators.py
index b6902b8dc10..8f356b0f623 100755
--- a/dojo/decorators.py
+++ b/dojo/decorators.py
@@ -144,22 +144,6 @@ def get_parameter_froms_args_kwargs(args, kwargs, parameter):
return model_or_id
-def on_exception_log_kwarg(func):
- def wrapper(self, *args, **kwargs):
- try:
- return func(self, *args, **kwargs)
-
- except Exception:
- logger.info(f"exception occured at url: {self.driver.current_url}")
- logger.info(f"page source: {self.driver.page_source}")
- f = open("/tmp/selenium_page_source.html", "w", encoding="utf-8")
- f.writelines(self.driver.page_source)
- # time.sleep(30)
- raise
-
- return wrapper
-
-
def dojo_ratelimit(key="ip", rate=None, method=UNSAFE, block=False):
def decorator(fn):
@wraps(fn)
diff --git a/dojo/endpoint/queries.py b/dojo/endpoint/queries.py
index 684eeab7b1a..4a6f2ae56cd 100755
--- a/dojo/endpoint/queries.py
+++ b/dojo/endpoint/queries.py
@@ -20,10 +20,7 @@ def get_authorized_endpoints(permission, queryset=None, user=None):
if user is None:
return Endpoint.objects.none()
- if queryset is None:
- endpoints = Endpoint.objects.all().order_by("id")
- else:
- endpoints = queryset
+ endpoints = Endpoint.objects.all().order_by("id") if queryset is None else queryset
if user.is_superuser:
return endpoints
@@ -66,10 +63,7 @@ def get_authorized_endpoint_status(permission, queryset=None, user=None):
if user is None:
return Endpoint_Status.objects.none()
- if queryset is None:
- endpoint_status = Endpoint_Status.objects.all().order_by("id")
- else:
- endpoint_status = queryset
+ endpoint_status = Endpoint_Status.objects.all().order_by("id") if queryset is None else queryset
if user.is_superuser:
return endpoint_status
diff --git a/dojo/endpoint/utils.py b/dojo/endpoint/utils.py
index d5c378e5e97..0d584ff6c6c 100755
--- a/dojo/endpoint/utils.py
+++ b/dojo/endpoint/utils.py
@@ -20,20 +20,11 @@
def endpoint_filter(**kwargs):
qs = Endpoint.objects.all()
- if kwargs.get("protocol"):
- qs = qs.filter(protocol__iexact=kwargs["protocol"])
- else:
- qs = qs.filter(protocol__isnull=True)
+ qs = qs.filter(protocol__iexact=kwargs["protocol"]) if kwargs.get("protocol") else qs.filter(protocol__isnull=True)
- if kwargs.get("userinfo"):
- qs = qs.filter(userinfo__exact=kwargs["userinfo"])
- else:
- qs = qs.filter(userinfo__isnull=True)
+ qs = qs.filter(userinfo__exact=kwargs["userinfo"]) if kwargs.get("userinfo") else qs.filter(userinfo__isnull=True)
- if kwargs.get("host"):
- qs = qs.filter(host__iexact=kwargs["host"])
- else:
- qs = qs.filter(host__isnull=True)
+ qs = qs.filter(host__iexact=kwargs["host"]) if kwargs.get("host") else qs.filter(host__isnull=True)
if kwargs.get("port"):
if (kwargs.get("protocol")) and \
@@ -48,20 +39,11 @@ def endpoint_filter(**kwargs):
else:
qs = qs.filter(port__isnull=True)
- if kwargs.get("path"):
- qs = qs.filter(path__exact=kwargs["path"])
- else:
- qs = qs.filter(path__isnull=True)
+ qs = qs.filter(path__exact=kwargs["path"]) if kwargs.get("path") else qs.filter(path__isnull=True)
- if kwargs.get("query"):
- qs = qs.filter(query__exact=kwargs["query"])
- else:
- qs = qs.filter(query__isnull=True)
+ qs = qs.filter(query__exact=kwargs["query"]) if kwargs.get("query") else qs.filter(query__isnull=True)
- if kwargs.get("fragment"):
- qs = qs.filter(fragment__exact=kwargs["fragment"])
- else:
- qs = qs.filter(fragment__isnull=True)
+ qs = qs.filter(fragment__exact=kwargs["fragment"]) if kwargs.get("fragment") else qs.filter(fragment__isnull=True)
if kwargs.get("product"):
qs = qs.filter(product__exact=kwargs["product"])
@@ -267,12 +249,11 @@ def validate_endpoints_to_add(endpoints_to_add):
endpoints = endpoints_to_add.split()
for endpoint in endpoints:
try:
- if "://" in endpoint: # is it full uri?
- endpoint_ins = Endpoint.from_uri(endpoint) # from_uri validate URI format + split to components
- else:
- # from_uri parse any '//localhost', '//127.0.0.1:80', '//foo.bar/path' correctly
- # format doesn't follow RFC 3986 but users use it
- endpoint_ins = Endpoint.from_uri("//" + endpoint)
+ # is it full uri?
+ # 1. from_uri validate URI format + split to components
+ # 2. from_uri parse any '//localhost', '//127.0.0.1:80', '//foo.bar/path' correctly
+ # format doesn't follow RFC 3986 but users use it
+ endpoint_ins = Endpoint.from_uri(endpoint) if "://" in endpoint else Endpoint.from_uri("//" + endpoint)
endpoint_ins.clean()
endpoint_list.append([
endpoint_ins.protocol,
diff --git a/dojo/endpoint/views.py b/dojo/endpoint/views.py
index 5a85a0a6468..f7807e9b5ad 100755
--- a/dojo/endpoint/views.py
+++ b/dojo/endpoint/views.py
@@ -61,10 +61,7 @@ def process_endpoints_view(request, host_view=False, vulnerable=False):
paged_endpoints = get_page_items(request, endpoints.qs, 25)
- if vulnerable:
- view_name = "Vulnerable"
- else:
- view_name = "All"
+ view_name = "Vulnerable" if vulnerable else "All"
if host_view:
view_name += " Hosts"
diff --git a/dojo/engagement/views.py b/dojo/engagement/views.py
index ff803720f19..6c76d73ab98 100755
--- a/dojo/engagement/views.py
+++ b/dojo/engagement/views.py
@@ -7,7 +7,6 @@
from functools import reduce
from tempfile import NamedTemporaryFile
from time import strftime
-from typing import List, Optional, Tuple
from django.conf import settings
from django.contrib import messages
@@ -30,7 +29,6 @@
from openpyxl.styles import Font
import dojo.jira_link.helper as jira_helper
-import dojo.notifications.helper as notifications_helper
import dojo.risk_acceptance.helper as ra_helper
import dojo.risk_acceptance.risk_pending as rp_helper
from dojo.authorization.authorization import user_has_permission_or_403
@@ -327,10 +325,7 @@ def edit_engagement(request, eid):
logger.debug("showing jira-epic-form")
jira_epic_form = JIRAEngagementForm(instance=engagement)
- if is_ci_cd:
- title = "Edit CI/CD Engagement"
- else:
- title = "Edit Interactive Engagement"
+ title = "Edit CI/CD Engagement" if is_ci_cd else "Edit Interactive Engagement"
product_tab = Product_Tab(engagement.product, title=title, tab="engagements")
product_tab.setEngagement(engagement)
@@ -438,7 +433,7 @@ def get_risks_accepted(self, eng):
def get_filtered_tests(
self,
request: HttpRequest,
- queryset: List[Test],
+ queryset: list[Test],
engagement: Engagement,
):
filter_string_matching = get_system_setting("filter_string_matching", False)
@@ -476,10 +471,7 @@ def get(self, request, eid, *args, **kwargs):
available_note_types = find_available_notetypes(notes)
form = DoneForm()
files = eng.files.all()
- if note_type_activation:
- form = TypedNoteForm(available_note_types=available_note_types)
- else:
- form = NoteForm()
+ form = TypedNoteForm(available_note_types=available_note_types) if note_type_activation else NoteForm()
creds = Cred_Mapping.objects.filter(
product=eng.product).select_related("cred_id").order_by("cred_id")
@@ -562,10 +554,7 @@ def post(self, request, eid, *args, **kwargs):
new_note.date = timezone.now()
new_note.save()
eng.notes.add(new_note)
- if note_type_activation:
- form = TypedNoteForm(available_note_types=available_note_types)
- else:
- form = NoteForm()
+ form = TypedNoteForm(available_note_types=available_note_types) if note_type_activation else NoteForm()
title = f"Engagement: {eng.name} on {eng.product.name}"
messages.add_message(request,
messages.SUCCESS,
@@ -674,7 +663,15 @@ def add_tests(request, eid):
"Test added successfully.",
extra_tags="alert-success")
- notifications_helper.notify_test_created(new_test)
+ create_notification(
+ event="test_added",
+ title=f"Test created for {new_test.engagement.product}: {new_test.engagement.name}: {new_test}",
+ test=new_test,
+ engagement=new_test.engagement,
+ product=new_test.engagement.product,
+ url=reverse("view_test", args=(new_test.id,)),
+ url_api=reverse("test-detail", args=(new_test.id,)),
+ )
if "_Add Another Test" in request.POST:
return HttpResponseRedirect(
@@ -722,9 +719,9 @@ def get_development_environment(
def get_engagement_or_product(
self,
user: Dojo_User,
- engagement_id: Optional[int] = None,
- product_id: Optional[int] = None,
- ) -> Tuple[Engagement, Product, Product | Engagement]:
+ engagement_id: int | None = None,
+ product_id: int | None = None,
+ ) -> tuple[Engagement, Product, Product | Engagement]:
"""Using the path parameters, either fetch the product or engagement"""
engagement = product = engagement_or_product = None
# Get the product if supplied
@@ -781,7 +778,7 @@ def get_jira_form(
self,
request: HttpRequest,
engagement_or_product: Engagement | Product,
- ) -> Tuple[JIRAImportScanForm | None, bool]:
+ ) -> tuple[JIRAImportScanForm | None, bool]:
"""Returns a JiraImportScanForm if jira is enabled"""
jira_form = None
push_all_jira_issues = False
@@ -806,7 +803,7 @@ def get_product_tab(
self,
product: Product,
engagement: Engagement,
- ) -> Tuple[Product_Tab, dict]:
+ ) -> tuple[Product_Tab, dict]:
"""
Determine how the product tab will be rendered, and what tab will be selected
as currently active
@@ -823,9 +820,9 @@ def get_product_tab(
def handle_request(
self,
request: HttpRequest,
- engagement_id: Optional[int] = None,
- product_id: Optional[int] = None,
- ) -> Tuple[HttpRequest, dict]:
+ engagement_id: int | None = None,
+ product_id: int | None = None,
+ ) -> tuple[HttpRequest, dict]:
"""
Process the common behaviors between request types, and then return
the request and context dict back to be rendered
@@ -1058,8 +1055,8 @@ def failure_redirect(
def get(
self,
request: HttpRequest,
- engagement_id: Optional[int] = None,
- product_id: Optional[int] = None,
+ engagement_id: int | None = None,
+ product_id: int | None = None,
) -> HttpResponse:
"""Process GET requests for the Import View"""
# process the request and path parameters
@@ -1074,8 +1071,8 @@ def get(
def post(
self,
request: HttpRequest,
- engagement_id: Optional[int] = None,
- product_id: Optional[int] = None,
+ engagement_id: int | None = None,
+ product_id: int | None = None,
) -> HttpResponse:
"""Process POST requests for the Import View"""
# process the request and path parameters
@@ -1968,8 +1965,7 @@ def get_engagements(request):
if not url:
msg = "Please use the export button when exporting engagements"
raise ValidationError(msg)
- if url.startswith("url="):
- url = url[4:]
+ url = url.removeprefix("url=")
path_items = list(filter(None, re.split(r"/|\?", url)))
diff --git a/dojo/filters.py b/dojo/filters.py
index f9b332119ef..a7ff0a3f97c 100755
--- a/dojo/filters.py
+++ b/dojo/filters.py
@@ -235,6 +235,35 @@ def filter(self, qs, value):
return self.options[value][1](self, qs, self.field_name)
+class FindingHasJIRAFilter(ChoiceFilter):
+ def no_jira(self, qs, name):
+ return qs.filter(Q(jira_issue=None) & Q(finding_group__jira_issue=None))
+
+ def any_jira(self, qs, name):
+ return qs.filter(~Q(jira_issue=None) | ~Q(finding_group__jira_issue=None))
+
+ def all_items(self, qs, name):
+ return qs
+
+ options = {
+ 0: (_("Yes"), any_jira),
+ 1: (_("No"), no_jira),
+ }
+
+ def __init__(self, *args, **kwargs):
+ kwargs["choices"] = [
+ (key, value[0]) for key, value in six.iteritems(self.options)]
+ super().__init__(*args, **kwargs)
+
+ def filter(self, qs, value):
+ try:
+ value = int(value)
+ except (ValueError, TypeError):
+ return self.all_items(qs, self.field_name)
+
+ return self.options[value][1](self, qs, self.field_name)
+
+
class ProductSLAFilter(ChoiceFilter):
def any(self, qs, name):
return qs
@@ -1577,6 +1606,7 @@ class FindingFilterHelper(FilterSet):
test_import_finding_action__test_import = NumberFilter(widget=HiddenInput())
endpoints = NumberFilter(widget=HiddenInput())
status = FindingStatusFilter(label="Status")
+
has_component = BooleanFilter(
field_name="component_name",
lookup_expr="isnull",
@@ -1611,6 +1641,7 @@ class FindingFilterHelper(FilterSet):
lookup_expr="isnull",
exclude=True,
label="Has Group JIRA")
+ has_any_jira = FindingHasJIRAFilter(label="Has Any JIRA")
outside_of_sla = FindingSLAFilter(label="Outside of SLA")
has_tags = BooleanFilter(field_name="tags", lookup_expr="isnull", exclude=True, label="Has tags")
@@ -2394,6 +2425,7 @@ class EndpointFilterHelper(FilterSet):
fields=(
("product", "product"),
("host", "host"),
+ ("id", "id"),
),
)
@@ -2631,6 +2663,7 @@ class ApiEndpointFilter(DojoFilter):
fields=(
("host", "host"),
("product", "product"),
+ ("id", "id"),
),
)
diff --git a/dojo/finding/helper.py b/dojo/finding/helper.py
index 37b1eb1cd65..976872dca30 100755
--- a/dojo/finding/helper.py
+++ b/dojo/finding/helper.py
@@ -307,7 +307,7 @@ def add_findings_to_auto_group(name, findings, group_by, create_finding_groups_f
if name is not None and findings is not None and len(findings) > 0:
creator = get_current_user()
if not creator:
- creator = kwargs.get("async_user", None)
+ creator = kwargs.get("async_user")
test = findings[0].test
if create_finding_groups_for_all_findings or len(findings) > 1:
diff --git a/dojo/finding/queries.py b/dojo/finding/queries.py
index b7ce7c13be3..5f07e2ce1b9 100755
--- a/dojo/finding/queries.py
+++ b/dojo/finding/queries.py
@@ -44,10 +44,7 @@ def get_authorized_findings(permission, queryset=None, user=None):
user = get_current_user()
if user is None:
return Finding.objects.none()
- if queryset is None:
- findings = Finding.objects.all().order_by("id")
- else:
- findings = queryset
+ findings = Finding.objects.all().order_by("id") if queryset is None else queryset
if user.is_superuser:
return findings
@@ -119,10 +116,7 @@ def get_authorized_vulnerability_ids(permission, queryset=None, user=None):
if user is None:
return Vulnerability_Id.objects.none()
- if queryset is None:
- vulnerability_ids = Vulnerability_Id.objects.all()
- else:
- vulnerability_ids = queryset
+ vulnerability_ids = Vulnerability_Id.objects.all() if queryset is None else queryset
if user.is_superuser:
return vulnerability_ids
diff --git a/dojo/finding/views.py b/dojo/finding/views.py
index 17b5b5c35e2..4921894051c 100755
--- a/dojo/finding/views.py
+++ b/dojo/finding/views.py
@@ -7,7 +7,6 @@
import mimetypes
from collections import OrderedDict, defaultdict
from itertools import chain
-from typing import Optional
from django.conf import settings
from django.contrib import messages
@@ -139,6 +138,9 @@ def prefetch_for_findings(findings, prefetch_type="all", exclude_untouched=True)
if isinstance(
findings, QuerySet,
): # old code can arrive here with prods being a list because the query was already executed
+ prefetched_findings = prefetched_findings.prefetch_related(
+ "reviewers",
+ )
prefetched_findings = prefetched_findings.prefetch_related("reporter")
prefetched_findings = prefetched_findings.prefetch_related(
"jira_issue__jira_project__jira_instance",
@@ -268,9 +270,9 @@ class BaseListFindings:
def __init__(
self,
filter_name: str = "All",
- product_id: Optional[int] = None,
- engagement_id: Optional[int] = None,
- test_id: Optional[int] = None,
+ product_id: int | None = None,
+ engagement_id: int | None = None,
+ test_id: int | None = None,
order_by: str = "-date",
prefetch_type: str = "all",
):
@@ -423,7 +425,7 @@ def add_breadcrumbs(self, request: HttpRequest, context: dict):
return request, context
- def get(self, request: HttpRequest, product_id: Optional[int] = None, engagement_id: Optional[int] = None):
+ def get(self, request: HttpRequest, product_id: int | None = None, engagement_id: int | None = None):
# Store the product and engagement ids
self.product_id = product_id
self.engagement_id = engagement_id
@@ -449,37 +451,37 @@ def get(self, request: HttpRequest, product_id: Optional[int] = None, engagement
class ListOpenFindings(ListFindings):
- def get(self, request: HttpRequest, product_id: Optional[int] = None, engagement_id: Optional[int] = None):
+ def get(self, request: HttpRequest, product_id: int | None = None, engagement_id: int | None = None):
self.filter_name = "Open"
return super().get(request, product_id=product_id, engagement_id=engagement_id)
class ListVerifiedFindings(ListFindings):
- def get(self, request: HttpRequest, product_id: Optional[int] = None, engagement_id: Optional[int] = None):
+ def get(self, request: HttpRequest, product_id: int | None = None, engagement_id: int | None = None):
self.filter_name = "Verified"
return super().get(request, product_id=product_id, engagement_id=engagement_id)
class ListOutOfScopeFindings(ListFindings):
- def get(self, request: HttpRequest, product_id: Optional[int] = None, engagement_id: Optional[int] = None):
+ def get(self, request: HttpRequest, product_id: int | None = None, engagement_id: int | None = None):
self.filter_name = "Out of Scope"
return super().get(request, product_id=product_id, engagement_id=engagement_id)
class ListFalsePositiveFindings(ListFindings):
- def get(self, request: HttpRequest, product_id: Optional[int] = None, engagement_id: Optional[int] = None):
+ def get(self, request: HttpRequest, product_id: int | None = None, engagement_id: int | None = None):
self.filter_name = "False Positive"
return super().get(request, product_id=product_id, engagement_id=engagement_id)
class ListInactiveFindings(ListFindings):
- def get(self, request: HttpRequest, product_id: Optional[int] = None, engagement_id: Optional[int] = None):
+ def get(self, request: HttpRequest, product_id: int | None = None, engagement_id: int | None = None):
self.filter_name = "Inactive"
return super().get(request, product_id=product_id, engagement_id=engagement_id)
class ListAcceptedFindings(ListFindings):
- def get(self, request: HttpRequest, product_id: Optional[int] = None, engagement_id: Optional[int] = None):
+ def get(self, request: HttpRequest, product_id: int | None = None, engagement_id: int | None = None):
self.filter_name = "Accepted"
return super().get(request, product_id=product_id, engagement_id=engagement_id)
@@ -491,7 +493,7 @@ def get(self, request: HttpRequest, product_id: int = None, engagement_id: int=
class ListClosedFindings(ListFindings):
- def get(self, request: HttpRequest, product_id: Optional[int] = None, engagement_id: Optional[int] = None):
+ def get(self, request: HttpRequest, product_id: int | None = None, engagement_id: int | None = None):
self.filter_name = "Closed"
self.order_by = "-mitigated"
return super().get(request, product_id=product_id, engagement_id=engagement_id)
@@ -1261,10 +1263,7 @@ def close_finding(request, fid):
# in order to close a finding, we need to capture why it was closed
# we can do this with a Note
note_type_activation = Note_Type.objects.filter(is_active=True)
- if len(note_type_activation):
- missing_note_types = get_missing_mandatory_notetypes(finding)
- else:
- missing_note_types = note_type_activation
+ missing_note_types = get_missing_mandatory_notetypes(finding) if len(note_type_activation) else note_type_activation
form = CloseFindingForm(missing_note_types=missing_note_types)
if request.method == "POST":
form = CloseFindingForm(request.POST, missing_note_types=missing_note_types)
@@ -1730,7 +1729,7 @@ def request_finding_review(request, fid):
findings = form.cleaned_data['findings_review']
reviewers = Dojo_User.objects.filter(id__in=form.cleaned_data["reviewers"])
- reviewers_string = ", ".join([str(user) for user in reviewers])
+ reviewers_string = ", ".join([f"{user} ({user.id})" for user in reviewers])
reviewers_usernames = [user.username for user in reviewers]
logger.debug(f"Asking {reviewers_string} for review")
@@ -1776,7 +1775,7 @@ def request_finding_review(request, fid):
finding=finding,
reviewers=reviewers,
recipients=reviewers_usernames,
- description=f"User {user.get_full_name()} has requested review the finding {finding.title}",
+ description=f'User {user.get_full_name()}({user.id}) has requested that user(s) {reviewers_string} review the finding "{finding.title}" for accuracy:\n\n{new_note}',
icon="check",
url=reverse("view_finding", args=(finding.id,)),
)
@@ -2355,10 +2354,7 @@ def apply_cwe_mitigation(apply_to_findings, template, update=True):
cwe=title_template.cwe,
title__icontains=title_template.title,
).values_list("id", flat=True)
- if result_list is None:
- result_list = finding_ids
- else:
- result_list = list(chain(result_list, finding_ids))
+ result_list = finding_ids if result_list is None else list(chain(result_list, finding_ids))
# If result_list is None the filter exclude won't work
if result_list:
@@ -2460,16 +2456,7 @@ def edit_template(request, tid):
count = apply_cwe_mitigation(
form.cleaned_data["apply_to_findings"], template,
)
- if count > 0:
- apply_message = (
- " and "
- + str(count)
- + " "
- + pluralize(count, "finding,findings")
- + " "
- )
- else:
- apply_message = ""
+ apply_message = " and " + str(count) + " " + pluralize(count, "finding,findings") + " " if count > 0 else ""
messages.add_message(
request,
diff --git a/dojo/finding_group/queries.py b/dojo/finding_group/queries.py
index 39b91c02665..987cf7f6901 100755
--- a/dojo/finding_group/queries.py
+++ b/dojo/finding_group/queries.py
@@ -13,10 +13,7 @@ def get_authorized_finding_groups(permission, queryset=None, user=None):
if user is None:
return Finding_Group.objects.none()
- if queryset is None:
- finding_groups = Finding_Group.objects.all()
- else:
- finding_groups = queryset
+ finding_groups = Finding_Group.objects.all() if queryset is None else queryset
if user.is_superuser:
return finding_groups
diff --git a/dojo/finding_group/views.py b/dojo/finding_group/views.py
index 546dae93763..a894766cf57 100755
--- a/dojo/finding_group/views.py
+++ b/dojo/finding_group/views.py
@@ -74,10 +74,9 @@ def view_finding_group(request, fgid):
if jira_issue:
# See if the submitted issue was a issue key or the full URL
jira_instance = jira_helper.get_jira_project(finding_group).jira_instance
- if jira_issue.startswith(jira_instance.url + "/browse/"):
- jira_issue = jira_issue[len(jira_instance.url + "/browse/"):]
+ jira_issue = jira_issue.removeprefix(jira_instance.url + "/browse/")
- if finding_group.has_jira_issue and not jira_issue == jira_helper.get_jira_key(finding_group):
+ if finding_group.has_jira_issue and jira_issue != jira_helper.get_jira_key(finding_group):
jira_helper.unlink_jira(request, finding_group)
jira_helper.finding_group_link_jira(request, finding_group, jira_issue)
elif not finding_group.has_jira_issue:
diff --git a/dojo/forms.py b/dojo/forms.py
index bcb92e0ddd0..63648324e01 100644
--- a/dojo/forms.py
+++ b/dojo/forms.py
@@ -4,6 +4,7 @@
import re
import warnings
from datetime import date, datetime
+from pathlib import Path
import tagulous
from crispy_forms.bootstrap import InlineCheckboxes, InlineRadios
@@ -186,10 +187,7 @@ def render(self, name, value, attrs=None, renderer=None):
output = []
- if "id" in self.attrs:
- id_ = self.attrs["id"]
- else:
- id_ = f"id_{name}"
+ id_ = self.attrs.get("id", f"id_{name}")
month_choices = list(MONTHS.items())
if not (self.required and value):
@@ -850,7 +848,8 @@ class UploadThreatForm(forms.Form):
def clean(self):
if (file := self.cleaned_data.get("file", None)) is not None:
- ext = os.path.splitext(file.name)[1] # [0] returns path+filename
+ path = Path(file.name)
+ ext = path.suffix
valid_extensions = [".jpg", ".png", ".pdf"]
if ext.lower() not in valid_extensions:
if accepted_extensions := f"{', '.join(valid_extensions)}":
@@ -1143,7 +1142,8 @@ def clean(self):
for form in self.forms:
file = form.cleaned_data.get("file", None)
if file:
- ext = os.path.splitext(file.name)[1] # [0] returns path+filename
+ path = Path(file.name)
+ ext = path.suffix
valid_extensions = settings.FILE_UPLOAD_TYPES
if ext.lower() not in valid_extensions:
if accepted_extensions := f"{', '.join(valid_extensions)}":
@@ -2691,10 +2691,7 @@ def get_jira_issue_template_dir_choices():
# template_list.append((os.path.join(base_dir, filename), filename))
for dirname in dirnames:
- if base_dir.startswith(settings.TEMPLATE_DIR_PREFIX):
- clean_base_dir = base_dir[len(settings.TEMPLATE_DIR_PREFIX):]
- else:
- clean_base_dir = base_dir
+ clean_base_dir = base_dir.removeprefix(settings.TEMPLATE_DIR_PREFIX)
template_dir_list.append((os.path.join(clean_base_dir, dirname), dirname))
logger.debug("templates: %s", template_dir_list)
@@ -2828,7 +2825,7 @@ class Meta:
exclude = ["product"]
def __init__(self, *args, **kwargs):
- instance = kwargs.get("instance", None)
+ instance = kwargs.get("instance")
self.newly_created = True
if instance is not None:
self.newly_created = instance.pk is None
@@ -3380,7 +3377,7 @@ def clean(self):
elif self.cleaned_data.get("push_to_jira", None):
active = self.finding_form["active"].value()
verified = self.finding_form["verified"].value()
- if not active or not verified:
+ if not active or (not verified and get_system_setting("enforce_verified_status", True)):
logger.debug("Findings must be active and verified to be pushed to JIRA")
error_message = "Findings must be active and verified to be pushed to JIRA"
self.add_error("push_to_jira", ValidationError(error_message, code="not_active_or_verified"))
@@ -3570,10 +3567,7 @@ def __init__(self, *args, **kwargs):
question=self.question,
)
- if initial_answer.exists():
- initial_answer = initial_answer[0].answer
- else:
- initial_answer = ""
+ initial_answer = initial_answer[0].answer if initial_answer.exists() else ""
self.fields["answer"] = forms.CharField(
label=self.question.text,
diff --git a/dojo/github.py b/dojo/github.py
index 5fe1ca35c13..dc1f865b128 100755
--- a/dojo/github.py
+++ b/dojo/github.py
@@ -123,7 +123,7 @@ def add_external_issue_github(find, prod, eng):
github_conf = github_pkey.git_conf
# We push only active and verified issues
- if "Active" in find.status() and "Verified" in find.status():
+ if "Active" in find.status() and ("Verified" in find.status() and get_system_setting("enforce_verified_status", True)):
eng = Engagement.objects.get(test=find.test)
prod = Product.objects.get(engagement=eng)
github_product_key = GITHUB_PKey.objects.get(product=prod)
diff --git a/dojo/group/utils.py b/dojo/group/utils.py
index 1a6bc68b137..d2245dac2a6 100755
--- a/dojo/group/utils.py
+++ b/dojo/group/utils.py
@@ -11,10 +11,7 @@ def get_auth_group_name(group, attempt=0):
if attempt > 999:
msg = f"Cannot find name for authorization group for Dojo_Group {group.name}, aborted after 999 attempts."
raise Exception(msg)
- if attempt == 0:
- auth_group_name = group.name
- else:
- auth_group_name = group.name + "_" + str(attempt)
+ auth_group_name = group.name if attempt == 0 else group.name + "_" + str(attempt)
try:
# Attempt to fetch an existing group before moving forward with the real operation
diff --git a/dojo/home/views.py b/dojo/home/views.py
index 3c485eb1e9c..3f5c5870d0a 100755
--- a/dojo/home/views.py
+++ b/dojo/home/views.py
@@ -1,6 +1,5 @@
from collections import defaultdict
from datetime import timedelta
-from typing import Dict
from dateutil.relativedelta import relativedelta
from django.db.models import Count, Q
@@ -75,7 +74,7 @@ def support(request: HttpRequest) -> HttpResponse:
return render(request, "dojo/support.html", {})
-def get_severities_all(findings) -> Dict[str, int]:
+def get_severities_all(findings) -> dict[str, int]:
severities_all = findings.values("severity").annotate(count=Count("severity")).order_by()
return defaultdict(lambda: 0, {s["severity"]: s["count"] for s in severities_all})
diff --git a/dojo/importers/auto_create_context.py b/dojo/importers/auto_create_context.py
index 16454568624..bf4d16cee92 100644
--- a/dojo/importers/auto_create_context.py
+++ b/dojo/importers/auto_create_context.py
@@ -1,6 +1,6 @@
import logging
from datetime import datetime, timedelta
-from typing import Any, Optional
+from typing import Any
from crum import get_current_user
from django.db import transaction
@@ -51,7 +51,7 @@ def process_object_fields(
test such that passing the whole object, or just the ID
will suffice
"""
- if object_id := data.get(key, None):
+ if object_id := data.get(key):
# Convert to just the ID if the whole object as passed
if isinstance(object_id, object_type):
object_id = object_id.id
@@ -113,7 +113,7 @@ def process_import_meta_data_from_dict(
"""
def get_target_product_type_if_exists(
self,
- product_type_name: Optional[str] = None,
+ product_type_name: str | None = None,
**kwargs: dict,
) -> Product_Type | None:
"""
@@ -128,8 +128,8 @@ def get_target_product_type_if_exists(
def get_target_product_if_exists(
self,
- product_name: Optional[str] = None,
- product_type_name: Optional[str] = None,
+ product_name: str | None = None,
+ product_type_name: str | None = None,
**kwargs: dict,
) -> Product | None:
"""
@@ -168,7 +168,7 @@ def get_target_product_by_id_if_exists(
def get_target_engagement_if_exists(
self,
engagement_id: int = 0,
- engagement_name: Optional[str] = None,
+ engagement_name: str | None = None,
product: Product = None,
**kwargs: dict,
) -> Engagement | None:
@@ -191,8 +191,8 @@ def get_target_engagement_if_exists(
def get_target_test_if_exists(
self,
test_id: int = 0,
- test_title: Optional[str] = None,
- scan_type: Optional[str] = None,
+ test_title: str | None = None,
+ scan_type: str | None = None,
engagement: Engagement = None,
**kwargs: dict,
) -> Test | None:
@@ -220,7 +220,7 @@ def get_target_test_if_exists(
"""
def get_or_create_product_type(
self,
- product_type_name: Optional[str] = None,
+ product_type_name: str | None = None,
**kwargs: dict,
) -> Product_Type:
"""
@@ -243,8 +243,8 @@ def get_or_create_product_type(
def get_or_create_product(
self,
- product_name: Optional[str] = None,
- product_type_name: Optional[str] = None,
+ product_name: str | None = None,
+ product_type_name: str | None = None,
*,
auto_create_context: bool = False,
**kwargs: dict,
@@ -278,14 +278,14 @@ def get_or_create_product(
def get_or_create_engagement(
self,
engagement_id: int = 0,
- engagement_name: Optional[str] = None,
- product_name: Optional[str] = None,
- product_type_name: Optional[str] = None,
+ engagement_name: str | None = None,
+ product_name: str | None = None,
+ product_type_name: str | None = None,
*,
auto_create_context: bool = False,
deduplication_on_engagement: bool = False,
- source_code_management_uri: Optional[str] = None,
- target_end: Optional[datetime] = None,
+ source_code_management_uri: str | None = None,
+ target_end: datetime | None = None,
**kwargs: dict,
) -> Engagement:
"""Fetches an engagement by name or ID if one already exists."""
diff --git a/dojo/importers/base_importer.py b/dojo/importers/base_importer.py
index 3748b96f746..52dc577fb41 100644
--- a/dojo/importers/base_importer.py
+++ b/dojo/importers/base_importer.py
@@ -7,6 +7,7 @@
from django.core.exceptions import ValidationError
from django.core.files.base import ContentFile
from django.core.files.uploadedfile import TemporaryUploadedFile
+from django.urls import reverse
from django.utils.timezone import make_aware
import dojo.finding.helper as finding_helper
@@ -30,6 +31,7 @@
Test_Type,
Vulnerability_Id,
)
+from dojo.notifications.helper import create_notification
from dojo.tools.factory import get_parser
from dojo.utils import max_safe
@@ -43,7 +45,7 @@ class Parser:
and is purely for the sake of type hinting
"""
- def get_findings(scan_type: str, test: Test) -> List[Finding]:
+ def get_findings(scan_type: str, test: Test) -> list[Finding]:
"""
Stub function to make the hinting happier. The actual class
is loosely obligated to have this function defined.
@@ -90,7 +92,7 @@ def process_scan(
scan: TemporaryUploadedFile,
*args: list,
**kwargs: dict,
- ) -> Tuple[Test, int, int, int, int, int, Test_Import]:
+ ) -> tuple[Test, int, int, int, int, int, Test_Import]:
"""
A helper method that executes the entire import process in a single method.
This includes parsing the file, processing the findings, and returning the
@@ -100,9 +102,9 @@ def process_scan(
def process_findings(
self,
- parsed_findings: List[Finding],
+ parsed_findings: list[Finding],
**kwargs: dict,
- ) -> List[Finding]:
+ ) -> list[Finding]:
"""
Make the conversion from unsaved Findings in memory to Findings that are saved in the
database with and ID associated with them. This processor will also save any associated
@@ -112,9 +114,9 @@ def process_findings(
def close_old_findings(
self,
- findings: List[Finding],
+ findings: list[Finding],
**kwargs: dict,
- ) -> List[Finding]:
+ ) -> list[Finding]:
"""
Identify any findings that have been imported before,
but are no longer present in later reports so that
@@ -148,7 +150,7 @@ def parse_findings_static_test_type(
self,
scan: TemporaryUploadedFile,
parser: Parser,
- ) -> List[Finding]:
+ ) -> list[Finding]:
"""
Parse the scan report submitted with the parser class and generate some findings
that are not saved to the database yet. This step is crucial in determining if
@@ -169,7 +171,7 @@ def parse_dynamic_test_type_tests(
self,
scan: TemporaryUploadedFile,
parser: Parser,
- ) -> List[Test]:
+ ) -> list[Test]:
"""Use the API configuration object to get the tests to be used by the parser"""
try:
return parser.get_tests(self.scan_type, scan)
@@ -179,8 +181,8 @@ def parse_dynamic_test_type_tests(
def parse_dynamic_test_type_findings_from_tests(
self,
- tests: List[Test],
- ) -> List[Finding]:
+ tests: list[Test],
+ ) -> list[Finding]:
"""
currently we only support import one Test
so for parser that support multiple tests (like SARIF)
@@ -195,7 +197,7 @@ def parse_findings_dynamic_test_type(
self,
scan: TemporaryUploadedFile,
parser: Parser,
- ) -> List[Finding]:
+ ) -> list[Finding]:
"""
Use the API configuration object to get the tests to be used by the parser
to dump findings into
@@ -209,7 +211,7 @@ def parse_findings(
self,
scan: TemporaryUploadedFile,
parser: Parser,
- ) -> List[Finding]:
+ ) -> list[Finding]:
"""
Determine how to parse the findings based on the presence of the
`get_tests` function on the parser object
@@ -222,9 +224,9 @@ def parse_findings(
def sync_process_findings(
self,
- parsed_findings: List[Finding],
+ parsed_findings: list[Finding],
**kwargs: dict,
- ) -> Tuple[List[Finding], List[Finding], List[Finding], List[Finding]]:
+ ) -> tuple[list[Finding], list[Finding], list[Finding], list[Finding]]:
"""
Processes findings in a synchronous manner such that all findings
will be processed in a worker/process/thread
@@ -233,9 +235,9 @@ def sync_process_findings(
def async_process_findings(
self,
- parsed_findings: List[Finding],
+ parsed_findings: list[Finding],
**kwargs: dict,
- ) -> List[Finding]:
+ ) -> list[Finding]:
"""
Processes findings in chunks within N number of processes. The
ASYNC_FINDING_IMPORT_CHUNK_SIZE setting will determine how many
@@ -245,9 +247,9 @@ def async_process_findings(
def determine_process_method(
self,
- parsed_findings: List[Finding],
+ parsed_findings: list[Finding],
**kwargs: dict,
- ) -> List[Finding]:
+ ) -> list[Finding]:
"""
Determines whether to process the scan iteratively, or in chunks,
based upon the ASYNC_FINDING_IMPORT setting
@@ -319,10 +321,10 @@ def update_test_tags(self):
def update_import_history(
self,
- new_findings: List[Finding] = [],
- closed_findings: List[Finding] = [],
- reactivated_findings: List[Finding] = [],
- untouched_findings: List[Finding] = [],
+ new_findings: list[Finding] = [],
+ closed_findings: list[Finding] = [],
+ reactivated_findings: list[Finding] = [],
+ untouched_findings: list[Finding] = [],
) -> Test_Import:
"""Creates a record of the import or reimport operation that has occurred."""
# Quick fail check to determine if we even wanted this
@@ -452,9 +454,9 @@ def construct_imported_message(
def chunk_findings(
self,
- finding_list: List[Finding],
+ finding_list: list[Finding],
chunk_size: int = settings.ASYNC_FINDING_IMPORT_CHUNK_SIZE,
- ) -> List[List[Finding]]:
+ ) -> list[list[Finding]]:
"""
Split a single large list into a list of lists of size `chunk_size`.
For Example
@@ -632,7 +634,7 @@ def process_request_response_pairs(
def process_endpoints(
self,
finding: Finding,
- endpoints_to_add: List[Endpoint],
+ endpoints_to_add: list[Endpoint],
) -> None:
"""
Process any endpoints to add to the finding. Endpoints could come from two places
@@ -738,3 +740,38 @@ def adjust_date_format(self, obj):
if field in obj["fields"] and obj["fields"][field] is not None:
obj["fields"][field] = obj["fields"][field][:10] # Extract date (YYYY-MM-DD)
return obj
+
+ def notify_scan_added(
+ self,
+ test,
+ updated_count,
+ new_findings=[],
+ findings_mitigated=[],
+ findings_reactivated=[],
+ findings_untouched=[],
+ ):
+ logger.debug("Scan added notifications")
+
+ new_findings = sorted(new_findings, key=lambda x: x.numerical_severity)
+ findings_mitigated = sorted(findings_mitigated, key=lambda x: x.numerical_severity)
+ findings_reactivated = sorted(findings_reactivated, key=lambda x: x.numerical_severity)
+ findings_untouched = sorted(findings_untouched, key=lambda x: x.numerical_severity)
+
+ title = (
+ f"Created/Updated {updated_count} findings for {test.engagement.product}: {test.engagement.name}: {test}"
+ )
+
+ create_notification(
+ event="scan_added_empty" if updated_count == 0 else "scan_added",
+ title=title,
+ findings_new=new_findings,
+ findings_mitigated=findings_mitigated,
+ findings_reactivated=findings_reactivated,
+ finding_count=updated_count,
+ test=test,
+ engagement=test.engagement,
+ product=test.engagement.product,
+ findings_untouched=findings_untouched,
+ url=reverse("view_test", args=(test.id,)),
+ url_api=reverse("test-detail", args=(test.id,)),
+ )
diff --git a/dojo/importers/default_importer.py b/dojo/importers/default_importer.py
index 0ce417bdec8..c693305c551 100644
--- a/dojo/importers/default_importer.py
+++ b/dojo/importers/default_importer.py
@@ -1,14 +1,13 @@
import logging
-from typing import List, Tuple
from django.core.files.uploadedfile import TemporaryUploadedFile
from django.core.serializers import deserialize, serialize
from django.db.models.query_utils import Q
+from django.urls import reverse
import dojo.finding.helper as finding_helper
from dojo.transfer_findings import helper as hp_transfer_finding
import dojo.jira_link.helper as jira_helper
-import dojo.notifications.helper as notifications_helper
from dojo.importers.base_importer import BaseImporter, Parser
from dojo.importers.options import ImporterOptions
from dojo.models import (
@@ -18,6 +17,7 @@
Test_Import,
System_Settings
)
+from dojo.notifications.helper import create_notification
logger = logging.getLogger(__name__)
deduplicationLogger = logging.getLogger("dojo.specific-loggers.deduplication")
@@ -88,7 +88,7 @@ def process_scan(
scan: TemporaryUploadedFile,
*args: list,
**kwargs: dict,
- ) -> Tuple[Test, int, int, int, int, int, Test_Import]:
+ ) -> tuple[Test, int, int, int, int, int, Test_Import]:
"""
The full step process of taking a scan report, and converting it to
findings in the database. This entails the the following actions:
@@ -129,9 +129,17 @@ def process_scan(
)
# Send out some notifications to the user
logger.debug("IMPORT_SCAN: Generating notifications")
- notifications_helper.notify_test_created(self.test)
+ create_notification(
+ event="test_added",
+ title=f"Test created for {self.test.engagement.product}: {self.test.engagement.name}: {self.test}",
+ test=self.test,
+ engagement=self.test.engagement,
+ product=self.test.engagement.product,
+ url=reverse("view_test", args=(self.test.id,)),
+ url_api=reverse("test-detail", args=(self.test.id,)),
+ )
updated_count = len(new_findings) + len(closed_findings)
- notifications_helper.notify_scan_added(
+ self.notify_scan_added(
self.test,
updated_count,
new_findings=new_findings,
@@ -145,9 +153,9 @@ def process_scan(
def process_findings(
self,
- parsed_findings: List[Finding],
+ parsed_findings: list[Finding],
**kwargs: dict,
- ) -> List[Finding]:
+ ) -> list[Finding]:
"""
Saves findings in memory that were parsed from the scan report into the database.
This process involves first saving associated objects such as endpoints, files,
@@ -235,9 +243,9 @@ def process_findings(
def close_old_findings(
self,
- findings: List[Finding],
+ findings: list[Finding],
**kwargs: dict,
- ) -> List[Finding]:
+ ) -> list[Finding]:
"""
Closes old findings based on a hash code match at either the product
or the engagement scope. Closing an old finding entails setting the
@@ -318,7 +326,7 @@ def parse_findings(
self,
scan: TemporaryUploadedFile,
parser: Parser,
- ) -> List[Finding]:
+ ) -> list[Finding]:
"""
Determine how to parse the findings based on the presence of the
`get_tests` function on the parser object
@@ -336,7 +344,7 @@ def parse_findings_static_test_type(
self,
scan: TemporaryUploadedFile,
parser: Parser,
- ) -> List[Finding]:
+ ) -> list[Finding]:
"""
Creates a test object as part of the import process as there is not one present
at the time of import. Once the test is created, proceed with the traditional
@@ -352,7 +360,7 @@ def parse_findings_dynamic_test_type(
self,
scan: TemporaryUploadedFile,
parser: Parser,
- ) -> List[Finding]:
+ ) -> list[Finding]:
"""
Uses the parser to fetch any tests that may have been created
by the API based parser, aggregates all findings from each test
@@ -395,9 +403,9 @@ def parse_findings_dynamic_test_type(
def async_process_findings(
self,
- parsed_findings: List[Finding],
+ parsed_findings: list[Finding],
**kwargs: dict,
- ) -> List[Finding]:
+ ) -> list[Finding]:
"""
Processes findings in chunks within N number of processes. The
ASYNC_FINDING_IMPORT_CHUNK_SIZE setting will determine how many
diff --git a/dojo/importers/default_reimporter.py b/dojo/importers/default_reimporter.py
index 7f1c3bd15bc..0c4159ed669 100644
--- a/dojo/importers/default_reimporter.py
+++ b/dojo/importers/default_reimporter.py
@@ -1,5 +1,4 @@
import logging
-from typing import List, Tuple
from django.core.files.uploadedfile import TemporaryUploadedFile
from django.core.serializers import deserialize, serialize
@@ -7,7 +6,6 @@
import dojo.finding.helper as finding_helper
import dojo.jira_link.helper as jira_helper
-import dojo.notifications.helper as notifications_helper
from dojo.importers.base_importer import BaseImporter, Parser
from dojo.importers.options import ImporterOptions
from dojo.models import (
@@ -73,7 +71,7 @@ def process_scan(
scan: TemporaryUploadedFile,
*args: list,
**kwargs: dict,
- ) -> Tuple[Test, int, int, int, int, int, Test_Import]:
+ ) -> tuple[Test, int, int, int, int, int, Test_Import]:
"""
The full step process of taking a scan report, and converting it to
findings in the database. This entails the the following actions:
@@ -129,7 +127,7 @@ def process_scan(
updated_count = (
len(closed_findings) + len(reactivated_findings) + len(new_findings)
)
- notifications_helper.notify_scan_added(
+ self.notify_scan_added(
self.test,
updated_count,
new_findings=new_findings,
@@ -158,9 +156,9 @@ def determine_deduplication_algorithm(self) -> str:
def process_findings(
self,
- parsed_findings: List[Finding],
+ parsed_findings: list[Finding],
**kwargs: dict,
- ) -> Tuple[List[Finding], List[Finding], List[Finding], List[Finding]]:
+ ) -> tuple[list[Finding], list[Finding], list[Finding], list[Finding]]:
"""
Saves findings in memory that were parsed from the scan report into the database.
This process involves first saving associated objects such as endpoints, files,
@@ -256,9 +254,9 @@ def process_findings(
def close_old_findings(
self,
- findings: List[Finding],
+ findings: list[Finding],
**kwargs: dict,
- ) -> List[Finding]:
+ ) -> list[Finding]:
"""
Updates the status of findings that were detected as "old" by the reimport
process findings methods
@@ -289,7 +287,7 @@ def parse_findings(
self,
scan: TemporaryUploadedFile,
parser: Parser,
- ) -> List[Finding]:
+ ) -> list[Finding]:
"""
Determine how to parse the findings based on the presence of the
`get_tests` function on the parser object
@@ -307,7 +305,7 @@ def parse_findings_static_test_type(
self,
scan: TemporaryUploadedFile,
parser: Parser,
- ) -> List[Finding]:
+ ) -> list[Finding]:
"""
Parses the findings from file and assigns them to the test
that was supplied
@@ -320,7 +318,7 @@ def parse_findings_dynamic_test_type(
self,
scan: TemporaryUploadedFile,
parser: Parser,
- ) -> List[Finding]:
+ ) -> list[Finding]:
"""
Uses the parser to fetch any tests that may have been created
by the API based parser, aggregates all findings from each test
@@ -331,9 +329,9 @@ def parse_findings_dynamic_test_type(
def async_process_findings(
self,
- parsed_findings: List[Finding],
+ parsed_findings: list[Finding],
**kwargs: dict,
- ) -> Tuple[List[Finding], List[Finding], List[Finding], List[Finding]]:
+ ) -> tuple[list[Finding], list[Finding], list[Finding], list[Finding]]:
"""
Processes findings in chunks within N number of processes. The
ASYNC_FINDING_IMPORT_CHUNK_SIZE setting will determine how many
@@ -388,7 +386,7 @@ def async_process_findings(
def match_new_finding_to_existing_finding(
self,
unsaved_finding: Finding,
- ) -> List[Finding]:
+ ) -> list[Finding]:
"""Matches a single new finding to N existing findings and then returns those matches"""
# This code should match the logic used for deduplication out of the re-import feature.
# See utils.py deduplicate_* functions
@@ -429,7 +427,7 @@ def process_matched_finding(
self,
unsaved_finding: Finding,
existing_finding: Finding,
- ) -> Tuple[Finding, bool]:
+ ) -> tuple[Finding, bool]:
"""
Determine how to handle the an existing finding based on the status
that is possesses at the time of reimport
@@ -453,7 +451,7 @@ def process_matched_special_status_finding(
self,
unsaved_finding: Finding,
existing_finding: Finding,
- ) -> Tuple[Finding, bool]:
+ ) -> tuple[Finding, bool]:
"""
Determine if there is parity between statuses of the new and existing finding.
If so, do not touch either finding, and move on to the next unsaved finding
@@ -488,7 +486,7 @@ def process_matched_mitigated_finding(
self,
unsaved_finding: Finding,
existing_finding: Finding,
- ) -> Tuple[Finding, bool]:
+ ) -> tuple[Finding, bool]:
"""
Determine how mitigated the existing and new findings really are. We need
to cover circumstances where mitigation timestamps are different, and
@@ -583,7 +581,7 @@ def process_matched_active_finding(
self,
unsaved_finding: Finding,
existing_finding: Finding,
- ) -> Tuple[Finding, bool]:
+ ) -> tuple[Finding, bool]:
"""
The existing finding must be active here, so we need to compare it
closely with the new finding coming in and determine how to proceed
@@ -734,7 +732,7 @@ def process_groups_for_all_findings(
def process_results(
self,
**kwargs: dict,
- ) -> Tuple[List[Finding], List[Finding], List[Finding], List[Finding]]:
+ ) -> tuple[list[Finding], list[Finding], list[Finding], list[Finding]]:
"""
Determine how to to return the results based on whether the process was
ran asynchronous or not
diff --git a/dojo/importers/endpoint_manager.py b/dojo/importers/endpoint_manager.py
index 6686584da3c..625e3cb8073 100644
--- a/dojo/importers/endpoint_manager.py
+++ b/dojo/importers/endpoint_manager.py
@@ -1,5 +1,4 @@
import logging
-from typing import List
from django.conf import settings
from django.core.exceptions import MultipleObjectsReturned, ValidationError
@@ -25,7 +24,7 @@ class EndpointManager:
def add_endpoints_to_unsaved_finding(
self,
finding: Finding,
- endpoints: List[Endpoint],
+ endpoints: list[Endpoint],
**kwargs: dict,
) -> None:
"""Creates Endpoint objects for a single finding and creates the link via the endpoint status"""
@@ -61,7 +60,7 @@ def add_endpoints_to_unsaved_finding(
@app.task()
def mitigate_endpoint_status(
self,
- endpoint_status_list: List[Endpoint_Status],
+ endpoint_status_list: list[Endpoint_Status],
user: Dojo_User,
**kwargs: dict,
) -> None:
@@ -81,7 +80,7 @@ def mitigate_endpoint_status(
@app.task()
def reactivate_endpoint_status(
self,
- endpoint_status_list: List[Endpoint_Status],
+ endpoint_status_list: list[Endpoint_Status],
**kwargs: dict,
) -> None:
"""Reactivate all endpoint status objects that are supplied"""
@@ -98,9 +97,9 @@ def reactivate_endpoint_status(
def chunk_endpoints(
self,
- endpoint_list: List[Endpoint],
+ endpoint_list: list[Endpoint],
chunk_size: int = settings.ASYNC_FINDING_IMPORT_CHUNK_SIZE,
- ) -> List[List[Endpoint]]:
+ ) -> list[list[Endpoint]]:
"""
Split a single large list into a list of lists of size `chunk_size`.
For Example
@@ -117,7 +116,7 @@ def chunk_endpoints(
def chunk_endpoints_and_disperse(
self,
finding: Finding,
- endpoints: List[Endpoint],
+ endpoints: list[Endpoint],
**kwargs: dict,
) -> None:
"""
@@ -141,7 +140,7 @@ def chunk_endpoints_and_disperse(
def clean_unsaved_endpoints(
self,
- endpoints: List[Endpoint],
+ endpoints: list[Endpoint],
) -> None:
"""
Clean endpoints that are supplied. For any endpoints that fail this validation
@@ -156,7 +155,7 @@ def clean_unsaved_endpoints(
def chunk_endpoints_and_reactivate(
self,
- endpoint_status_list: List[Endpoint_Status],
+ endpoint_status_list: list[Endpoint_Status],
**kwargs: dict,
) -> None:
"""
@@ -180,7 +179,7 @@ def chunk_endpoints_and_reactivate(
def chunk_endpoints_and_mitigate(
self,
- endpoint_status_list: List[Endpoint_Status],
+ endpoint_status_list: list[Endpoint_Status],
user: Dojo_User,
**kwargs: dict,
) -> None:
diff --git a/dojo/importers/options.py b/dojo/importers/options.py
index 2431975856e..bd719120a42 100644
--- a/dojo/importers/options.py
+++ b/dojo/importers/options.py
@@ -1,8 +1,9 @@
import logging
+from collections.abc import Callable
from datetime import datetime
from functools import wraps
from pprint import pformat as pp
-from typing import Any, Callable, List, Optional
+from typing import Any
from django.contrib.auth.models import User
from django.db.models import Model
@@ -57,19 +58,19 @@ def load_base_options(
self.do_not_reactivate: bool = self.validate_do_not_reactivate(*args, **kwargs)
self.commit_hash: str = self.validate_commit_hash(*args, **kwargs)
self.create_finding_groups_for_all_findings: bool = self.validate_create_finding_groups_for_all_findings(*args, **kwargs)
- self.endpoints_to_add: List[Endpoint] | None = self.validate_endpoints_to_add(*args, **kwargs)
+ self.endpoints_to_add: list[Endpoint] | None = self.validate_endpoints_to_add(*args, **kwargs)
self.engagement: Engagement | None = self.validate_engagement(*args, **kwargs)
self.environment: Development_Environment | None = self.validate_environment(*args, **kwargs)
self.group_by: str = self.validate_group_by(*args, **kwargs)
self.import_type: str = self.validate_import_type(*args, **kwargs)
self.lead: Dojo_User | None = self.validate_lead(*args, **kwargs)
self.minimum_severity: str = self.validate_minimum_severity(*args, **kwargs)
- self.parsed_findings: List[Finding] | None = self.validate_parsed_findings(*args, **kwargs)
+ self.parsed_findings: list[Finding] | None = self.validate_parsed_findings(*args, **kwargs)
self.push_to_jira: bool = self.validate_push_to_jira(*args, **kwargs)
self.scan_date: datetime = self.validate_scan_date(*args, **kwargs)
self.scan_type: str = self.validate_scan_type(*args, **kwargs)
self.service: str = self.validate_service(*args, **kwargs)
- self.tags: List[str] = self.validate_tags(*args, **kwargs)
+ self.tags: list[str] = self.validate_tags(*args, **kwargs)
self.test: Test | None = self.validate_test(*args, **kwargs)
self.user: Dojo_User | None = self.validate_user(*args, **kwargs)
self.test_title: str = self.validate_test_title(*args, **kwargs)
@@ -88,7 +89,7 @@ def load_additional_options(
def log_translation(
self,
- header_message: Optional[str] = None,
+ header_message: str | None = None,
):
if header_message is not None:
logger.debug(header_message)
@@ -181,7 +182,7 @@ def set_dict_fields(
def validate(
self,
field_name: str,
- expected_types: List[Callable] = [],
+ expected_types: list[Callable] = [],
*,
required: bool = False,
default: Any = None,
@@ -192,7 +193,7 @@ def validate(
and ensures it is the correct type before returning it
"""
# Get the value from the kwargs
- value = kwargs.get(field_name, None)
+ value = kwargs.get(field_name)
# Make sure we have something if we need it
if required is True:
if value is None:
@@ -529,13 +530,15 @@ def validate_tags(
*args: list,
**kwargs: dict,
) -> list:
- return self.validate(
+ tags = self.validate(
"tags",
expected_types=[list],
required=False,
default=[],
**kwargs,
)
+ # Force all tags to be lowercase
+ return [tag.lower() for tag in tags]
def validate_test(
self,
diff --git a/dojo/jira_link/helper.py b/dojo/jira_link/helper.py
index 860f4f01d1b..308331987a9 100755
--- a/dojo/jira_link/helper.py
+++ b/dojo/jira_link/helper.py
@@ -2,6 +2,7 @@
import json
import logging
import os
+from pathlib import Path
from typing import Any
import requests
@@ -145,9 +146,11 @@ def can_be_pushed_to_jira(obj, form=None):
logger.debug("can_be_pushed_to_jira: %s, %s, %s", active, verified, severity)
- if not active or not verified:
- logger.debug("Findings must be active and verified to be pushed to JIRA")
- return False, "Findings must be active and verified to be pushed to JIRA", "not_active_or_verified"
+ isenforced = get_system_setting("enforce_verified_status", True)
+
+ if not active or (not verified and isenforced):
+ logger.debug("Findings must be active and verified, if enforced by system settings, to be pushed to JIRA")
+ return False, "Findings must be active and verified, if enforced by system settings, to be pushed to JIRA", "not_active_or_verified"
jira_minimum_threshold = None
if System_Settings.objects.get().jira_minimum_severity:
@@ -191,13 +194,11 @@ def get_jira_project(obj, use_inheritance=True):
if obj.jira_project:
return obj.jira_project
# some old jira_issue records don't have a jira_project, so try to go via the finding instead
- if hasattr(obj, "finding") and obj.finding:
- return get_jira_project(obj.finding, use_inheritance=use_inheritance)
- if hasattr(obj, "engagement") and obj.engagement:
+ if (hasattr(obj, "finding") and obj.finding) or (hasattr(obj, "engagement") and obj.engagement):
return get_jira_project(obj.finding, use_inheritance=use_inheritance)
return None
- if isinstance(obj, Finding) or isinstance(obj, Stub_Finding):
+ if isinstance(obj, Finding | Stub_Finding):
finding = obj
return get_jira_project(finding.test)
@@ -281,10 +282,7 @@ def get_jira_issue_url(issue):
def get_jira_project_url(obj):
logger.debug("getting jira project url")
- if not isinstance(obj, JIRA_Project):
- jira_project = get_jira_project(obj)
- else:
- jira_project = obj
+ jira_project = get_jira_project(obj) if not isinstance(obj, JIRA_Project) else obj
if jira_project:
logger.debug("getting jira project url2")
@@ -340,14 +338,14 @@ def get_jira_issue_template(obj):
def get_jira_creation(obj):
- if isinstance(obj, Finding) or isinstance(obj, Engagement) or isinstance(obj, Finding_Group):
+ if isinstance(obj, Finding | Engagement | Finding_Group):
if obj.has_jira_issue:
return obj.jira_issue.jira_creation
return None
def get_jira_change(obj):
- if isinstance(obj, Finding) or isinstance(obj, Engagement) or isinstance(obj, Finding_Group):
+ if isinstance(obj, Finding | Engagement | Finding_Group):
if obj.has_jira_issue:
return obj.jira_issue.jira_change
else:
@@ -367,7 +365,7 @@ def has_jira_issue(obj):
def get_jira_issue(obj):
- if isinstance(obj, Finding) or isinstance(obj, Engagement) or isinstance(obj, Finding_Group):
+ if isinstance(obj, Finding | Engagement | Finding_Group):
try:
return obj.jira_issue
except JIRA_Issue.DoesNotExist:
@@ -588,7 +586,7 @@ def get_labels(obj):
def get_tags(obj):
# Update Label with system setttings label
tags = []
- if isinstance(obj, Finding) or isinstance(obj, Engagement):
+ if isinstance(obj, Finding | Engagement):
obj_tags = obj.tags.all()
if obj_tags:
for tag in obj_tags:
@@ -1068,11 +1066,8 @@ def issue_from_jira_is_active(issue_from_jira):
if not issue_from_jira.fields.resolution:
return True
- if issue_from_jira.fields.resolution == "None":
- return True
-
# some kind of resolution is present that is not null or None
- return False
+ return issue_from_jira.fields.resolution == "None"
def push_status_to_jira(obj, jira_instance, jira, issue, save=False):
@@ -1185,7 +1180,7 @@ def is_jira_project_valid(jira_project):
def jira_attachment(finding, jira, issue, file, jira_filename=None):
basename = file
if jira_filename is None:
- basename = os.path.basename(file)
+ basename = Path(file).name
# Check to see if the file has been uploaded to Jira
# TODO: JIRA: check for local existince of attachment as it currently crashes if local attachment doesn't exist
@@ -1248,7 +1243,9 @@ def close_epic(eng, push_to_jira, **kwargs):
r = requests.post(
url=req_url,
auth=HTTPBasicAuth(jira_instance.username, jira_instance.password),
- json=json_data)
+ json=json_data,
+ timeout=settings.REQUESTS_TIMEOUT,
+ )
if r.status_code != 204:
logger.warning(f"JIRA close epic failed with error: {r.text}")
return False
@@ -1286,7 +1283,14 @@ def update_epic(engagement, **kwargs):
if not epic_name:
epic_name = engagement.name
- issue.update(summary=epic_name, description=epic_name)
+ epic_priority = kwargs.get("epic_priority")
+
+ jira_issue_update_kwargs = {
+ "summary": epic_name,
+ "description": epic_name,
+ "priority": {"name": epic_priority},
+ }
+ issue.update(**jira_issue_update_kwargs)
return True
except JIRAError as e:
logger.exception(e)
@@ -1424,6 +1428,13 @@ def add_simple_jira_comment(jira_instance, jira_issue, comment):
return False
+def jira_already_linked(finding, jira_issue_key, jira_id) -> Finding | None:
+ jira_issues = JIRA_Issue.objects.filter(jira_id=jira_id, jira_key=jira_issue_key).exclude(engagement__isnull=False)
+ jira_issues = jira_issues.exclude(finding=finding)
+
+ return jira_issues.first()
+
+
def finding_link_jira(request, finding, new_jira_issue_key):
logger.debug("linking existing jira issue %s for finding %i", new_jira_issue_key, finding.id)
diff --git a/dojo/jira_link/views.py b/dojo/jira_link/views.py
index 0461f600dee..84d33e6ffdd 100755
--- a/dojo/jira_link/views.py
+++ b/dojo/jira_link/views.py
@@ -100,10 +100,10 @@ def webhook(request, secret=None):
findings = None
# Determine what type of object we will be working with
if jissue.finding:
- logging.debug(f"Received issue update for {jissue.jira_key} for finding {jissue.finding.id}")
+ logger.debug(f"Received issue update for {jissue.jira_key} for finding {jissue.finding.id}")
findings = [jissue.finding]
elif jissue.finding_group:
- logging.debug(f"Received issue update for {jissue.jira_key} for finding group {jissue.finding_group}")
+ logger.debug(f"Received issue update for {jissue.jira_key} for finding group {jissue.finding_group}")
findings = jissue.finding_group.findings.all()
elif jissue.engagement:
return webhook_responser_handler("debug", "Update for engagement ignored")
@@ -228,7 +228,7 @@ def check_for_and_create_comment(parsed_json):
jissue = JIRA_Issue.objects.get(jira_id=jid)
except JIRA_Instance.DoesNotExist:
return webhook_responser_handler("info", f"JIRA issue {jid} is not linked to a DefectDojo Finding")
- logging.debug(f"Received issue comment for {jissue.jira_key}")
+ logger.debug(f"Received issue comment for {jissue.jira_key}")
logger.debug("jissue: %s", vars(jissue))
jira_usernames = JIRA_Instance.objects.values_list("username", flat=True)
diff --git a/dojo/management/commands/import_github_languages.py b/dojo/management/commands/import_github_languages.py
index 09e1be8bd20..9e1c45ffb32 100755
--- a/dojo/management/commands/import_github_languages.py
+++ b/dojo/management/commands/import_github_languages.py
@@ -2,6 +2,7 @@
import logging
import requests
+from django.conf import settings
from django.core.management.base import BaseCommand
from dojo.models import Language_Type
@@ -22,7 +23,12 @@ def handle(self, *args, **options):
logger.info("Started importing languages from GitHub ...")
try:
- deserialized = json.loads(requests.get("https://raw.githubusercontent.com/ozh/github-colors/master/colors.json").text)
+ deserialized = json.loads(
+ requests.get(
+ "https://raw.githubusercontent.com/ozh/github-colors/master/colors.json",
+ timeout=settings.REQUESTS_TIMEOUT,
+ ).text,
+ )
except:
msg = "Invalid format"
raise Exception(msg)
diff --git a/dojo/management/commands/import_surveys.py b/dojo/management/commands/import_surveys.py
index 0f242cbd2ea..6fcdd53bde7 100755
--- a/dojo/management/commands/import_surveys.py
+++ b/dojo/management/commands/import_surveys.py
@@ -1,4 +1,5 @@
import os
+from pathlib import Path
from django.core.management.base import BaseCommand
from django.db import connection
@@ -27,7 +28,7 @@ def handle(self, *args, **options):
row = cursor.fetchone()
ctype_id = row[0]
# Find the current id in the surveys file
- path = os.path.dirname(os.path.abspath(__file__))
+ path = Path(os.path.abspath(__file__)).parent
path = path[:-19] + "fixtures/initial_surveys.json"
contents = open(path, encoding="utf-8").readlines()
for line in contents:
diff --git a/dojo/management/commands/jira_async_updates.py b/dojo/management/commands/jira_async_updates.py
index 7d50d0031e6..e48249ebf58 100755
--- a/dojo/management/commands/jira_async_updates.py
+++ b/dojo/management/commands/jira_async_updates.py
@@ -1,11 +1,11 @@
import logging
from django.core.management.base import BaseCommand
-from django.utils import timezone
from jira.exceptions import JIRAError
import dojo.jira_link.helper as jira_helper
from dojo.models import Dojo_User, Finding, Notes, User
+from dojo.utils import get_system_setting, timezone
"""
Author: Aaron Weaver
@@ -21,7 +21,11 @@ class Command(BaseCommand):
def handle(self, *args, **options):
findings = Finding.objects.exclude(jira_issue__isnull=True)
- findings = findings.filter(verified=True, active=True)
+ if get_system_setting("enforce_verified_status", True):
+ findings = findings.filter(verified=True, active=True)
+ else:
+ findings = findings.filter(active=True)
+
findings = findings.prefetch_related("jira_issue")
# finding = Finding.objects.get(id=1)
for finding in findings:
diff --git a/dojo/management/commands/print_settings.py b/dojo/management/commands/print_settings.py
index 6aea64876bf..ce6ab9feefe 100755
--- a/dojo/management/commands/print_settings.py
+++ b/dojo/management/commands/print_settings.py
@@ -21,4 +21,4 @@ def handle(self, *args, **options):
value = getattr(settings, attr)
a_dict[attr] = value
- logging.info(pformat(a_dict))
+ logger.info(pformat(a_dict))
diff --git a/dojo/management/commands/push_to_jira_update.py b/dojo/management/commands/push_to_jira_update.py
index c44fbe68f19..164bc8e9704 100755
--- a/dojo/management/commands/push_to_jira_update.py
+++ b/dojo/management/commands/push_to_jira_update.py
@@ -23,7 +23,10 @@ class Command(BaseCommand):
def handle(self, *args, **options):
findings = Finding.objects.exclude(jira_issue__isnull=True)
- findings = findings.filter(verified=True, active=True)
+ if get_system_setting("enforce_verified_status", True):
+ findings = findings.filter(verified=True, active=True)
+ else:
+ findings = findings.filter(active=True)
for finding in findings:
logger.info("Checking issue:" + str(finding.id))
diff --git a/dojo/metrics/utils.py b/dojo/metrics/utils.py
index 191c454b6e9..9a4b9f6bb04 100644
--- a/dojo/metrics/utils.py
+++ b/dojo/metrics/utils.py
@@ -1,9 +1,10 @@
import operator
+from collections.abc import Callable
from datetime import date, datetime, timedelta
from enum import Enum
from functools import partial
-from typing import Any, Callable, NamedTuple, Type, TypeVar, Union
+from typing import Any, NamedTuple, TypeVar
from dateutil.relativedelta import relativedelta
from django.contrib import messages
@@ -34,7 +35,7 @@
)
-def get_metrics_finding_filter_class() -> Type[Union[MetricsFindingFilter, MetricsFindingFilterWithoutObjectLookups]]:
+def get_metrics_finding_filter_class() -> type[MetricsFindingFilter | MetricsFindingFilterWithoutObjectLookups]:
if get_system_setting("filter_string_matching", False):
return MetricsFindingFilterWithoutObjectLookups
return MetricsFindingFilter
@@ -108,8 +109,10 @@ def finding_queries(
weekly_counts = query_counts_for_period(MetricsPeriod.WEEK, weeks_between)
top_ten = get_authorized_products(Permissions.Product_View)
- top_ten = top_ten.filter(engagement__test__finding__verified=True,
- engagement__test__finding__false_p=False,
+ if get_system_setting("enforce_verified_status", True):
+ top_ten = top_ten.filter(engagement__test__finding__verified=True)
+
+ top_ten = top_ten.filter(engagement__test__finding__false_p=False,
engagement__test__finding__duplicate=False,
engagement__test__finding__out_of_scope=False,
engagement__test__finding__mitigated__isnull=True,
@@ -257,7 +260,7 @@ class _MetricsPeriodEntry(NamedTuple):
"""
datetime_name: str
- db_method: Union[TruncWeek, TruncMonth]
+ db_method: TruncWeek | TruncMonth
class MetricsPeriod(_MetricsPeriodEntry, Enum):
@@ -346,7 +349,7 @@ def severity_count(
queryset: MetricsQuerySet,
method: str,
expression: str,
-) -> Union[MetricsQuerySet, dict[str, int]]:
+) -> MetricsQuerySet | dict[str, int]:
"""
Aggregates counts by severity for the given queryset.
@@ -393,7 +396,7 @@ def identify_view(
def js_epoch(
- d: Union[date, datetime],
+ d: date | datetime,
) -> int:
"""
Converts a date/datetime object to a JavaScript epoch time (for use in FE charts)
diff --git a/dojo/metrics/views.py b/dojo/metrics/views.py
index 1142fce36f0..02270d0010b 100755
--- a/dojo/metrics/views.py
+++ b/dojo/metrics/views.py
@@ -119,7 +119,7 @@ def metrics(request, mtype):
punchcard = []
ticks = []
- if "view" in request.GET and "dashboard" == request.GET["view"]:
+ if "view" in request.GET and request.GET["view"] == "dashboard":
punchcard, ticks = get_punchcard_data(all_findings, filters["start_date"], filters["weeks_between"], view)
page_name = _("%(team_name)s Metrics") % {"team_name": get_system_setting("team_name")}
template = "dojo/dashboard-metrics.html"
@@ -191,13 +191,17 @@ def simple_metrics(request):
findings_broken_out = {}
total = Finding.objects.filter(test__engagement__product__prod_type=pt,
- verified=True,
false_p=False,
duplicate=False,
out_of_scope=False,
date__month=now.month,
date__year=now.year,
- ).distinct()
+ )
+
+ if get_system_setting("enforce_verified_status", True):
+ total = total.filter(verified=True)
+
+ total = total.distinct()
for f in total:
if f.severity == "Critical":
@@ -355,53 +359,99 @@ def product_type_counts(request):
then=Value(1)),
output_field=IntegerField())))["total"]
- overall_in_pt = Finding.objects.filter(date__lt=end_date,
- verified=True,
- false_p=False,
- duplicate=False,
- out_of_scope=False,
- mitigated__isnull=True,
- test__engagement__product__prod_type=pt,
- severity__in=("Critical", "High", "Medium", "Low")).values(
- "numerical_severity").annotate(Count("numerical_severity")).order_by("numerical_severity")
-
- total_overall_in_pt = Finding.objects.filter(date__lte=end_date,
- verified=True,
- false_p=False,
- duplicate=False,
- out_of_scope=False,
- mitigated__isnull=True,
- test__engagement__product__prod_type=pt,
- severity__in=("Critical", "High", "Medium", "Low")).aggregate(
- total=Sum(
- Case(When(severity__in=("Critical", "High", "Medium", "Low"),
- then=Value(1)),
- output_field=IntegerField())))["total"]
+ if get_system_setting("enforce_verified_status", True):
+ overall_in_pt = Finding.objects.filter(date__lt=end_date,
+ verified=True,
+ false_p=False,
+ duplicate=False,
+ out_of_scope=False,
+ mitigated__isnull=True,
+ test__engagement__product__prod_type=pt,
+ severity__in=("Critical", "High", "Medium", "Low")).values(
+ "numerical_severity").annotate(Count("numerical_severity")).order_by("numerical_severity")
+
+ total_overall_in_pt = Finding.objects.filter(date__lte=end_date,
+ verified=True,
+ false_p=False,
+ duplicate=False,
+ out_of_scope=False,
+ mitigated__isnull=True,
+ test__engagement__product__prod_type=pt,
+ severity__in=("Critical", "High", "Medium", "Low")).aggregate(
+ total=Sum(
+ Case(When(severity__in=("Critical", "High", "Medium", "Low"),
+ then=Value(1)),
+ output_field=IntegerField())))["total"]
+
+ all_current_in_pt = Finding.objects.filter(date__lte=end_date,
+ verified=True,
+ false_p=False,
+ duplicate=False,
+ out_of_scope=False,
+ mitigated__isnull=True,
+ test__engagement__product__prod_type=pt,
+ severity__in=(
+ "Critical", "High", "Medium", "Low")).prefetch_related(
+ "test__engagement__product",
+ "test__engagement__product__prod_type",
+ "test__engagement__risk_acceptance",
+ "reporter").order_by(
+ "numerical_severity")
+
+ top_ten = Product.objects.filter(engagement__test__finding__date__lte=end_date,
+ engagement__test__finding__verified=True,
+ engagement__test__finding__false_p=False,
+ engagement__test__finding__duplicate=False,
+ engagement__test__finding__out_of_scope=False,
+ engagement__test__finding__mitigated__isnull=True,
+ engagement__test__finding__severity__in=(
+ "Critical", "High", "Medium", "Low"),
+ prod_type=pt)
+ else:
+ overall_in_pt = Finding.objects.filter(date__lt=end_date,
+ false_p=False,
+ duplicate=False,
+ out_of_scope=False,
+ mitigated__isnull=True,
+ test__engagement__product__prod_type=pt,
+ severity__in=("Critical", "High", "Medium", "Low")).values(
+ "numerical_severity").annotate(Count("numerical_severity")).order_by("numerical_severity")
+
+ total_overall_in_pt = Finding.objects.filter(date__lte=end_date,
+ false_p=False,
+ duplicate=False,
+ out_of_scope=False,
+ mitigated__isnull=True,
+ test__engagement__product__prod_type=pt,
+ severity__in=("Critical", "High", "Medium", "Low")).aggregate(
+ total=Sum(
+ Case(When(severity__in=("Critical", "High", "Medium", "Low"),
+ then=Value(1)),
+ output_field=IntegerField())))["total"]
+
+ all_current_in_pt = Finding.objects.filter(date__lte=end_date,
+ false_p=False,
+ duplicate=False,
+ out_of_scope=False,
+ mitigated__isnull=True,
+ test__engagement__product__prod_type=pt,
+ severity__in=(
+ "Critical", "High", "Medium", "Low")).prefetch_related(
+ "test__engagement__product",
+ "test__engagement__product__prod_type",
+ "test__engagement__risk_acceptance",
+ "reporter").order_by(
+ "numerical_severity")
+
+ top_ten = Product.objects.filter(engagement__test__finding__date__lte=end_date,
+ engagement__test__finding__false_p=False,
+ engagement__test__finding__duplicate=False,
+ engagement__test__finding__out_of_scope=False,
+ engagement__test__finding__mitigated__isnull=True,
+ engagement__test__finding__severity__in=(
+ "Critical", "High", "Medium", "Low"),
+ prod_type=pt)
- all_current_in_pt = Finding.objects.filter(date__lte=end_date,
- verified=True,
- false_p=False,
- duplicate=False,
- out_of_scope=False,
- mitigated__isnull=True,
- test__engagement__product__prod_type=pt,
- severity__in=(
- "Critical", "High", "Medium", "Low")).prefetch_related(
- "test__engagement__product",
- "test__engagement__product__prod_type",
- "test__engagement__risk_acceptance",
- "reporter").order_by(
- "numerical_severity")
-
- top_ten = Product.objects.filter(engagement__test__finding__date__lte=end_date,
- engagement__test__finding__verified=True,
- engagement__test__finding__false_p=False,
- engagement__test__finding__duplicate=False,
- engagement__test__finding__out_of_scope=False,
- engagement__test__finding__mitigated__isnull=True,
- engagement__test__finding__severity__in=(
- "Critical", "High", "Medium", "Low"),
- prod_type=pt)
top_ten = severity_count(top_ten, "annotate", "engagement__test__finding__severity").order_by("-critical", "-high", "-medium", "-low")[:10]
cip = {"S0": 0,
@@ -510,56 +560,105 @@ def product_tag_counts(request):
then=Value(1)),
output_field=IntegerField())))["total"]
- overall_in_pt = Finding.objects.filter(date__lt=end_date,
- verified=True,
- false_p=False,
- duplicate=False,
- out_of_scope=False,
- mitigated__isnull=True,
- test__engagement__product__tags__name=pt,
- test__engagement__product__in=prods,
- severity__in=("Critical", "High", "Medium", "Low")).values(
- "numerical_severity").annotate(Count("numerical_severity")).order_by("numerical_severity")
-
- total_overall_in_pt = Finding.objects.filter(date__lte=end_date,
- verified=True,
- false_p=False,
- duplicate=False,
- out_of_scope=False,
- mitigated__isnull=True,
- test__engagement__product__tags__name=pt,
- test__engagement__product__in=prods,
- severity__in=("Critical", "High", "Medium", "Low")).aggregate(
- total=Sum(
- Case(When(severity__in=("Critical", "High", "Medium", "Low"),
- then=Value(1)),
- output_field=IntegerField())))["total"]
+ if get_system_setting("enforce_verified_status", True):
+ overall_in_pt = Finding.objects.filter(date__lt=end_date,
+ verified=True,
+ false_p=False,
+ duplicate=False,
+ out_of_scope=False,
+ mitigated__isnull=True,
+ test__engagement__product__tags__name=pt,
+ test__engagement__product__in=prods,
+ severity__in=("Critical", "High", "Medium", "Low")).values(
+ "numerical_severity").annotate(Count("numerical_severity")).order_by("numerical_severity")
+
+ total_overall_in_pt = Finding.objects.filter(date__lte=end_date,
+ verified=True,
+ false_p=False,
+ duplicate=False,
+ out_of_scope=False,
+ mitigated__isnull=True,
+ test__engagement__product__tags__name=pt,
+ test__engagement__product__in=prods,
+ severity__in=("Critical", "High", "Medium", "Low")).aggregate(
+ total=Sum(
+ Case(When(severity__in=("Critical", "High", "Medium", "Low"),
+ then=Value(1)),
+ output_field=IntegerField())))["total"]
+
+ all_current_in_pt = Finding.objects.filter(date__lte=end_date,
+ verified=True,
+ false_p=False,
+ duplicate=False,
+ out_of_scope=False,
+ mitigated__isnull=True,
+ test__engagement__product__tags__name=pt,
+ test__engagement__product__in=prods,
+ severity__in=(
+ "Critical", "High", "Medium", "Low")).prefetch_related(
+ "test__engagement__product",
+ "test__engagement__product__prod_type",
+ "test__engagement__risk_acceptance",
+ "reporter").order_by(
+ "numerical_severity")
+
+ top_ten = Product.objects.filter(engagement__test__finding__date__lte=end_date,
+ engagement__test__finding__verified=True,
+ engagement__test__finding__false_p=False,
+ engagement__test__finding__duplicate=False,
+ engagement__test__finding__out_of_scope=False,
+ engagement__test__finding__mitigated__isnull=True,
+ engagement__test__finding__severity__in=(
+ "Critical", "High", "Medium", "Low"),
+ tags__name=pt, engagement__product__in=prods)
+ else:
+ overall_in_pt = Finding.objects.filter(date__lt=end_date,
+ false_p=False,
+ duplicate=False,
+ out_of_scope=False,
+ mitigated__isnull=True,
+ test__engagement__product__tags__name=pt,
+ test__engagement__product__in=prods,
+ severity__in=("Critical", "High", "Medium", "Low")).values(
+ "numerical_severity").annotate(Count("numerical_severity")).order_by("numerical_severity")
+
+ total_overall_in_pt = Finding.objects.filter(date__lte=end_date,
+ false_p=False,
+ duplicate=False,
+ out_of_scope=False,
+ mitigated__isnull=True,
+ test__engagement__product__tags__name=pt,
+ test__engagement__product__in=prods,
+ severity__in=("Critical", "High", "Medium", "Low")).aggregate(
+ total=Sum(
+ Case(When(severity__in=("Critical", "High", "Medium", "Low"),
+ then=Value(1)),
+ output_field=IntegerField())))["total"]
+
+ all_current_in_pt = Finding.objects.filter(date__lte=end_date,
+ false_p=False,
+ duplicate=False,
+ out_of_scope=False,
+ mitigated__isnull=True,
+ test__engagement__product__tags__name=pt,
+ test__engagement__product__in=prods,
+ severity__in=(
+ "Critical", "High", "Medium", "Low")).prefetch_related(
+ "test__engagement__product",
+ "test__engagement__product__prod_type",
+ "test__engagement__risk_acceptance",
+ "reporter").order_by(
+ "numerical_severity")
+
+ top_ten = Product.objects.filter(engagement__test__finding__date__lte=end_date,
+ engagement__test__finding__false_p=False,
+ engagement__test__finding__duplicate=False,
+ engagement__test__finding__out_of_scope=False,
+ engagement__test__finding__mitigated__isnull=True,
+ engagement__test__finding__severity__in=(
+ "Critical", "High", "Medium", "Low"),
+ tags__name=pt, engagement__product__in=prods)
- all_current_in_pt = Finding.objects.filter(date__lte=end_date,
- verified=True,
- false_p=False,
- duplicate=False,
- out_of_scope=False,
- mitigated__isnull=True,
- test__engagement__product__tags__name=pt,
- test__engagement__product__in=prods,
- severity__in=(
- "Critical", "High", "Medium", "Low")).prefetch_related(
- "test__engagement__product",
- "test__engagement__product__prod_type",
- "test__engagement__risk_acceptance",
- "reporter").order_by(
- "numerical_severity")
-
- top_ten = Product.objects.filter(engagement__test__finding__date__lte=end_date,
- engagement__test__finding__verified=True,
- engagement__test__finding__false_p=False,
- engagement__test__finding__duplicate=False,
- engagement__test__finding__out_of_scope=False,
- engagement__test__finding__mitigated__isnull=True,
- engagement__test__finding__severity__in=(
- "Critical", "High", "Medium", "Low"),
- tags__name=pt, engagement__product__in=prods)
top_ten = severity_count(top_ten, "annotate", "engagement__test__finding__severity").order_by("-critical", "-high", "-medium", "-low")[:10]
cip = {"S0": 0,
@@ -637,7 +736,11 @@ def view_engineer(request, eid):
raise PermissionDenied
now = timezone.now()
- findings = Finding.objects.filter(reporter=user, verified=True)
+ if get_system_setting("enforce_verified_status", True):
+ findings = Finding.objects.filter(reporter=user, verified=True)
+ else:
+ findings = Finding.objects.filter(reporter=user)
+
closed_findings = Finding.objects.filter(mitigated_by=user)
open_findings = findings.exclude(mitigated__isnull=False)
open_month = findings.filter(date__year=now.year, date__month=now.month)
diff --git a/dojo/middleware.py b/dojo/middleware.py
index 29eff445b34..9fcb8a51dbc 100755
--- a/dojo/middleware.py
+++ b/dojo/middleware.py
@@ -35,12 +35,16 @@ def __init__(self, get_response):
self.get_response = get_response
def __call__(self, request):
- assert hasattr(request, "user"), "The Login Required middleware\
- requires authentication middleware to be installed. Edit your\
- MIDDLEWARE_CLASSES setting to insert\
- 'django.contrib.auth.middleware.AuthenticationMiddleware'. If that doesn't\
- work, ensure your TEMPLATE_CONTEXT_PROCESSORS setting includes\
- 'django.core.context_processors.auth'."
+ if not hasattr(request, "user"):
+ msg = (
+ "The Login Required middleware "
+ "requires authentication middleware to be installed. Edit your "
+ "MIDDLEWARE_CLASSES setting to insert "
+ "'django.contrib.auth.middleware.AuthenticationMiddleware'. If that doesn't "
+ "work, ensure your TEMPLATE_CONTEXT_PROCESSORS setting includes "
+ "'django.core.context_processors.auth'."
+ )
+ raise AttributeError(msg)
if not request.user.is_authenticated:
path = request.path_info.lstrip("/")
if not any(m.match(path) for m in EXEMPT_URLS):
diff --git a/dojo/models.py b/dojo/models.py
index 295c4db82fe..0e8e2427b55 100644
--- a/dojo/models.py
+++ b/dojo/models.py
@@ -6,7 +6,7 @@
import re
import warnings
from datetime import datetime, timedelta
-from typing import Dict, Optional, Set
+from pathlib import Path
from uuid import uuid4
import hyperlink
import secrets
@@ -142,7 +142,9 @@ def __init__(self, directory=None, keep_basename=False, keep_ext=True):
self.keep_ext = keep_ext
def __call__(self, model_instance, filename):
- base, ext = os.path.splitext(filename)
+ path = Path(filename)
+ base = path.parent / path.stem
+ ext = path.suffix
filename = f"{base}_{uuid4()}" if self.keep_basename else str(uuid4())
if self.keep_ext:
filename += ext
@@ -360,6 +362,15 @@ class System_Settings(models.Model):
webhooks_notifications_timeout = models.IntegerField(default=10,
help_text=_("How many seconds will DefectDojo waits for response from webhook endpoint"))
+ enforce_verified_status = models.BooleanField(
+ default=True,
+ verbose_name=_("Enforce Verified Status"),
+ help_text=_("When enabled, features such as product grading, jira "
+ "integration, metrics, and reports will only interact "
+ "with verified findings.",
+ ),
+ )
+
false_positive_history = models.BooleanField(
default=False, help_text=_(
"(EXPERIMENTAL) DefectDojo will automatically mark the finding as a "
@@ -740,6 +751,25 @@ def get_accessible_url(self, obj, obj_id):
return f"access_file/{self.id}/{obj_id}/{obj_type}"
+ def clean(self):
+ if not self.title:
+ self.title = ""
+
+ valid_extensions = settings.FILE_UPLOAD_TYPES
+
+ # why does this not work with self.file....
+ file_name = self.file.url if self.file else self.title
+ if Path(file_name).suffix.lower() not in valid_extensions:
+ if accepted_extensions := f"{', '.join(valid_extensions)}":
+ msg = (
+ _("Unsupported extension. Supported extensions are as follows: %s") % accepted_extensions
+ )
+ else:
+ msg = (
+ _("File uploads are prohibited due to the list of acceptable file extensions being empty")
+ )
+ raise ValidationError(msg)
+
class Product_Type(models.Model):
@@ -1211,42 +1241,24 @@ def endpoint_count(self):
def open_findings(self, start_date=None, end_date=None):
if start_date is None or end_date is None:
return {}
- critical = Finding.objects.filter(test__engagement__product=self,
- mitigated__isnull=True,
- verified=True,
- false_p=False,
- duplicate=False,
- out_of_scope=False,
- severity="Critical",
- date__range=[start_date,
- end_date]).count()
- high = Finding.objects.filter(test__engagement__product=self,
- mitigated__isnull=True,
- verified=True,
- false_p=False,
- duplicate=False,
- out_of_scope=False,
- severity="High",
- date__range=[start_date,
- end_date]).count()
- medium = Finding.objects.filter(test__engagement__product=self,
+
+ from dojo.utils import get_system_setting
+ findings = Finding.objects.filter(test__engagement__product=self,
mitigated__isnull=True,
- verified=True,
false_p=False,
duplicate=False,
out_of_scope=False,
- severity="Medium",
date__range=[start_date,
- end_date]).count()
- low = Finding.objects.filter(test__engagement__product=self,
- mitigated__isnull=True,
- verified=True,
- false_p=False,
- duplicate=False,
- out_of_scope=False,
- severity="Low",
- date__range=[start_date,
- end_date]).count()
+ end_date])
+
+ if get_system_setting("enforce_verified_status", True):
+ findings = findings.filter(verified=True)
+
+ critical = findings.filter(severity="Critical").count()
+ high = findings.filter(severity="High").count()
+ medium = findings.filter(severity="Medium").count()
+ low = findings.filter(severity="Low").count()
+
return {"Critical": critical,
"High": high,
"Medium": medium,
@@ -1551,17 +1563,11 @@ def copy(self):
return copy
def is_overdue(self):
- if self.engagement_type == "CI/CD":
- overdue_grace_days = 10
- else:
- overdue_grace_days = 0
+ overdue_grace_days = 10 if self.engagement_type == "CI/CD" else 0
max_end_date = timezone.now() - relativedelta(days=overdue_grace_days)
- if self.target_end < max_end_date.date():
- return True
-
- return False
+ return self.target_end < max_end_date.date()
def get_breadcrumbs(self):
bc = self.product.get_breadcrumbs()
@@ -1572,7 +1578,13 @@ def get_breadcrumbs(self):
# only used by bulk risk acceptance api
@property
def unaccepted_open_findings(self):
- return Finding.objects.filter(risk_accepted=False, active=True, verified=True, duplicate=False, test__engagement=self)
+ from dojo.utils import get_system_setting
+
+ findings = Finding.objects.filter(risk_accepted=False, active=True, duplicate=False, test__engagement=self)
+ if get_system_setting("enforce_verified_status", True):
+ findings = findings.filter(verified=True)
+
+ return findings
def accept_risks(self, accepted_risks):
self.risk_acceptance.add(*accepted_risks)
@@ -1652,10 +1664,7 @@ def copy(self, finding=None):
@property
def age(self):
- if self.mitigated:
- diff = self.mitigated_time.date() - self.date
- else:
- diff = get_current_date() - self.date
+ diff = self.mitigated_time.date() - self.date if self.mitigated else get_current_date() - self.date
days = diff.days
return max(0, days)
@@ -1793,7 +1802,7 @@ def clean(self):
action_string = "Postgres does not accept NULL character. Attempting to replace with %00..."
for remove_str in null_char_list:
self.path = self.path.replace(remove_str, "%00")
- logging.error(f'Path "{old_value}" has invalid format - It contains the NULL character. The following action was taken: {action_string}')
+ logger.error(f'Path "{old_value}" has invalid format - It contains the NULL character. The following action was taken: {action_string}')
if self.path == "":
self.path = None
@@ -1806,7 +1815,7 @@ def clean(self):
action_string = "Postgres does not accept NULL character. Attempting to replace with %00..."
for remove_str in null_char_list:
self.query = self.query.replace(remove_str, "%00")
- logging.error(f'Query "{old_value}" has invalid format - It contains the NULL character. The following action was taken: {action_string}')
+ logger.error(f'Query "{old_value}" has invalid format - It contains the NULL character. The following action was taken: {action_string}')
if self.query == "":
self.query = None
@@ -1819,7 +1828,7 @@ def clean(self):
action_string = "Postgres does not accept NULL character. Attempting to replace with %00..."
for remove_str in null_char_list:
self.fragment = self.fragment.replace(remove_str, "%00")
- logging.error(f'Fragment "{old_value}" has invalid format - It contains the NULL character. The following action was taken: {action_string}')
+ logger.error(f'Fragment "{old_value}" has invalid format - It contains the NULL character. The following action was taken: {action_string}')
if self.fragment == "":
self.fragment = None
@@ -1850,9 +1859,7 @@ def is_broken(self):
except:
return True
else:
- if self.product:
- return False
- return True
+ return not self.product
@property
def mitigated(self):
@@ -2142,7 +2149,12 @@ def copy(self, engagement=None):
# only used by bulk risk acceptance api
@property
def unaccepted_open_findings(self):
- return Finding.objects.filter(risk_accepted=False, active=True, verified=True, duplicate=False, test=self)
+ from dojo.utils import get_system_setting
+ findings = Finding.objects.filter(risk_accepted=False, active=True, duplicate=False, test=self)
+ if get_system_setting("enforce_verified_status", True):
+ findings = findings.filter(verified=True)
+
+ return findings
def accept_risks(self, accepted_risks):
self.engagement.risk_acceptance.add(*accepted_risks)
@@ -2793,7 +2805,12 @@ def delete(self, *args, **kwargs):
# only used by bulk risk acceptance api
@classmethod
def unaccepted_open_findings(cls):
- return cls.objects.filter(active=True, verified=True, duplicate=False, risk_accepted=False)
+ from dojo.utils import get_system_setting
+ results = cls.objects.filter(active=True, duplicate=False, risk_accepted=False)
+ if get_system_setting("enforce_verified_status", True):
+ results = results.filter(verified=True)
+
+ return results
@property
def risk_acceptance(self):
@@ -2975,7 +2992,7 @@ def get_number_severity(severity):
@staticmethod
def get_severity(num_severity):
severities = {0: "Info", 1: "Low", 2: "Medium", 3: "High", 4: "Critical"}
- if num_severity in severities.keys():
+ if num_severity in severities:
return severities[num_severity]
return None
@@ -3578,7 +3595,7 @@ def severity(self):
@cached_property
def components(self):
- components: Dict[str, Set[Optional[str]]] = {}
+ components: dict[str, set[str | None]] = {}
for finding in self.findings.all():
if finding.component_name is not None:
components.setdefault(finding.component_name, set()).add(finding.component_version)
@@ -3738,9 +3755,9 @@ class Check_List(models.Model):
@staticmethod
def get_status(pass_fail):
- if pass_fail == "Pass":
+ if pass_fail == "Pass": # noqa: S105
return "success"
- if pass_fail == "Fail":
+ if pass_fail == "Fail": # noqa: S105
return "danger"
return "warning"
@@ -3840,7 +3857,7 @@ def filename(self):
# logger.debug('path: "%s"', self.path)
if not self.path:
return None
- return os.path.basename(self.path.name)
+ return Path(self.path.name).name
@property
def name_and_expiration_info(self):
@@ -4096,7 +4113,7 @@ class JIRA_Project(models.Model):
verbose_name=_("Add vulnerability Id as a JIRA label"),
blank=False)
push_all_issues = models.BooleanField(default=False, blank=True,
- help_text=_("Automatically create JIRA tickets for verified findings. Once linked, the JIRA ticket will continue to sync, regardless of status in DefectDojo."))
+ help_text=_("Automatically create JIRA tickets for verified findings, assuming enforce_verified_status is True, or for all findings otherwise. Once linked, the JIRA ticket will continue to sync, regardless of status in DefectDojo."))
enable_engagement_epic_mapping = models.BooleanField(default=False,
blank=True)
epic_issue_type_name = models.CharField(max_length=64, blank=True, default="Epic", help_text=_("The name of the of structure that represents an Epic"))
@@ -4824,7 +4841,7 @@ def create_token(
auditlog.register(Dojo_User, exclude_fields=["password"])
auditlog.register(Endpoint)
auditlog.register(Engagement)
- auditlog.register(Finding)
+ auditlog.register(Finding, m2m_fields={"reviewers"})
auditlog.register(Finding_Group)
auditlog.register(Product_Type)
auditlog.register(Product)
@@ -4834,6 +4851,7 @@ def create_token(
auditlog.register(Cred_User, exclude_fields=["password"])
auditlog.register(Notification_Webhooks, exclude_fields=["header_name", "header_value"])
+
from dojo.utils import calculate_grade, to_str_typed # noqa: E402 # there is issue due to a circular import
tagulous.admin.register(Product.tags)
diff --git a/dojo/notes/helper.py b/dojo/notes/helper.py
index 80f6f80a2a8..c0eb807e8be 100644
--- a/dojo/notes/helper.py
+++ b/dojo/notes/helper.py
@@ -7,5 +7,5 @@ def delete_related_notes(obj):
if not hasattr(obj, "notes"):
logger.warning(f"Attempted to delete notes from object type {type(obj)} without 'notes' attribute.")
return
- logging.debug(f"Deleting {obj.notes.count()} notes for {type(obj).__name__} {obj.id}")
+ logger.debug(f"Deleting {obj.notes.count()} notes for {type(obj).__name__} {obj.id}")
obj.notes.all().delete()
diff --git a/dojo/notes/signals.py b/dojo/notes/signals.py
index 222efba832f..3865a1b81a5 100644
--- a/dojo/notes/signals.py
+++ b/dojo/notes/signals.py
@@ -9,7 +9,7 @@
def delete_note_history(note):
- logging.debug(f"Deleting history for note {note.id}")
+ logger.debug(f"Deleting history for note {note.id}")
note.history.all().delete()
diff --git a/dojo/notifications/helper.py b/dojo/notifications/helper.py
index a7f08ead645..1881da70735 100755
--- a/dojo/notifications/helper.py
+++ b/dojo/notifications/helper.py
@@ -1,5 +1,7 @@
+import importlib
import json
import logging
+from contextlib import suppress
from datetime import timedelta
import requests
@@ -7,7 +9,7 @@
from django.conf import settings
from django.core.exceptions import FieldDoesNotExist
from django.core.mail import EmailMessage
-from django.db.models import Count, Prefetch, Q
+from django.db.models import Count, Prefetch, Q, QuerySet
from django.template import TemplateDoesNotExist
from django.template.loader import render_to_string
from django.urls import reverse
@@ -21,572 +23,879 @@
from dojo.models import (
Alerts,
Dojo_User,
+ Engagement,
+ Finding,
Notification_Webhooks,
Notifications,
+ Product,
+ Product_Type,
System_Settings,
+ Test,
UserContactInfo,
get_current_datetime,
)
-from dojo.user.queries import get_authorized_users_for_product_and_product_type, get_authorized_users_for_product_type
+from dojo.user.queries import (
+ get_authorized_users_for_product_and_product_type,
+ get_authorized_users_for_product_type,
+)
from dojo.aws import ses_email
logger = logging.getLogger(__name__)
-def create_notification(event=None, **kwargs):
- system_settings = System_Settings.objects.get()
- kwargs["system_settings"] = system_settings
- # System notifications
- try:
- system_notifications = Notifications.objects.get(user=None, template=False)
- except Exception:
- system_notifications = Notifications()
-
- if "recipients" in kwargs:
- # mimic existing code so that when recipients is specified, no other system or personal notifications are sent.
- logger.debug("creating notifications for recipients: %s", kwargs["recipients"])
- for recipient_notifications in Notifications.objects.filter(user__username__in=kwargs["recipients"], user__is_active=True, product=None):
- # if event in settings.NOTIFICATIONS_SYSTEM_LEVEL_TRUMP:
- # merge the system level notifications with the personal level
- # this allows for system to trump the personal
- merged_notifications = Notifications.merge_notifications_list([system_notifications, recipient_notifications])
- merged_notifications.user = recipient_notifications.user
- logger.debug("Sent notification to %s", merged_notifications.user)
- process_notifications(event, merged_notifications, **kwargs)
- # else:
- # # Do not trump user preferences and send notifications as usual
- # logger.debug('Sent notification to %s', recipient_notifications.user)
- # process_notifications(event, recipient_notifications, **kwargs)
-
- else:
- logger.debug("creating system notifications for event: %s", event)
- # send system notifications to all admin users
-
- # parse kwargs before converting them to dicts
- product_type = None
- if "product_type" in kwargs:
- product_type = kwargs.get("product_type")
- logger.debug("Defined product type %s", product_type)
+def create_notification(
+ event: str | None = None,
+ title: str | None = None,
+ finding: Finding | None = None,
+ test: Test | None = None,
+ engagement: Engagement | None = None,
+ product: Product | None = None,
+ requested_by: Dojo_User | None = None,
+ reviewers: list[Dojo_User] | list[str] | None = None,
+ recipients: list[Dojo_User] | list[str] | None = None,
+ no_users: bool = False, # noqa: FBT001
+ url: str | None = None,
+ url_api: str | None = None,
+ **kwargs: dict,
+) -> None:
+ """Create an instance of a NotificationManager and dispatch the notification."""
+ default_manager = NotificationManager
+ notification_manager_class = default_manager
+ if isinstance(
+ (
+ notification_manager := getattr(
+ settings,
+ "NOTIFICATION_MANAGER",
+ default_manager,
+ )
+ ),
+ str,
+ ):
+ with suppress(ModuleNotFoundError):
+ module_name, _separator, class_name = notification_manager.rpartition(".")
+ module = importlib.import_module(module_name)
+ notification_manager_class = getattr(module, class_name)
+ notification_manager_class().create_notification(
+ event=event,
+ title=title,
+ finding=finding,
+ test=test,
+ engagement=engagement,
+ product=product,
+ requested_by=requested_by,
+ reviewers=reviewers,
+ recipients=recipients,
+ no_users=no_users,
+ url=url,
+ url_api=url_api,
+ **kwargs,
+ )
- product = None
- if "product" in kwargs:
- product = kwargs.get("product")
- logger.debug("Defined product %s", product)
- elif "engagement" in kwargs:
- product = kwargs["engagement"].product
- logger.debug("Defined product of engagement %s", product)
+class NotificationManagerHelpers:
- elif "test" in kwargs:
- product = kwargs["test"].engagement.product
- logger.debug("Defined product of test %s", product)
+ """Common functions for use in the Mangers."""
- elif "finding" in kwargs:
- product = kwargs["finding"].test.engagement.product
- logger.debug("Defined product of finding %s", product)
+ def __init__(
+ self,
+ *_args: list,
+ system_notifications: Notifications | None = None,
+ system_settings: System_Settings | None = None,
+ **_kwargs: dict,
+ ) -> None:
+ self.system_notifications = system_notifications or self._get_notifications_object()
+ self.system_settings = system_settings or self._get_system_settings()
- elif "obj" in kwargs:
- from dojo.utils import get_product
- product = get_product(kwargs["obj"])
- logger.debug("Defined product of obj %s", product)
-
- # System notifications are sent one with user=None, which will trigger email to configured system email, to global slack channel, etc.
- process_notifications(event, system_notifications, **kwargs)
-
- # All admins will also receive system notifications, but as part of the person global notifications section below
- # This time user is set, so will trigger email to personal email, to personal slack channel (mention), etc.
- # only retrieve users which have at least one notification type enabled for this event type.
- logger.debug("creating personal notifications for event: %s", event)
-
- # There are notification like deleting a product type that shall not be sent to users.
- # These notifications will have the parameter no_users=True
- if not ("no_users" in kwargs and kwargs["no_users"] is True):
- # get users with either global notifications, or a product specific noditiciation
- # and all admin/superuser, they will always be notified
- users = Dojo_User.objects.filter(is_active=True).prefetch_related(Prefetch(
- "notifications_set",
- queryset=Notifications.objects.filter(Q(product_id=product) | Q(product__isnull=True)),
- to_attr="applicable_notifications",
- )).annotate(applicable_notifications_count=Count("notifications__id", filter=Q(notifications__product_id=product) | Q(notifications__product__isnull=True)))\
- .filter(Q(applicable_notifications_count__gt=0) | Q(is_superuser=True))
-
- # only send to authorized users or admin/superusers
- logger.debug("Filtering users for the product %s", product)
-
- if product:
- users = get_authorized_users_for_product_and_product_type(users, product, Permissions.Product_View)
-
- elif product_type:
- users = get_authorized_users_for_product_type(users, product_type, Permissions.Product_Type_View)
+ def _get_notifications_object(self) -> Notifications:
+ """Set the system Notifications object on the class."""
+ try:
+ return Notifications.objects.get(user=None, template=False)
+ except Exception:
+ return Notifications()
+
+ def _get_system_settings(self) -> System_Settings:
+ """Set the system settings object in the class."""
+ return System_Settings.objects.get()
+
+ def _create_description(self, event: str, kwargs: dict) -> str:
+ if kwargs.get("description") is None:
+ if event == "product_added":
+ kwargs["description"] = _("Product %s has been created successfully.") % kwargs["title"]
+ elif event == "product_type_added":
+ kwargs["description"] = _("Product Type %s has been created successfully.") % kwargs["title"]
else:
- # nor product_type nor product defined, we should not make noise and send only notifications to admins
- logger.debug("Product is not specified, making it silent")
- users = users.filter(is_superuser=True)
-
- for user in users:
- logger.debug("Authorized user for the product %s", user)
- # send notifications to user after merging possible multiple notifications records (i.e. personal global + personal product)
- # kwargs.update({'user': user})
- applicable_notifications = user.applicable_notifications
- if user.is_superuser:
- logger.debug("User %s is superuser", user)
- # admin users get all system notifications
- applicable_notifications.append(system_notifications)
-
- notifications_set = Notifications.merge_notifications_list(applicable_notifications)
- notifications_set.user = user
- process_notifications(event, notifications_set, **kwargs)
-
-
-def create_description(event, *args, **kwargs):
- if "description" not in kwargs.keys():
- if event == "product_added":
- kwargs["description"] = _("Product %s has been created successfully.") % kwargs["title"]
- elif event == "product_type_added":
- kwargs["description"] = _("Product Type %s has been created successfully.") % kwargs["title"]
- else:
- kwargs["description"] = _("Event %s has occurred.") % str(event)
-
- return kwargs["description"]
-
+ kwargs["description"] = _("Event %s has occurred.") % str(event)
-def create_notification_message(event, user, notification_type, *args, **kwargs):
- template = f"notifications/{notification_type}/{event.replace('/', '')}.tpl"
- kwargs.update({"user": user})
+ return kwargs["description"]
- notification_message = None
- try:
- notification_message = render_to_string(template, kwargs)
- logger.debug("Rendering from the template %s", template)
- except TemplateDoesNotExist as e:
- # In some cases, template includes another templates, if the interior one is missing, we will see it in "specifically" section
- logger.debug(f"template not found or not implemented yet: {template} (specifically: {e.args})")
- except Exception as e:
- logger.error("error during rendering of template %s exception is %s", template, e)
- finally:
- if not notification_message:
- logger.warning("Generate notification messager for template by default")
- kwargs["description"] = create_description(event, *args, **kwargs)
- notification_message = render_to_string(f"notifications/{notification_type}/other.tpl", kwargs)
+ def _create_notification_message(
+ self,
+ event: str,
+ user: Dojo_User,
+ notification_type: str,
+ kwargs: dict,
+ ) -> str:
+ template = f"notifications/{notification_type}/{event.replace('/', '')}.tpl"
+ kwargs.update({"user": user})
+ notification_message = None
- return notification_message or ""
+ # TODO: This may be deleted
+ # if (title := kwargs.get("title")) is not None:
+ # kwargs.update({"title": title})
+ if kwargs.get("description") is None:
+ kwargs.update({"description": self._create_description(event, kwargs)})
-def process_notifications(event, notifications=None, **kwargs):
- from dojo.utils import get_system_setting
-
- if not notifications:
- logger.warning("no notifications!")
- return
-
- logger.debug("sending notification " + ("asynchronously" if we_want_async() else "synchronously"))
- logger.debug("process notifications for %s", notifications.user)
- logger.debug("notifications: %s", vars(notifications))
-
- slack_enabled = get_system_setting("enable_slack_notifications")
- msteams_enabled = get_system_setting("enable_msteams_notifications")
- mail_enabled = get_system_setting("enable_mail_notifications")
- webhooks_enabled = get_system_setting("enable_webhooks_notifications")
-
- if slack_enabled and "slack" in getattr(notifications, event, getattr(notifications, "other")):
- logger.debug("Sending Slack Notification")
- send_slack_notification(event, notifications.user, **kwargs)
-
- if msteams_enabled and "msteams" in getattr(notifications, event, getattr(notifications, "other")):
- logger.debug("Sending MSTeams Notification")
- send_msteams_notification(event, notifications.user, **kwargs)
+ try:
+ notification_message = render_to_string(template, kwargs)
+ logger.debug("Rendering from the template %s", template)
+ except TemplateDoesNotExist as e:
+ # In some cases, template includes another templates, if the interior one is missing, we will see it in "specifically" section
+ logger.debug(
+ f"template not found or not implemented yet: {template} (specifically: {e.args})",
+ )
+ except Exception as e:
+ logger.error(
+ "error during rendering of template %s exception is %s",
+ template,
+ e,
+ )
+ finally:
+ if not notification_message:
+ kwargs["description"] = self._create_description(event, kwargs)
+ notification_message = render_to_string(
+ f"notifications/{notification_type}/other.tpl",
+ kwargs,
+ )
+
+ return notification_message or ""
+
+ def _log_alert(
+ self,
+ exception: Exception,
+ notification_type: str | None = None,
+ **kwargs: dict,
+ ) -> None:
+ # no try catch here, if this fails we need to show an error
+ for user in Dojo_User.objects.filter(is_superuser=True):
+ alert = Alerts(
+ user_id=user,
+ url=kwargs.get("url", reverse("alerts")),
+ title=kwargs.get("title", "Notification issue")[:250],
+ description=kwargs.get("description", str(exception))[:2000],
+ icon="exclamation-triangle",
+ source=notification_type[:100] if notification_type else kwargs.get("source", "unknown")[:100],
+ )
+ # relative urls will fail validation
+ alert.clean_fields(exclude=["url"])
+ alert.save()
- if mail_enabled and "mail" in getattr(notifications, event, getattr(notifications, "other")):
- logger.debug("Sending Mail Notification")
- send_mail_notification(event, notifications.user, **kwargs)
- if webhooks_enabled and "webhooks" in getattr(notifications, event, getattr(notifications, "other")):
- logger.debug("Sending Webhooks Notification")
- send_webhooks_notification(event, notifications.user, **kwargs)
+class SlackNotificationManger(NotificationManagerHelpers):
- if "alert" in getattr(notifications, event, getattr(notifications, "other")):
- logger.debug(f"Sending Alert to {notifications.user}")
- send_alert_notification(event, notifications.user, **kwargs)
+ """Manger for slack notifications and their helpers."""
+ @dojo_async_task
+ @app.task
+ def send_slack_notification(
+ self,
+ event: str,
+ user: Dojo_User | None = None,
+ **kwargs: dict,
+ ):
+ try:
+ # If the user has slack information on profile and chooses to receive slack notifications
+ # Will receive a DM
+ if user is not None:
+ logger.debug("personal notification to slack for user %s", user)
+ if hasattr(user, "usercontactinfo") and user.usercontactinfo.slack_username is not None:
+ slack_user_id = user.usercontactinfo.slack_user_id
+ if not slack_user_id:
+ # Lookup the slack userid the first time, then save it.
+ slack_user_id = self._get_slack_user_id(
+ user.usercontactinfo.slack_username,
+ )
+ if slack_user_id:
+ slack_user_save = UserContactInfo.objects.get(
+ user_id=user.id,
+ )
+ slack_user_save.slack_user_id = slack_user_id
+ slack_user_save.save()
+ # only send notification if we managed to find the slack_user_id
+ if slack_user_id:
+ channel = f"@{slack_user_id}"
+ self._post_slack_message(event, user, channel, **kwargs)
+ else:
+ logger.info(
+ "The user %s does not have a email address informed for Slack in profile.",
+ user,
+ )
+ else:
+ # System scope slack notifications, and not personal would still see this go through
+ if self.system_settings.slack_channel is not None:
+ channel = self.system_settings.slack_channel
+ logger.info(
+ f"Sending system notification to system channel {channel}.",
+ )
+ self._post_slack_message(event, user, channel, **kwargs)
+ else:
+ logger.debug(
+ "slack_channel not configured: skipping system notification",
+ )
+
+ except Exception as exception:
+ logger.exception(exception)
+ self._log_alert(
+ exception,
+ "Slack Notification",
+ title=kwargs["title"],
+ description=str(exception),
+ url=kwargs.get("url"),
+ )
-@dojo_async_task
-@app.task
-def send_slack_notification(event, user=None, *args, **kwargs):
- from dojo.utils import get_system_setting
+ def _get_slack_user_id(self, user_email: str) -> str:
+ user_id = None
+ res = requests.request(
+ method="POST",
+ url="https://slack.com/api/users.lookupByEmail",
+ data={"token": self.system_settings.slack_token, "email": user_email},
+ timeout=settings.REQUESTS_TIMEOUT,
+ )
- def _post_slack_message(channel):
+ user = json.loads(res.text)
+ slack_user_is_found = False
+ if user:
+ if "error" in user:
+ logger.error("Slack is complaining. See error message below.")
+ logger.error(user)
+ raise RuntimeError("Error getting user list from Slack: " + res.text)
+ if "email" in user["user"]["profile"]:
+ if user_email == user["user"]["profile"]["email"]:
+ if "id" in user["user"]:
+ user_id = user["user"]["id"]
+ logger.debug(f"Slack user ID is {user_id}")
+ slack_user_is_found = True
+ else:
+ logger.warning(
+ f"A user with email {user_email} could not be found in this Slack workspace.",
+ )
+
+ if not slack_user_is_found:
+ logger.warning("The Slack user was not found.")
+
+ return user_id
+
+ def _post_slack_message(
+ self,
+ event: str,
+ user: Dojo_User,
+ channel: str,
+ **kwargs: dict,
+ ) -> None:
res = requests.request(
method="POST",
url="https://slack.com/api/chat.postMessage",
data={
- "token": get_system_setting("slack_token"),
+ "token": self.system_settings.slack_token,
"channel": channel,
- "username": get_system_setting("slack_username"),
- "text": create_notification_message(event, user, "slack", *args, **kwargs),
- })
+ "username": self.system_settings.slack_username,
+ "text": self._create_notification_message(event, user, "slack", kwargs),
+ },
+ timeout=settings.REQUESTS_TIMEOUT,
+ )
if "error" in res.text:
logger.error("Slack is complaining. See raw text below.")
logger.error(res.text)
raise RuntimeError("Error posting message to Slack: " + res.text)
- try:
- # If the user has slack information on profile and chooses to receive slack notifications
- # Will receive a DM
- if user is not None:
- logger.debug("personal notification to slack for user %s", user)
- if hasattr(user, "usercontactinfo") and user.usercontactinfo.slack_username is not None:
- slack_user_id = user.usercontactinfo.slack_user_id
- if not slack_user_id:
- # Lookup the slack userid the first time, then save it.
- slack_user_id = get_slack_user_id(
- user.usercontactinfo.slack_username)
- if slack_user_id:
- slack_user_save = UserContactInfo.objects.get(user_id=user.id)
- slack_user_save.slack_user_id = slack_user_id
- slack_user_save.save()
-
- # only send notification if we managed to find the slack_user_id
- if slack_user_id:
- channel = f"@{slack_user_id}"
- _post_slack_message(channel)
- else:
- logger.info("The user %s does not have a email address informed for Slack in profile.", user)
- else:
- # System scope slack notifications, and not personal would still see this go through
- if get_system_setting("slack_channel") is not None:
- channel = get_system_setting("slack_channel")
- logger.info(f"Sending system notification to system channel {channel}.")
- _post_slack_message(channel)
- else:
- logger.debug("slack_channel not configured: skipping system notification")
-
- except Exception as e:
- logger.exception(e)
- log_alert(e, "Slack Notification", title=kwargs["title"], description=str(e), url=kwargs.get("url", None))
-
-
-@dojo_async_task
-@app.task
-def send_msteams_notification(event, user=None, *args, **kwargs):
- from dojo.utils import get_system_setting
-
- try:
- # Microsoft Teams doesn't offer direct message functionality, so no MS Teams PM functionality here...
- if user is None:
- if get_system_setting("msteams_url") is not None:
- logger.debug("sending MSTeams message")
- res = requests.request(
- method="POST",
- url=get_system_setting("msteams_url"),
- data=create_notification_message(event, None, "msteams", *args, **kwargs))
- if res.status_code != 200:
- logger.error("Error when sending message to Microsoft Teams")
- logger.error(res.status_code)
- logger.error(res.text)
- raise RuntimeError("Error posting message to Microsoft Teams: " + res.text)
- else:
- logger.info("Webhook URL for Microsoft Teams not configured: skipping system notification")
- except Exception as e:
- logger.exception(e)
- log_alert(e, "Microsoft Teams Notification", title=kwargs["title"], description=str(e), url=kwargs["url"])
-
-
-# @dojo_async_task
-# @app.task
-def send_mail_notification(event, user=None, *args, **kwargs):
- from dojo.utils import get_system_setting
- email_from_address = get_system_setting("email_from")
- # Attempt to get the "to" address
- if "recipient" in kwargs:
- address = kwargs.get("recipient")
- elif user:
- address = user.email
- else:
- address = get_system_setting("mail_notifications_to")
-
- logger.debug("notification email for user %s to %s", user, address)
-
- try:
- if settings.AWS_SES_EMAIL:
- ses_email.aws_ses(email=address,
- email_from_address=f"{get_system_setting('team_name')} <{email_from_address}>",
- html_contect=create_notification_message(event, user, "mail", *args, **kwargs),
- template_name=event,
- subject=kwargs.get("subject", event),
- text=event
- )
- else:
- subject = f"{get_system_setting('team_name')} notification"
- if "title" in kwargs:
- subject += f": {kwargs['title']}"
+class MSTeamsNotificationManger(NotificationManagerHelpers):
- email = EmailMessage(
- subject,
- create_notification_message(event, user, 'mail', *args, **kwargs),
- email_from_address,
- [address],
- headers={"From": f"{email_from_address}"},
+ """Manger for Microsoft Teams notifications and their helpers."""
+
+ @dojo_async_task
+ @app.task
+ def send_msteams_notification(
+ self,
+ event: str,
+ user: Dojo_User | None = None,
+ **kwargs: dict,
+ ):
+ try:
+ # Microsoft Teams doesn't offer direct message functionality, so no MS Teams PM functionality here...
+ if user is None:
+ if self.system_settings.msteams_url is not None:
+ logger.debug("sending MSTeams message")
+ res = requests.request(
+ method="POST",
+ url=self.system_settings.msteams_url,
+ data=self._create_notification_message(
+ event,
+ None,
+ "msteams",
+ kwargs,
+ ),
+ timeout=settings.REQUESTS_TIMEOUT,
+ )
+ if res.status_code != 200:
+ logger.error("Error when sending message to Microsoft Teams")
+ logger.error(res.status_code)
+ logger.error(res.text)
+ raise RuntimeError(
+ "Error posting message to Microsoft Teams: " + res.text,
+ )
+ else:
+ logger.info(
+ "Webhook URL for Microsoft Teams not configured: skipping system notification",
+ )
+ except Exception as exception:
+ logger.exception(exception)
+ self._log_alert(
+ exception,
+ "Microsoft Teams Notification",
+ title=kwargs["title"],
+ description=str(exception),
+ url=kwargs["url"],
)
- email.content_subtype = 'html'
- logger.debug('sending email alert')
- # logger.info(create_notification_message(event, user, 'mail', *args, **kwargs))
- email.send(fail_silently=False)
-
- except Exception as e:
- logger.exception(e)
- log_alert(e, "Email Notification", title=kwargs["title"], description=str(e), url=kwargs["url"])
-
-
-def webhooks_notification_request(endpoint, event, *args, **kwargs):
- from dojo.utils import get_system_setting
-
- headers = {
- "User-Agent": f"DefectDojo-{dd_version}",
- "X-DefectDojo-Event": event,
- "X-DefectDojo-Instance": settings.SITE_URL,
- "Accept": "application/json",
- }
- if endpoint.header_name is not None:
- headers[endpoint.header_name] = endpoint.header_value
- yaml_data = create_notification_message(event, endpoint.owner, "webhooks", *args, **kwargs)
- data = yaml.safe_load(yaml_data)
-
- timeout = get_system_setting("webhooks_notifications_timeout")
-
- return requests.request(
- method="POST",
- url=endpoint.url,
- headers=headers,
- json=data,
- timeout=timeout,
- )
-def test_webhooks_notification(endpoint):
- res = webhooks_notification_request(endpoint, "ping", description="Test webhook notification")
- res.raise_for_status()
- # in "send_webhooks_notification", we are doing deeper analysis, why it failed
- # for now, "raise_for_status" should be enough
+class EmailNotificationManger(NotificationManagerHelpers):
+ """Manger for email notifications and their helpers."""
-@app.task(ignore_result=True)
-def webhook_reactivation(endpoint_id: int, *args, **kwargs):
- endpoint = Notification_Webhooks.objects.get(pk=endpoint_id)
+ #@dojo_async_task
+ #@app.task
+ def send_mail_notification(
+ self,
+ event: str,
+ user: Dojo_User | None = None,
+ **kwargs: dict,
+ ):
+ # Attempt to get the "to" address
+ if (recipient := kwargs.get("recipient")) is not None:
+ address = recipient
+ elif user:
+ address = user.email
+ else:
+ address = self.system_settings.mail_notifications_to
- # User already changed status of endpoint
- if endpoint.status != Notification_Webhooks.Status.STATUS_INACTIVE_TMP:
- return
+ logger.debug("notification email for user %s to %s", user, address)
- endpoint.status = Notification_Webhooks.Status.STATUS_ACTIVE_TMP
- endpoint.save()
- logger.debug(f"Webhook endpoint '{endpoint.name}' reactivated to '{Notification_Webhooks.Status.STATUS_ACTIVE_TMP}'")
+ try:
+ if settings.AWS_SES_EMAIL:
+ ses_email.aws_ses(email=address,
+ email_from_address=f"{self.system_setting('team_name')} <{self.system_settings.email_from}>",
+ html_contect=self._create_notification_message(event, user, "mail", **kwargs),
+ template_name=event,
+ subject=kwargs.get("subject", event),
+ text=event
+ )
+ else:
+ subject = f"{self.system_settings.team_name} notification"
+ if (title := kwargs.get("title")) is not None:
+ subject += f": {title}"
+ email = EmailMessage(
+ subject,
+ self._create_notification_message(event, user, "mail", kwargs),
+ self.system_settings.email_from,
+ [address],
+ headers={"From": f"{self.system_settings.email_from}"},
+ )
+ email.content_subtype = "html"
+ logger.debug("sending email alert")
+
+ email.send(fail_silently=False)
+
+ except Exception as exception:
+ logger.exception(exception)
+ self._log_alert(
+ exception,
+ "Email Notification",
+ title=kwargs["title"],
+ description=str(exception),
+ url=kwargs["url"],
+ )
-@app.task(ignore_result=True)
-def webhook_status_cleanup(*args, **kwargs):
- # If some endpoint was affected by some outage (5xx, 429, Timeout) but it was clean during last 24 hours,
- # we consider this endpoint as healthy so need to reset it
- endpoints = Notification_Webhooks.objects.filter(
- status=Notification_Webhooks.Status.STATUS_ACTIVE_TMP,
- last_error__lt=get_current_datetime() - timedelta(hours=24),
- )
- for endpoint in endpoints:
- endpoint.status = Notification_Webhooks.Status.STATUS_ACTIVE
- endpoint.first_error = None
- endpoint.last_error = None
- endpoint.note = f"Reactivation from {Notification_Webhooks.Status.STATUS_ACTIVE_TMP}"
- endpoint.save()
- logger.debug(f"Webhook endpoint '{endpoint.name}' reactivated from '{Notification_Webhooks.Status.STATUS_ACTIVE_TMP}' to '{Notification_Webhooks.Status.STATUS_ACTIVE}'")
- # Reactivation of STATUS_INACTIVE_TMP endpoints.
- # They should reactive automatically in 60s, however in case of some unexpected event (e.g. start of whole stack),
- # endpoints should not be left in STATUS_INACTIVE_TMP state
- broken_endpoints = Notification_Webhooks.objects.filter(
- status=Notification_Webhooks.Status.STATUS_INACTIVE_TMP,
- last_error__lt=get_current_datetime() - timedelta(minutes=5),
- )
- for endpoint in broken_endpoints:
- webhook_reactivation(endpoint_id=endpoint.pk)
+class WebhookNotificationManger(NotificationManagerHelpers):
-
-@dojo_async_task
-@app.task
-def send_webhooks_notification(event, user=None, *args, **kwargs):
+ """Manger for webhook notifications and their helpers."""
ERROR_PERMANENT = "permanent"
ERROR_TEMPORARY = "temporary"
- endpoints = Notification_Webhooks.objects.filter(owner=user)
-
- if not endpoints:
- if user:
- logger.info(f"URLs for Webhooks not configured for user '{user}': skipping user notification")
- else:
- logger.info("URLs for Webhooks not configured: skipping system notification")
- return
-
- for endpoint in endpoints:
-
- error = None
- if endpoint.status not in [Notification_Webhooks.Status.STATUS_ACTIVE, Notification_Webhooks.Status.STATUS_ACTIVE_TMP]:
- logger.info(f"URL for Webhook '{endpoint.name}' is not active: {endpoint.get_status_display()} ({endpoint.status})")
- continue
-
- try:
- logger.debug(f"Sending webhook message to endpoint '{endpoint.name}'")
- res = webhooks_notification_request(endpoint, event, *args, **kwargs)
-
- if 200 <= res.status_code < 300:
- logger.debug(f"Message sent to endpoint '{endpoint.name}' successfully.")
+ @dojo_async_task
+ @app.task
+ def send_webhooks_notification(
+ self,
+ event: str,
+ user: Dojo_User | None = None,
+ **kwargs: dict,
+ ):
+ for endpoint in self._get_webhook_endpoints(user=user):
+ error = None
+ if endpoint.status not in [
+ Notification_Webhooks.Status.STATUS_ACTIVE,
+ Notification_Webhooks.Status.STATUS_ACTIVE_TMP,
+ ]:
+ logger.info(
+ f"URL for Webhook '{endpoint.name}' is not active: {endpoint.get_status_display()} ({endpoint.status})",
+ )
continue
- # HTTP request passed successfully but we still need to check status code
- if 500 <= res.status_code < 600 or res.status_code == 429:
- error = ERROR_TEMPORARY
+ try:
+ logger.debug(f"Sending webhook message to endpoint '{endpoint.name}'")
+ res = self._webhooks_notification_request(endpoint, event, **kwargs)
+ if 200 <= res.status_code < 300:
+ logger.debug(
+ f"Message sent to endpoint '{endpoint.name}' successfully.",
+ )
+ continue
+ # HTTP request passed successfully but we still need to check status code
+ if 500 <= res.status_code < 600 or res.status_code == 429:
+ error = self.ERROR_TEMPORARY
+ else:
+ error = self.ERROR_PERMANENT
+
+ endpoint.note = f"Response status code: {res.status_code}"
+ logger.error(
+ f"Error when sending message to Webhooks '{endpoint.name}' (status: {res.status_code}): {res.text}",
+ )
+ except requests.exceptions.Timeout as e:
+ error = self.ERROR_TEMPORARY
+ endpoint.note = f"Requests exception: {e}"
+ logger.error(
+ f"Timeout when sending message to Webhook '{endpoint.name}'",
+ )
+ except Exception as exception:
+ error = self.ERROR_PERMANENT
+ endpoint.note = f"Exception: {exception}"[:1000]
+ logger.exception(exception)
+ self._log_alert(exception, "Webhooks Notification")
+
+ now = get_current_datetime()
+ if error == self.ERROR_TEMPORARY:
+ # If endpoint is unstable for more then one day, it needs to be deactivated
+ if endpoint.first_error is not None and (now - endpoint.first_error).total_seconds() > 60 * 60 * 24:
+ endpoint.status = Notification_Webhooks.Status.STATUS_INACTIVE_PERMANENT
+ else:
+ # We need to monitor when outage started
+ if endpoint.status == Notification_Webhooks.Status.STATUS_ACTIVE:
+ endpoint.first_error = now
+ endpoint.status = Notification_Webhooks.Status.STATUS_INACTIVE_TMP
+ # In case of failure within one day, endpoint can be deactivated temporally only for one minute
+ self._webhook_reactivation.apply_async(
+ args=[self],
+ kwargs={"endpoint_id": endpoint.pk},
+ countdown=60,
+ )
+ # There is no reason to keep endpoint active if it is returning 4xx errors
else:
- error = ERROR_PERMANENT
-
- endpoint.note = f"Response status code: {res.status_code}"
- logger.error(f"Error when sending message to Webhooks '{endpoint.name}' (status: {res.status_code}): {res.text}")
-
- except requests.exceptions.Timeout as e:
- error = ERROR_TEMPORARY
- endpoint.note = f"Requests exception: {e}"
- logger.error(f"Timeout when sending message to Webhook '{endpoint.name}'")
-
- except Exception as e:
- error = ERROR_PERMANENT
- endpoint.note = f"Exception: {e}"[:1000]
- logger.exception(e)
- log_alert(e, "Webhooks Notification")
-
- now = get_current_datetime()
-
- if error == ERROR_TEMPORARY:
-
- # If endpoint is unstable for more then one day, it needs to be deactivated
- if endpoint.first_error is not None and (now - endpoint.first_error).total_seconds() > 60 * 60 * 24:
endpoint.status = Notification_Webhooks.Status.STATUS_INACTIVE_PERMANENT
-
+ endpoint.first_error = now
+
+ endpoint.last_error = now
+ endpoint.save()
+
+ def _get_webhook_endpoints(
+ self,
+ user: Dojo_User | None = None,
+ ) -> QuerySet[Notification_Webhooks]:
+ endpoints = Notification_Webhooks.objects.filter(owner=user)
+ if not endpoints.exists():
+ if user:
+ logger.info(
+ f"URLs for Webhooks not configured for user '{user}': skipping user notification",
+ )
else:
- # We need to monitor when outage started
- if endpoint.status == Notification_Webhooks.Status.STATUS_ACTIVE:
- endpoint.first_error = now
-
- endpoint.status = Notification_Webhooks.Status.STATUS_INACTIVE_TMP
+ logger.info(
+ "URLs for Webhooks not configured: skipping system notification",
+ )
+ return Notification_Webhooks.objects.none()
+ return endpoints
+
+ def _generate_request_details(
+ self,
+ endpoint: Notification_Webhooks,
+ event: str | None = None,
+ **kwargs: dict,
+ ) -> tuple[dict, dict]:
+ headers = {
+ "User-Agent": f"DefectDojo-{dd_version}",
+ "X-DefectDojo-Event": event,
+ "X-DefectDojo-Instance": settings.SITE_URL,
+ "Accept": "application/json",
+ }
+ if endpoint.header_name is not None:
+ headers[endpoint.header_name] = endpoint.header_value
+ yaml_data = self._create_notification_message(
+ event,
+ endpoint.owner,
+ "webhooks",
+ kwargs,
+ )
+ data = yaml.safe_load(yaml_data)
+
+ return headers, data
+
+ def _webhooks_notification_request(
+ self,
+ endpoint: Notification_Webhooks,
+ event: str | None = None,
+ **kwargs: dict,
+ ) -> requests.Response:
+ headers, data = self._generate_request_details(endpoint, event=event, **kwargs)
+ return requests.request(
+ method="POST",
+ url=endpoint.url,
+ headers=headers,
+ json=data,
+ timeout=self.system_settings.webhooks_notifications_timeout,
+ )
- # In case of failure within one day, endpoint can be deactivated temporally only for one minute
- webhook_reactivation.apply_async(kwargs={"endpoint_id": endpoint.pk}, countdown=60)
+ def _test_webhooks_notification(self, endpoint: Notification_Webhooks) -> None:
+ res = self._webhooks_notification_request(
+ endpoint,
+ "ping",
+ description="Test webhook notification",
+ )
+ res.raise_for_status()
+ # in "send_webhooks_notification", we are doing deeper analysis, why it failed
+ # for now, "raise_for_status" should be enough
+
+ @app.task(ignore_result=True)
+ def _webhook_reactivation(self, endpoint_id: int, **_kwargs: dict):
+ endpoint = Notification_Webhooks.objects.get(pk=endpoint_id)
+ # User already changed status of endpoint
+ if endpoint.status != Notification_Webhooks.Status.STATUS_INACTIVE_TMP:
+ return
+ endpoint.status = Notification_Webhooks.Status.STATUS_ACTIVE_TMP
+ endpoint.save()
+ logger.debug(
+ f"Webhook endpoint '{endpoint.name}' reactivated to '{Notification_Webhooks.Status.STATUS_ACTIVE_TMP}'",
+ )
- # There is no reason to keep endpoint active if it is returning 4xx errors
- else:
- endpoint.status = Notification_Webhooks.Status.STATUS_INACTIVE_PERMANENT
- endpoint.first_error = now
- endpoint.last_error = now
- endpoint.save()
+class AlertNotificationManger(NotificationManagerHelpers):
+ """Manger for alert notifications and their helpers."""
-def send_alert_notification(event, user=None, *args, **kwargs):
- logger.debug("sending alert notification to %s", user)
- try:
- # no need to differentiate between user/no user
- icon = kwargs.get("icon", "info-circle")
+ def send_alert_notification(
+ self,
+ event: str,
+ user: Dojo_User | None = None,
+ **kwargs: dict,
+ ):
+ logger.debug("sending alert notification to %s", user)
try:
- source = Notifications._meta.get_field(event).verbose_name.title()[:100]
- except FieldDoesNotExist:
- source = event.replace("_", " ").title()[:100]
- alert = Alerts(
- user_id=user,
- title=kwargs.get("title")[:250],
- description=create_notification_message(event, user, "alert", *args, **kwargs)[:2000],
- url=kwargs.get("url", reverse("alerts")),
- icon=icon[:25],
- color_icon=kwargs.get("color_icon", "#262626"),
- source=source,
- )
- # relative urls will fail validation
- alert.clean_fields(exclude=["url"])
- alert.save()
- except Exception as e:
- logger.exception(e)
- log_alert(e, "Alert Notification", title=kwargs["title"], description=str(e), url=kwargs["url"])
-
-
-def get_slack_user_id(user_email):
-
- from dojo.utils import get_system_setting
-
- user_id = None
-
- res = requests.request(
- method="POST",
- url="https://slack.com/api/users.lookupByEmail",
- data={"token": get_system_setting("slack_token"), "email": user_email})
-
- user = json.loads(res.text)
-
- slack_user_is_found = False
- if user:
- if "error" in user:
- logger.error("Slack is complaining. See error message below.")
- logger.error(user)
- raise RuntimeError("Error getting user list from Slack: " + res.text)
- if "email" in user["user"]["profile"]:
- if user_email == user["user"]["profile"]["email"]:
- if "id" in user["user"]:
- user_id = user["user"]["id"]
- logger.debug(f"Slack user ID is {user_id}")
- slack_user_is_found = True
- else:
- logger.warning(f"A user with email {user_email} could not be found in this Slack workspace.")
+ # no need to differentiate between user/no user
+ icon = kwargs.get("icon", "info-circle")
+ try:
+ source = Notifications._meta.get_field(event).verbose_name.title()[:100]
+ except FieldDoesNotExist:
+ source = event.replace("_", " ").title()[:100]
+ alert = Alerts(
+ user_id=user,
+ title=kwargs.get("title")[:250],
+ description=self._create_notification_message(
+ event,
+ user,
+ "alert",
+ kwargs,
+ )[:2000],
+ url=kwargs.get("url", reverse("alerts")),
+ icon=icon[:25],
+ source=source,
+ )
+ # relative urls will fail validation
+ alert.clean_fields(exclude=["url"])
+ alert.save()
+ except Exception as exception:
+ logger.exception(exception)
+ self._log_alert(
+ exception,
+ "Alert Notification",
+ title=kwargs["title"],
+ description=str(exception),
+ url=kwargs["url"],
+ )
- if not slack_user_is_found:
- logger.warning("The Slack user was not found.")
- return user_id
+class NotificationManager(NotificationManagerHelpers):
+ """Manage the construction and dispatch of notifications."""
-def log_alert(e, notification_type=None, *args, **kwargs):
- # no try catch here, if this fails we need to show an error
+ def __init__(self, *args: list, **kwargs: dict) -> None:
+ NotificationManagerHelpers.__init__(self, *args, **kwargs)
- users = Dojo_User.objects.filter(is_superuser=True)
- for user in users:
- alert = Alerts(
- user_id=user,
- url=kwargs.get("url", reverse("alerts")),
- title=kwargs.get("title", "Notification issue")[:250],
- description=kwargs.get("description", str(e))[:2000],
- icon="exclamation-triangle",
- source=notification_type[:100] if notification_type else kwargs.get("source", "unknown")[:100])
- # relative urls will fail validation
- alert.clean_fields(exclude=["url"])
- alert.save()
+ def create_notification(self, event: str | None = None, **kwargs: dict) -> None:
+ # Process the notifications for a given list of recipients
+ if kwargs.get("recipients") is not None:
+ self._process_recipients(event=event, **kwargs)
+ else:
+ logger.debug("creating system notifications for event: %s", event)
+ # send system notifications to all admin users
+ self._process_objects(**kwargs)
+ # System notifications are sent one with user=None, which will trigger email to configured system email, to global slack channel, etc.
+ self._process_notifications(
+ event,
+ notifications=self.system_notifications,
+ **kwargs,
+ )
+ # All admins will also receive system notifications, but as part of the person global notifications section below
+ # This time user is set, so will trigger email to personal email, to personal slack channel (mention), etc.
+ # only retrieve users which have at least one notification type enabled for this event type.
+ logger.debug("creating personal notifications for event: %s", event)
+ # There are notification like deleting a product type that shall not be sent to users.
+ # These notifications will have the parameter no_users=True
+ if kwargs.get("no_users", False) is False:
+ # get users with either global notifications, or a product specific notification
+ # and all admin/superuser, they will always be notified
+ for user in self._get_user_to_send_notifications_to():
+ self._send_single_notification_to_user(user, event=event, **kwargs)
+
+ def _process_recipients(self, event: str | None = None, **kwargs: dict) -> None:
+ # mimic existing code so that when recipients is specified, no other system or personal notifications are sent.
+ logger.debug("creating notifications for recipients: %s", kwargs["recipients"])
+ for recipient_notifications in Notifications.objects.filter(
+ user__username__in=kwargs["recipients"],
+ user__is_active=True,
+ product=None,
+ ):
+ # if event in settings.NOTIFICATIONS_SYSTEM_LEVEL_TRUMP:
+ # merge the system level notifications with the personal level
+ # this allows for system to trump the personal
+ merged_notifications = Notifications.merge_notifications_list(
+ [self.system_notifications, recipient_notifications],
+ )
+ merged_notifications.user = recipient_notifications.user
+ logger.debug("Sent notification to %s", merged_notifications.user)
+ self._process_notifications(
+ event,
+ notifications=merged_notifications,
+ **kwargs,
+ )
+ # else:
+ # # Do not trump user preferences and send notifications as usual
+ # logger.debug("Sent notification to %s", recipient_notifications.user)
+ # self._process_notifications(
+ # event,
+ # notifications=recipient_notifications,
+ # **kwargs,
+ # )
+
+ def _process_objects(self, **kwargs: dict) -> None:
+ """Extract the product and product type from the kwargs."""
+ self.product_type: Product_Type = None
+ self.product: Product = None
+ if (product_type := kwargs.get("product_type")) is not None:
+ self.product_type = product_type
+ logger.debug("Defined product type %s", self.product_type)
+ if (product := kwargs.get("product")) is not None:
+ self.product = product
+ logger.debug("Defined product %s", self.product)
+ elif (engagement := kwargs.get("engagement")) is not None:
+ self.product = engagement.product
+ logger.debug("Defined product of engagement %s", self.product)
+ elif (test := kwargs.get("test")) is not None:
+ self.product = test.engagement.product
+ logger.debug("Defined product of test %s", self.product)
+ elif (finding := kwargs.get("finding")) is not None:
+ self.product = finding.test.engagement.product
+ logger.debug("Defined product of finding %s", self.product)
+ elif (obj := kwargs.get("obj")) is not None:
+ from dojo.utils import get_product
+ self.product = get_product(obj)
+ logger.debug("Defined product of obj %s", self.product)
+
+ def _get_user_to_send_notifications_to(
+ self,
+ ) -> QuerySet[Dojo_User]:
+ """Determine the users we should send notifications to based on product and product type permissions."""
+ users = (
+ Dojo_User.objects.filter(is_active=True)
+ .prefetch_related(
+ Prefetch(
+ "notifications_set",
+ queryset=Notifications.objects.filter(
+ Q(product_id=self.product) | Q(product__isnull=True),
+ ),
+ to_attr="applicable_notifications",
+ ),
+ )
+ .annotate(
+ applicable_notifications_count=Count(
+ "notifications__id",
+ filter=Q(notifications__product_id=self.product) | Q(notifications__product__isnull=True),
+ ),
+ )
+ .filter(Q(applicable_notifications_count__gt=0) | Q(is_superuser=True))
+ )
+ # only send to authorized users or admin/superusers
+ logger.debug("Filtering users for the product %s", self.product)
+ if self.product is not None:
+ users = get_authorized_users_for_product_and_product_type(
+ users,
+ self.product,
+ Permissions.Product_View,
+ )
+ elif self.product_type is not None:
+ users = get_authorized_users_for_product_type(
+ users,
+ self.product_type,
+ Permissions.Product_Type_View,
+ )
+ else:
+ # nor product_type nor product defined, we should not make noise and send only notifications to admins
+ logger.debug("Product is not specified, making it silent")
+ users = users.filter(is_superuser=True)
+ return users
+
+ def _send_single_notification_to_user(
+ self,
+ user: Dojo_User,
+ event: str | None = None,
+ **kwargs: dict,
+ ) -> None:
+ """Send a notification to a single user."""
+ logger.debug("Authorized user for the product %s", user)
+ # send notifications to user after merging possible multiple notifications records (i.e. personal global + personal product)
+ # kwargs.update({'user': user})
+ applicable_notifications = user.applicable_notifications
+ if user.is_superuser:
+ # admin users get all system notifications
+ logger.debug("User %s is superuser", user)
+ applicable_notifications.append(self.system_notifications)
+
+ notifications_set = Notifications.merge_notifications_list(
+ applicable_notifications,
+ )
+ notifications_set.user = user
+ self._process_notifications(event, notifications=notifications_set, **kwargs)
+
+ def _get_manager_instance(
+ self,
+ alert_type: str,
+ ) -> type[NotificationManagerHelpers]:
+ kwargs = {
+ "system_notifications": self.system_notifications,
+ "system_settings": self.system_settings,
+ }
+ if alert_type == "slack":
+ return SlackNotificationManger(**kwargs)
+ if alert_type == "msteams":
+ return MSTeamsNotificationManger(**kwargs)
+ if alert_type == "mail":
+ return EmailNotificationManger(**kwargs)
+ if alert_type == "webhooks":
+ return WebhookNotificationManger(**kwargs)
+ if alert_type == "alert":
+ return AlertNotificationManger(**kwargs)
+
+ msg = f"Unsupported alert type: {alert_type}"
+ raise TypeError(msg)
+
+ def _process_notifications(
+ self,
+ event: str | None,
+ notifications: Notifications | None = None,
+ **kwargs: dict,
+ ) -> None:
+ # Quick break out if we do not have any work to do
+ if not notifications:
+ logger.warning("no notifications!")
+ return
+
+ logger.debug(
+ "sending notification " + ("asynchronously" if we_want_async() else "synchronously"),
+ )
+ logger.debug("process notifications for %s", notifications.user)
+
+ if self.system_settings.enable_slack_notifications and "slack" in getattr(
+ notifications,
+ event,
+ getattr(notifications, "other"),
+ ):
+ logger.debug("Sending Slack Notification")
+ self._get_manager_instance("slack").send_slack_notification(
+ event,
+ user=notifications.user,
+ **kwargs,
+ )
-def notify_test_created(test):
- title = "Test created for " + str(test.engagement.product) + ": " + str(test.engagement.name) + ": " + str(test)
- create_notification(event="test_added", title=title, test=test, engagement=test.engagement, product=test.engagement.product,
- url=reverse("view_test", args=(test.id,)), url_api=reverse("test-detail", args=(test.id,)))
+ if self.system_settings.enable_msteams_notifications and "msteams" in getattr(
+ notifications,
+ event,
+ getattr(notifications, "other"),
+ ):
+ logger.debug("Sending MSTeams Notification")
+ self._get_manager_instance("msteams").send_msteams_notification(
+ event,
+ user=notifications.user,
+ **kwargs,
+ )
+ if self.system_settings.enable_mail_notifications and "mail" in getattr(
+ notifications,
+ event,
+ getattr(notifications, "other"),
+ ):
+ logger.debug("Sending Mail Notification")
+ self._get_manager_instance("mail").send_mail_notification(
+ event,
+ user=notifications.user,
+ **kwargs,
+ )
-def notify_scan_added(test, updated_count, new_findings=[], findings_mitigated=[], findings_reactivated=[], findings_untouched=[]):
- logger.debug("Scan added notifications")
+ if self.system_settings.enable_webhooks_notifications and "webhooks" in getattr(
+ notifications,
+ event,
+ getattr(notifications, "other"),
+ ):
+ logger.debug("Sending Webhooks Notification")
+ self._get_manager_instance("webhooks").send_webhooks_notification(
+ event,
+ user=notifications.user,
+ **kwargs,
+ )
- new_findings = sorted(new_findings, key=lambda x: x.numerical_severity)
- findings_mitigated = sorted(findings_mitigated, key=lambda x: x.numerical_severity)
- findings_reactivated = sorted(findings_reactivated, key=lambda x: x.numerical_severity)
- findings_untouched = sorted(findings_untouched, key=lambda x: x.numerical_severity)
+ if "alert" in getattr(notifications, event, getattr(notifications, "other")):
+ logger.debug(f"Sending Alert to {notifications.user}")
+ self._get_manager_instance("alert").send_alert_notification(
+ event,
+ user=notifications.user,
+ **kwargs,
+ )
- title = "Created/Updated " + str(updated_count) + " findings for " + str(test.engagement.product) + ": " + str(test.engagement.name) + ": " + str(test)
- if updated_count == 0:
- event = "scan_added_empty"
- else:
- event = "scan_added"
+@app.task(ignore_result=True)
+def webhook_status_cleanup(*_args: list, **_kwargs: dict):
+ # If some endpoint was affected by some outage (5xx, 429, Timeout) but it was clean during last 24 hours,
+ # we consider this endpoint as healthy so need to reset it
+ endpoints = Notification_Webhooks.objects.filter(
+ status=Notification_Webhooks.Status.STATUS_ACTIVE_TMP,
+ last_error__lt=get_current_datetime() - timedelta(hours=24),
+ )
+ for endpoint in endpoints:
+ endpoint.status = Notification_Webhooks.Status.STATUS_ACTIVE
+ endpoint.first_error = None
+ endpoint.last_error = None
+ endpoint.note = f"Reactivation from {Notification_Webhooks.Status.STATUS_ACTIVE_TMP}"
+ endpoint.save()
+ logger.debug(
+ f"Webhook endpoint '{endpoint.name}' reactivated from '{Notification_Webhooks.Status.STATUS_ACTIVE_TMP}' to '{Notification_Webhooks.Status.STATUS_ACTIVE}'",
+ )
- create_notification(event=event, title=title, findings_new=new_findings, findings_mitigated=findings_mitigated, findings_reactivated=findings_reactivated,
- finding_count=updated_count, test=test, engagement=test.engagement, product=test.engagement.product, findings_untouched=findings_untouched,
- url=reverse("view_test", args=(test.id,)), url_api=reverse("test-detail", args=(test.id,)))
+ # Reactivation of STATUS_INACTIVE_TMP endpoints.
+ # They should reactive automatically in 60s, however in case of some unexpected event (e.g. start of whole stack),
+ # endpoints should not be left in STATUS_INACTIVE_TMP state
+ broken_endpoints = Notification_Webhooks.objects.filter(
+ status=Notification_Webhooks.Status.STATUS_INACTIVE_TMP,
+ last_error__lt=get_current_datetime() - timedelta(minutes=5),
+ )
+ for endpoint in broken_endpoints:
+ manager = WebhookNotificationManger()
+ manager._webhook_reactivation(manager, endpoint_id=endpoint.pk)
\ No newline at end of file
diff --git a/dojo/notifications/views.py b/dojo/notifications/views.py
index 7fe5562ee7e..7fc58803fc4 100755
--- a/dojo/notifications/views.py
+++ b/dojo/notifications/views.py
@@ -11,7 +11,7 @@
from dojo.forms import DeleteNotificationsWebhookForm, NotificationsForm, NotificationsWebhookForm
from dojo.models import Notification_Webhooks, Notifications
-from dojo.notifications.helper import test_webhooks_notification
+from dojo.notifications.helper import NotificationManagerHelpers
from dojo.utils import add_breadcrumb, get_enabled_notifications_list, get_system_setting
logger = logging.getLogger(__name__)
@@ -136,6 +136,9 @@ def set_breadcrumbs(self, request: HttpRequest):
class NotificationWebhooksView(View):
+ def get_webhook_manager_instance(self) -> type[NotificationManagerHelpers]:
+ return Notification_Webhooks()
+
def check_webhooks_enabled(self):
if not get_system_setting("enable_webhooks_notifications"):
raise Http404
@@ -216,7 +219,7 @@ def process_form(self, request: HttpRequest, context: dict):
form = context["form"]
if form.is_valid():
try:
- test_webhooks_notification(form.instance)
+ self.get_webhook_manager_instance().test_webhooks_notification(form.instance)
except requests.exceptions.RequestException as e:
messages.add_message(
request,
@@ -305,7 +308,7 @@ def process_form(self, request: HttpRequest, nwh: Notification_Webhooks, context
if form.is_valid():
try:
- test_webhooks_notification(form.instance)
+ self.get_webhook_manager_instance().test_webhooks_notification(form.instance)
except requests.exceptions.RequestException as e:
messages.add_message(
request,
diff --git a/dojo/pipeline.py b/dojo/pipeline.py
index 542be2d3f27..399ea876724 100755
--- a/dojo/pipeline.py
+++ b/dojo/pipeline.py
@@ -109,8 +109,9 @@ def search_azure_groups(kwargs, token, soc):
+ str(group_from_response)
+ "?$select=displayName"
),
- headers=request_headers,
- )
+ headers=request_headers,
+ timeout=settings.REQUESTS_TIMEOUT,
+ )
group_name_request.raise_for_status()
group_name_request_json = group_name_request.json()
group_name = group_name_request_json["displayName"]
@@ -136,9 +137,7 @@ def search_azure_groups(kwargs, token, soc):
def is_group_id(group):
- if re.search(r"^[a-zA-Z0-9]{8,}-[a-zA-Z0-9]{4,}-[a-zA-Z0-9]{4,}-[a-zA-Z0-9]{4,}-[a-zA-Z0-9]{12,}$", group):
- return True
- return False
+ return bool(re.search("^[a-zA-Z0-9]{8,}-[a-zA-Z0-9]{4,}-[a-zA-Z0-9]{4,}-[a-zA-Z0-9]{4,}-[a-zA-Z0-9]{12,}$", group))
def assign_user_to_groups(user, group_names, social_provider):
diff --git a/dojo/product/views.py b/dojo/product/views.py
index 43a4eaa78c1..20ae3d413e4 100644
--- a/dojo/product/views.py
+++ b/dojo/product/views.py
@@ -1,6 +1,7 @@
# # product
import base64
import calendar as tcalendar
+import contextlib
import logging
from collections import OrderedDict
from datetime import date, datetime, timedelta
@@ -358,9 +359,7 @@ def identify_view(request):
return view
msg = 'invalid view, view must be "Endpoint" or "Finding"'
raise ValueError(msg)
- if get_data.get("finding__severity", None):
- return "Endpoint"
- if get_data.get("false_positive", None):
+ if get_data.get("finding__severity", None) or get_data.get("false_positive", None):
return "Endpoint"
referer = request.META.get("HTTP_REFERER", None)
if referer:
@@ -617,13 +616,11 @@ def view_product_metrics(request, pid):
open_close_weekly[unix_timestamp] = {"closed": 0, "open": 1, "accepted": 0}
open_close_weekly[unix_timestamp]["week"] = html_date
- if view == "Finding":
- severity = finding.get("severity")
- elif view == "Endpoint":
+ if view == "Finding" or view == "Endpoint":
severity = finding.get("severity")
finding_age = calculate_finding_age(finding)
- if open_objs_by_age.get(finding_age, None):
+ if open_objs_by_age.get(finding_age):
open_objs_by_age[finding_age] += 1
else:
open_objs_by_age[finding_age] = 1
@@ -919,10 +916,7 @@ def new_product(request, ptid=None):
if get_system_setting("enable_jira"):
jira_project_form = JIRAProjectForm()
- if get_system_setting("enable_github"):
- gform = GITHUB_Product_Form()
- else:
- gform = None
+ gform = GITHUB_Product_Form() if get_system_setting("enable_github") else None
add_breadcrumb(title=_("New Product"), top_level=False, request=request)
return render(request, "dojo/new_product.html",
@@ -969,10 +963,8 @@ def edit_product(request, pid):
if get_system_setting("enable_github") and github_inst:
gform = GITHUB_Product_Form(request.POST, instance=github_inst)
# need to handle delete
- try:
+ with contextlib.suppress(Exception):
gform.save()
- except:
- pass
elif get_system_setting("enable_github"):
gform = GITHUB_Product_Form(request.POST)
if gform.is_valid():
@@ -996,10 +988,7 @@ def edit_product(request, pid):
jform = None
if github_enabled:
- if github_inst is not None:
- gform = GITHUB_Product_Form(instance=github_inst)
- else:
- gform = GITHUB_Product_Form()
+ gform = GITHUB_Product_Form(instance=github_inst) if github_inst is not None else GITHUB_Product_Form()
else:
gform = None
@@ -1129,10 +1118,7 @@ def new_eng_for_app(request, pid, cicd=False):
logger.debug("showing jira-epic-form")
jira_epic_form = JIRAEngagementForm()
- if cicd:
- title = _("New CI/CD Engagement")
- else:
- title = _("New Interactive Engagement")
+ title = _("New CI/CD Engagement") if cicd else _("New Interactive Engagement")
product_tab = Product_Tab(product, title=title, tab="engagements")
return render(request, "dojo/new_eng.html", {
diff --git a/dojo/remote_user.py b/dojo/remote_user.py
index 764af4e548b..a60fe52c899 100755
--- a/dojo/remote_user.py
+++ b/dojo/remote_user.py
@@ -100,8 +100,7 @@ def get_security_definition(self, auto_schema):
return {}
header_name = settings.AUTH_REMOTEUSER_USERNAME_HEADER
- if header_name.startswith("HTTP_"):
- header_name = header_name[5:]
+ header_name = header_name.removeprefix("HTTP_")
header_name = header_name.replace("_", "-").capitalize()
return {
diff --git a/dojo/reports/views.py b/dojo/reports/views.py
index 1432da090e8..4862d51977b 100755
--- a/dojo/reports/views.py
+++ b/dojo/reports/views.py
@@ -3,7 +3,6 @@
import re
from datetime import datetime
from tempfile import NamedTemporaryFile
-from typing import List
from dateutil.relativedelta import relativedelta
from django.conf import settings
@@ -85,16 +84,20 @@ def get_findings(self, request: HttpRequest):
def get_endpoints(self, request: HttpRequest):
endpoints = Endpoint.objects.filter(finding__active=True,
- finding__verified=True,
finding__false_p=False,
finding__duplicate=False,
finding__out_of_scope=False,
- ).distinct()
+ )
+ if get_system_setting("enforce_verified_status", True):
+ endpoints = endpoints.filter(finding__active=True)
+
+ endpoints = endpoints.distinct()
+
filter_string_matching = get_system_setting("filter_string_matching", False)
filter_class = EndpointFilterWithoutObjectLookups if filter_string_matching else EndpointFilter
return filter_class(request.GET, queryset=endpoints, user=request.user)
- def get_available_widgets(self, request: HttpRequest) -> List[Widget]:
+ def get_available_widgets(self, request: HttpRequest) -> list[Widget]:
return [
CoverPage(request=request),
TableOfContents(request=request),
@@ -187,12 +190,14 @@ def report_findings(request):
def report_endpoints(request):
endpoints = Endpoint.objects.filter(finding__active=True,
- finding__verified=True,
finding__false_p=False,
finding__duplicate=False,
finding__out_of_scope=False,
- ).distinct()
+ )
+ if get_system_setting("enforce_verified_status", True):
+ endpoints = endpoints.filter(finding__active=True)
+ endpoints = endpoints.distinct()
endpoints = EndpointFilter(request.GET, queryset=endpoints, user=request.user)
paged_endpoints = get_page_items(request, endpoints.qs, 25)
@@ -261,13 +266,15 @@ def endpoint_host_report(request, eid):
@user_is_authorized(Product, Permissions.Product_View, "pid")
def product_endpoint_report(request, pid):
product = get_object_or_404(Product.objects.all().prefetch_related("engagement_set__test_set__test_type", "engagement_set__test_set__environment"), id=pid)
- endpoint_ids = Endpoint.objects.filter(product=product,
- finding__active=True,
- finding__verified=True,
- finding__false_p=False,
- finding__duplicate=False,
- finding__out_of_scope=False,
- ).values_list("id", flat=True)
+ endpoints = Endpoint.objects.filter(finding__active=True,
+ finding__false_p=False,
+ finding__duplicate=False,
+ finding__out_of_scope=False)
+
+ if get_system_setting("enforce_verified_status", True):
+ endpoint_ids = endpoints.filter(finding__active=True).values_list("id", flat=True)
+
+ endpoint_ids = endpoints.values_list("id", flat=True)
endpoints = prefetch_related_endpoints_for_report(Endpoint.objects.filter(id__in=endpoint_ids))
endpoints = EndpointReportFilter(request.GET, queryset=endpoints)
@@ -649,8 +656,7 @@ def get_findings(request):
if not url:
msg = "Please use the report button when viewing findings"
raise Http404(msg)
- if url.startswith("url="):
- url = url[4:]
+ url = url.removeprefix("url=")
views = ["all", "open", "inactive", "verified",
"closed", "accepted", "out_of_scope",
@@ -871,8 +877,7 @@ def get(self, request):
for endpoint in finding.endpoints.all():
num_endpoints += 1
endpoint_value += f"{str(endpoint)}; "
- if endpoint_value.endswith("; "):
- endpoint_value = endpoint_value[:-2]
+ endpoint_value = endpoint_value.removesuffix("; ")
if len(endpoint_value) > EXCEL_CHAR_LIMIT:
endpoint_value = endpoint_value[:EXCEL_CHAR_LIMIT - 3] + "..."
fields.append(endpoint_value)
@@ -887,8 +892,7 @@ def get(self, request):
vulnerability_ids_value += f"{str(vulnerability_id)}; "
if finding.cve and vulnerability_ids_value.find(finding.cve) < 0:
vulnerability_ids_value += finding.cve
- if vulnerability_ids_value.endswith("; "):
- vulnerability_ids_value = vulnerability_ids_value[:-2]
+ vulnerability_ids_value = vulnerability_ids_value.removesuffix("; ")
fields.append(vulnerability_ids_value)
# Tags
tags_value = ""
@@ -899,8 +903,7 @@ def get(self, request):
tags_value += "..."
break
tags_value += f"{str(tag)}; "
- if tags_value.endswith("; "):
- tags_value = tags_value[:-2]
+ tags_value = tags_value.removesuffix("; ")
fields.append(tags_value)
self.fields = fields
@@ -953,6 +956,7 @@ def get(self, request):
except Exception as exc:
logger.error("Error in attribute: " + str(exc))
cell = worksheet.cell(row=row_num, column=col_num, value=key)
+ col_num += 1
continue
cell = worksheet.cell(row=row_num, column=col_num, value="found_by")
cell.font = font_bold
@@ -1004,6 +1008,7 @@ def get(self, request):
except Exception as exc:
logger.error("Error in attribute: " + str(exc))
worksheet.cell(row=row_num, column=col_num, value="Value not supported")
+ col_num += 1
continue
worksheet.cell(row=row_num, column=col_num, value=finding.test.test_type.name)
col_num += 1
@@ -1021,8 +1026,7 @@ def get(self, request):
for endpoint in finding.endpoints.all():
num_endpoints += 1
endpoint_value += f"{str(endpoint)}; \n"
- if endpoint_value.endswith("; \n"):
- endpoint_value = endpoint_value[:-3]
+ endpoint_value = endpoint_value.removesuffix("; \n")
if len(endpoint_value) > EXCEL_CHAR_LIMIT:
endpoint_value = endpoint_value[:EXCEL_CHAR_LIMIT - 3] + "..."
worksheet.cell(row=row_num, column=col_num, value=endpoint_value)
@@ -1038,16 +1042,14 @@ def get(self, request):
vulnerability_ids_value += f"{str(vulnerability_id)}; \n"
if finding.cve and vulnerability_ids_value.find(finding.cve) < 0:
vulnerability_ids_value += finding.cve
- if vulnerability_ids_value.endswith("; \n"):
- vulnerability_ids_value = vulnerability_ids_value[:-3]
+ vulnerability_ids_value = vulnerability_ids_value.removesuffix("; \n")
worksheet.cell(row=row_num, column=col_num, value=vulnerability_ids_value)
col_num += 1
# tags
tags_value = ""
for tag in finding.tags.all():
tags_value += f"{str(tag)}; \n"
- if tags_value.endswith("; \n"):
- tags_value = tags_value[:-3]
+ tags_value = tags_value.removesuffix("; \n")
worksheet.cell(row=row_num, column=col_num, value=tags_value)
col_num += 1
self.col_num = col_num
diff --git a/dojo/reports/widgets.py b/dojo/reports/widgets.py
index 2ff2e83f103..61fa46ed3c3 100755
--- a/dojo/reports/widgets.py
+++ b/dojo/reports/widgets.py
@@ -368,16 +368,22 @@ def report_widget_factory(json_data=None, request=None, user=None, finding_notes
host=None):
selected_widgets = OrderedDict()
widgets = json.loads(json_data)
+
for idx, widget in enumerate(widgets):
if list(widget.keys())[0] == "page-break":
selected_widgets[list(widget.keys())[0] + "-" + str(idx)] = PageBreak()
+
if list(widget.keys())[0] == "endpoint-list":
endpoints = Endpoint.objects.filter(finding__active=True,
- finding__verified=True,
finding__false_p=False,
finding__duplicate=False,
finding__out_of_scope=False,
- ).distinct()
+ )
+ if get_system_setting("enforce_verified_status", True):
+ endpoints = endpoints.filter(finding__verified=True)
+
+ endpoints = endpoints.distinct()
+
d = QueryDict(mutable=True)
for item in widget.get(list(widget.keys())[0]):
if item["name"] in d:
diff --git a/dojo/risk_acceptance/api.py b/dojo/risk_acceptance/api.py
index 4fc89a32fe0..2fdaadf0afb 100755
--- a/dojo/risk_acceptance/api.py
+++ b/dojo/risk_acceptance/api.py
@@ -1,5 +1,5 @@
from abc import ABC, abstractmethod
-from typing import List, NamedTuple
+from typing import NamedTuple
from django.db.models import QuerySet
from django.utils import timezone
@@ -81,7 +81,7 @@ def accept_risks(self, request):
return Response(status=201, data=result.data)
-def _accept_risks(accepted_risks: List[AcceptedRisk], base_findings: QuerySet, owner: User):
+def _accept_risks(accepted_risks: list[AcceptedRisk], base_findings: QuerySet, owner: User):
accepted = []
for risk in accepted_risks:
vulnerability_ids = Vulnerability_Id.objects \
diff --git a/dojo/search/views.py b/dojo/search/views.py
index 2df90557a44..07a8c0ab6f9 100755
--- a/dojo/search/views.py
+++ b/dojo/search/views.py
@@ -187,10 +187,10 @@ def simple_search(request):
# some over the top tag displaying happening...
findings.object_list = findings.object_list.prefetch_related("test__engagement__product__tags")
- tag = operators["tag"] if "tag" in operators else keywords
- tags = operators["tags"] if "tags" in operators else keywords
- not_tag = operators["not-tag"] if "not-tag" in operators else keywords
- not_tags = operators["not-tags"] if "not-tags" in operators else keywords
+ tag = operators.get("tag", keywords)
+ tags = operators.get("tags", keywords)
+ not_tag = operators.get("not-tag", keywords)
+ not_tags = operators.get("not-tags", keywords)
if (search_tags and tag) or tags or not_tag or not_tags:
logger.debug("searching tags")
@@ -542,7 +542,7 @@ def apply_vulnerability_id_filter(qs, operators):
def perform_keyword_search_for_operator(qs, operators, operator, keywords_query):
watson_results = None
operator_query = ""
- keywords_query = "" if not keywords_query else keywords_query
+ keywords_query = keywords_query or ""
if operator in operators:
operator_query = " ".join(operators[operator])
diff --git a/dojo/settings/.settings.dist.py.sha256sum b/dojo/settings/.settings.dist.py.sha256sum
deleted file mode 100644
index def3909d2c9..00000000000
--- a/dojo/settings/.settings.dist.py.sha256sum
+++ /dev/null
@@ -1 +0,0 @@
-002b28325f11793c5aa9f09326c2d5cc66de518cce51b2cb4cb681a920b89909
diff --git a/dojo/settings/settings.dist.py b/dojo/settings/settings.dist.py
index e0e80dba84e..5caedac3841 100644
--- a/dojo/settings/settings.dist.py
+++ b/dojo/settings/settings.dist.py
@@ -1,15 +1,9 @@
#########################################################################################################
-# It is not allowed to edit file 'settings.dist.py', for production deployemnts. #
+# It is not recommended to edit file 'settings.dist.py', for production deployments. #
# Any customization of variables need to be done via environmental variables or in 'local_settings.py'. #
# For more information check https://documentation.defectdojo.com/getting_started/configuration/ #
#########################################################################################################
-#########################################################################################################
-# If as a developer of a new feature, you need to perform an update of file 'settings.dist.py', #
-# after the change, calculate the checksum and store it related file by calling the following command: #
-# $ sha256sum settings.dist.py | cut -d ' ' -f1 > .settings.dist.py.sha256sum #
-#########################################################################################################
-
# Django settings for DefectDojo
import json
import boto3
@@ -26,6 +20,7 @@
import warnings
from datetime import timedelta
from email.utils import getaddresses
+from pathlib import Path
import environ
from celery.schedules import crontab
@@ -311,7 +306,7 @@
DD_DELETE_PREVIEW=(bool, True),
# List of acceptable file types that can be uploaded to a given object via arbitrary file upload
DD_FILE_UPLOAD_TYPES=(list, [".txt", ".pdf", ".json", ".xml", ".csv", ".yml", ".png", ".jpeg",
- ".sarif", ".xlsx", ".doc", ".html", ".js", ".nessus", ".zip"]),
+ ".sarif", ".xlsx", ".doc", ".html", ".js", ".nessus", ".zip", ".fpr"]),
# Max file size for scan added via API in MB
DD_SCAN_FILE_MAX_SIZE=(int, 100),
# When disabled, existing user tokens will not be removed but it will not be
@@ -447,7 +442,10 @@
}
}),
# When enabled, force the password field to be required for creating/updating users
- DD_REQUIRE_PASSWORD_ON_USER=(bool, True)
+ DD_REQUIRE_PASSWORD_ON_USER=(bool, True),
+ # For HTTP requests, how long connection is open before timeout
+ # This settings apply only on requests performed by "requests" lib used in Dojo code (if some included lib is using "requests" as well, this does not apply there)
+ DD_REQUESTS_TIMEOUT=(int, 30)
)
@@ -492,7 +490,7 @@ def get_secret(secret_name):
# Read .env file as default or from the command line, DD_ENV_PATH
-if os.path.isfile(root("dojo/settings/.env.prod")) or "DD_ENV_PATH" in os.environ:
+if Path(root("dojo/settings/.env.prod")).is_file() or "DD_ENV_PATH" in os.environ:
env.read_env(root("dojo/settings/" + env.str("DD_ENV_PATH", ".env.prod")))
# ------------------------------------------------------------------------------
@@ -652,7 +650,7 @@ def get_secret(secret_name):
# Put strings here, like "/home/html/static" or "C:/www/django/static".
# Always use forward slashes, even on Windows.
# Don't forget to use absolute paths, not relative paths.
- os.path.join(os.path.dirname(DOJO_ROOT), "components", "node_modules"),
+ os.path.join(Path(DOJO_ROOT).parent, "components", "node_modules"),
)
# List of finder classes that know how to find static files in
@@ -752,8 +750,8 @@ def get_secret(secret_name):
GOOGLE_OAUTH_ENABLED = env("DD_SOCIAL_AUTH_GOOGLE_OAUTH2_ENABLED")
SOCIAL_AUTH_GOOGLE_OAUTH2_KEY = env("DD_SOCIAL_AUTH_GOOGLE_OAUTH2_KEY")
SOCIAL_AUTH_GOOGLE_OAUTH2_SECRET = env("DD_SOCIAL_AUTH_GOOGLE_OAUTH2_SECRET")
-SOCIAL_AUTH_GOOGLE_OAUTH2_WHITELISTED_DOMAINS = env("DD_SOCIAL_AUTH_GOOGLE_OAUTH2_WHITELISTED_DOMAINS")
-SOCIAL_AUTH_GOOGLE_OAUTH2_WHITELISTED_EMAILS = env("DD_SOCIAL_AUTH_GOOGLE_OAUTH2_WHITELISTED_EMAILS")
+SOCIAL_AUTH_GOOGLE_OAUTH2_WHITELISTED_DOMAINS = tuple(env.list("DD_SOCIAL_AUTH_GOOGLE_OAUTH2_WHITELISTED_DOMAINS", default=[""]))
+SOCIAL_AUTH_GOOGLE_OAUTH2_WHITELISTED_EMAILS = tuple(env.list("DD_SOCIAL_AUTH_GOOGLE_OAUTH2_WHITELISTED_EMAILS", default=[""]))
SOCIAL_AUTH_LOGIN_ERROR_URL = "/login"
SOCIAL_AUTH_BACKEND_ERROR_URL = "/login"
@@ -1226,7 +1224,7 @@ def saml2_attrib_map_format(dict):
SAML_ATTRIBUTE_MAPPING = saml2_attrib_map_format(env("DD_SAML2_ATTRIBUTES_MAP"))
SAML_FORCE_AUTH = env("DD_SAML2_FORCE_AUTH")
SAML_ALLOW_UNKNOWN_ATTRIBUTES = env("DD_SAML2_ALLOW_UNKNOWN_ATTRIBUTE")
- BASEDIR = path.dirname(path.abspath(__file__))
+ BASEDIR = Path(path.abspath(__file__)).parent
if len(env("DD_SAML2_ENTITY_ID")) == 0:
SAML2_ENTITY_ID = f"{SITE_URL}/saml2/metadata/"
else:
@@ -1525,6 +1523,7 @@ def saml2_attrib_map_format(dict):
"Anchore Grype": ["title", "severity", "component_name", "component_version"],
"Aqua Scan": ["severity", "vulnerability_ids", "component_name", "component_version"],
"Bandit Scan": ["file_path", "line", "vuln_id_from_tool"],
+ "Burp Enterprise Scan": ["title", "severity", "cwe"],
"CargoAudit Scan": ["vulnerability_ids", "severity", "component_name", "component_version", "vuln_id_from_tool"],
"Checkmarx Scan": ["cwe", "severity", "file_path"],
"Checkmarx OSA": ["vulnerability_ids", "component_name"],
@@ -1536,7 +1535,8 @@ def saml2_attrib_map_format(dict):
"Dependency Check Scan": ["title", "cwe", "file_path"],
"Dockle Scan": ["title", "description", "vuln_id_from_tool"],
"Dependency Track Finding Packaging Format (FPF) Export": ["component_name", "component_version", "vulnerability_ids"],
- "Mobsfscan Scan": ["title", "severity", "cwe"],
+ "Horusec Scan": ["title", "description", "file_path", "line"],
+ "Mobsfscan Scan": ["title", "severity", "cwe", "file_path", "description"],
"Tenable Scan": ["title", "severity", "vulnerability_ids", "cwe", "description"],
"Nexpose Scan": ["title", "severity", "vulnerability_ids", "cwe"],
# possible improvement: in the scanner put the library name into file_path, then dedup on cwe + file_path + severity
@@ -1587,7 +1587,7 @@ def saml2_attrib_map_format(dict):
"NeuVector (compliance)": ["title", "vuln_id_from_tool", "description"],
"Wpscan": ["title", "description", "severity"],
"Popeye Scan": ["title", "description"],
- "Nuclei Scan": ["title", "cwe", "severity"],
+ "Nuclei Scan": ["title", "cwe", "severity", "component_name"],
"KubeHunter Scan": ["title", "description"],
"kube-bench Scan": ["title", "vuln_id_from_tool", "description"],
"Threagile risks report": ["title", "cwe", "severity"],
@@ -1597,6 +1597,7 @@ def saml2_attrib_map_format(dict):
"HCLAppScan XML": ["title", "description"],
"KICS Scan": ["file_path", "line", "severity", "description", "title"],
"MobSF Scan": ["title", "description", "severity"],
+ "MobSF Scorecard Scan": ["title", "description", "severity"],
"OSV Scan": ["title", "description", "severity"],
"Snyk Code Scan": ["vuln_id_from_tool", "file_path"],
"Deepfence Threatmapper Report": ["title", "description", "severity"],
@@ -1607,17 +1608,26 @@ def saml2_attrib_map_format(dict):
"Kiuwan SCA Scan": ["description", "severity", "component_name", "component_version", "cwe"],
"Rapplex Scan": ["title", "endpoints", "severity"],
"AppCheck Web Application Scanner": ["title", "severity"],
+ "AWS Inspector2 Scan": ["title", "severity", "description"],
"Legitify Scan": ["title", "endpoints", "severity"],
"ThreatComposer Scan": ["title", "description"],
"Invicti Scan": ["title", "description", "severity"],
"HackerOne Cases": ["title", "severity"],
"KrakenD Audit Scan": ["description", "mitigation", "severity"],
+ "Red Hat Satellite": ["description", "severity"],
+ "Qualys Hacker Guardian Scan": ["title", "severity", "description"],
}
# Override the hardcoded settings here via the env var
if len(env("DD_HASHCODE_FIELDS_PER_SCANNER")) > 0:
env_hashcode_fields_per_scanner = json.loads(env("DD_HASHCODE_FIELDS_PER_SCANNER"))
for key, value in env_hashcode_fields_per_scanner.items():
+ if not isinstance(value, list):
+ msg = f"Fields definition '{value}' for hashcode calculation of '{key}' is not valid. It needs to be list of strings but it is {type(value)}."
+ raise TypeError(msg)
+ if not all(isinstance(field, str) for field in value):
+ msg = f"Fields for hashcode calculation for {key} are not valid. It needs to be list of strings. Some of fields are not string."
+ raise AttributeError(msg)
if key in HASHCODE_FIELDS_PER_SCANNER:
logger.info(f"Replacing {key} with value {value} (previously set to {HASHCODE_FIELDS_PER_SCANNER[key]}) from env var DD_HASHCODE_FIELDS_PER_SCANNER")
HASHCODE_FIELDS_PER_SCANNER[key] = value
@@ -1674,6 +1684,7 @@ def saml2_attrib_map_format(dict):
"Wazuh": True,
"Nuclei Scan": True,
"Threagile risks report": True,
+ "AWS Inspector2 Scan": True,
}
# List of fields that are known to be usable in hash_code computation)
@@ -1698,6 +1709,13 @@ def saml2_attrib_map_format(dict):
# Makes it possible to deduplicate on a technical id (same parser) and also on some functional fields (cross-parsers deduplication)
DEDUPE_ALGO_UNIQUE_ID_FROM_TOOL_OR_HASH_CODE = "unique_id_from_tool_or_hash_code"
+DEDUPE_ALGOS = [
+ DEDUPE_ALGO_LEGACY,
+ DEDUPE_ALGO_UNIQUE_ID_FROM_TOOL,
+ DEDUPE_ALGO_HASH_CODE,
+ DEDUPE_ALGO_UNIQUE_ID_FROM_TOOL_OR_HASH_CODE,
+]
+
# Allows to deduplicate with endpoints if endpoints is not included in the hashcode.
# Possible values are: scheme, host, port, path, query, fragment, userinfo, and user. For a details description see https://hyperlink.readthedocs.io/en/latest/api.html#attributes.
# Example:
@@ -1725,6 +1743,7 @@ def saml2_attrib_map_format(dict):
"AWS Security Finding Format (ASFF) Scan": DEDUPE_ALGO_UNIQUE_ID_FROM_TOOL,
"Burp REST API": DEDUPE_ALGO_UNIQUE_ID_FROM_TOOL,
"Bandit Scan": DEDUPE_ALGO_HASH_CODE,
+ "Burp Enterprise Scan": DEDUPE_ALGO_HASH_CODE,
"CargoAudit Scan": DEDUPE_ALGO_HASH_CODE,
"Checkmarx Scan detailed": DEDUPE_ALGO_UNIQUE_ID_FROM_TOOL,
"Checkmarx Scan": DEDUPE_ALGO_HASH_CODE,
@@ -1736,6 +1755,7 @@ def saml2_attrib_map_format(dict):
"Cobalt.io API": DEDUPE_ALGO_UNIQUE_ID_FROM_TOOL,
"Crunch42 Scan": DEDUPE_ALGO_UNIQUE_ID_FROM_TOOL,
"Dependency Track Finding Packaging Format (FPF) Export": DEDUPE_ALGO_HASH_CODE,
+ "Horusec Scan": DEDUPE_ALGO_HASH_CODE,
"Mobsfscan Scan": DEDUPE_ALGO_HASH_CODE,
"SonarQube Scan detailed": DEDUPE_ALGO_UNIQUE_ID_FROM_TOOL,
"SonarQube Scan": DEDUPE_ALGO_HASH_CODE,
@@ -1825,6 +1845,7 @@ def saml2_attrib_map_format(dict):
"HCLAppScan XML": DEDUPE_ALGO_HASH_CODE,
"KICS Scan": DEDUPE_ALGO_HASH_CODE,
"MobSF Scan": DEDUPE_ALGO_HASH_CODE,
+ "MobSF Scorecard Scan": DEDUPE_ALGO_HASH_CODE,
"OSV Scan": DEDUPE_ALGO_HASH_CODE,
"Nosey Parker Scan": DEDUPE_ALGO_UNIQUE_ID_FROM_TOOL_OR_HASH_CODE,
"Bearer CLI": DEDUPE_ALGO_HASH_CODE,
@@ -1834,16 +1855,23 @@ def saml2_attrib_map_format(dict):
"Kiuwan SCA Scan": DEDUPE_ALGO_HASH_CODE,
"Rapplex Scan": DEDUPE_ALGO_HASH_CODE,
"AppCheck Web Application Scanner": DEDUPE_ALGO_HASH_CODE,
+ "AWS Inspector2 Scan": DEDUPE_ALGO_UNIQUE_ID_FROM_TOOL_OR_HASH_CODE,
"Legitify Scan": DEDUPE_ALGO_HASH_CODE,
"ThreatComposer Scan": DEDUPE_ALGO_UNIQUE_ID_FROM_TOOL_OR_HASH_CODE,
"Invicti Scan": DEDUPE_ALGO_HASH_CODE,
"KrakenD Audit Scan": DEDUPE_ALGO_HASH_CODE,
+ "PTART Report": DEDUPE_ALGO_UNIQUE_ID_FROM_TOOL,
+ "Red Hat Satellite": DEDUPE_ALGO_HASH_CODE,
+ "Qualys Hacker Guardian Scan": DEDUPE_ALGO_HASH_CODE,
}
# Override the hardcoded settings here via the env var
if len(env("DD_DEDUPLICATION_ALGORITHM_PER_PARSER")) > 0:
env_dedup_algorithm_per_parser = json.loads(env("DD_DEDUPLICATION_ALGORITHM_PER_PARSER"))
for key, value in env_dedup_algorithm_per_parser.items():
+ if value not in DEDUPE_ALGOS:
+ msg = f"DEDUP algorithm '{value}' for '{key}' is not valid. Use one of following values: {', '.join(DEDUPE_ALGOS)}"
+ raise AttributeError(msg)
if key in DEDUPLICATION_ALGORITHM_PER_PARSER:
logger.info(f"Replacing {key} with value {value} (previously set to {DEDUPLICATION_ALGORITHM_PER_PARSER[key]}) from env var DD_DEDUPLICATION_ALGORITHM_PER_PARSER")
DEDUPLICATION_ALGORITHM_PER_PARSER[key] = value
@@ -2059,8 +2087,19 @@ def saml2_attrib_map_format(dict):
"ALSA": "https://osv.dev/vulnerability/", # e.g. https://osv.dev/vulnerability/ALSA-2024:0827
"USN": "https://ubuntu.com/security/notices/", # e.g. https://ubuntu.com/security/notices/USN-6642-1
"DLA": "https://security-tracker.debian.org/tracker/", # e.g. https://security-tracker.debian.org/tracker/DLA-3917-1
+ "DSA": "https://security-tracker.debian.org/tracker/", # e.g. https://security-tracker.debian.org/tracker/DSA-5791-1
+ "DTSA": "https://security-tracker.debian.org/tracker/", # e.g. https://security-tracker.debian.org/tracker/DTSA-41-1
+ "TEMP": "https://security-tracker.debian.org/tracker/", # e.g. https://security-tracker.debian.org/tracker/TEMP-0841856-B18BAF
"ELSA": "https://linux.oracle.com/errata/&&.html", # e.g. https://linux.oracle.com/errata/ELSA-2024-12714.html
+ "ELBA": "https://linux.oracle.com/errata/&&.html", # e.g. https://linux.oracle.com/errata/ELBA-2024-7457.html
"RXSA": "https://errata.rockylinux.org/", # e.g. https://errata.rockylinux.org/RXSA-2024:4928
+ "C-": "https://hub.armosec.io/docs/", # e.g. https://hub.armosec.io/docs/c-0085
+ "AVD": "https://avd.aquasec.com/misconfig/", # e.g. https://avd.aquasec.com/misconfig/avd-ksv-01010
+ "KHV": "https://avd.aquasec.com/misconfig/kubernetes/", # e.g. https://avd.aquasec.com/misconfig/kubernetes/khv045
+ "CAPEC": "https://capec.mitre.org/data/definitions/&&.html", # e.g. https://capec.mitre.org/data/definitions/157.html
+ "CWE": "https://cwe.mitre.org/data/definitions/&&.html", # e.g. https://cwe.mitre.org/data/definitions/79.html
+ "RLSA": "https://errata.rockylinux.org/", # e.g. https://errata.rockylinux.org/RLSA-2024:7001
+ "RLBA": "https://errata.rockylinux.org/", # e.g. https://errata.rockylinux.org/RLBA-2024:6968
}
# List of acceptable file types that can be uploaded to a given object via arbitrary file upload
FILE_UPLOAD_TYPES = env("DD_FILE_UPLOAD_TYPES")
@@ -2150,6 +2189,11 @@ def saml2_attrib_map_format(dict):
# ------------------------------------------------------------------------------
NOTIFICATIONS_SYSTEM_LEVEL_TRUMP = env("DD_NOTIFICATIONS_SYSTEM_LEVEL_TRUMP")
+# ------------------------------------------------------------------------------
+# Timeouts
+# ------------------------------------------------------------------------------
+REQUESTS_TIMEOUT = env("DD_REQUESTS_TIMEOUT")
+
# ------------------------------------------------------------------------------
# Ignored Warnings
# ------------------------------------------------------------------------------
diff --git a/dojo/settings/settings.py b/dojo/settings/settings.py
index 1b48e0e3f73..9a961ca8029 100755
--- a/dojo/settings/settings.py
+++ b/dojo/settings/settings.py
@@ -1,4 +1,5 @@
-from split_settings.tools import optional, include
+
+from split_settings.tools import include, optional
# See https://documentation.defectdojo.com/getting_started/configuration/ for options
# how to tune the configuration to your needs.
@@ -6,4 +7,4 @@
include(
"settings.dist.py",
optional("local_settings.py"),
-)
\ No newline at end of file
+)
diff --git a/dojo/settings/unittest.py b/dojo/settings/unittests.py
similarity index 100%
rename from dojo/settings/unittest.py
rename to dojo/settings/unittests.py
diff --git a/dojo/static/dojo/js/metrics.js b/dojo/static/dojo/js/metrics.js
index 2fd518aa3a1..140c46c1b21 100755
--- a/dojo/static/dojo/js/metrics.js
+++ b/dojo/static/dojo/js/metrics.js
@@ -57,7 +57,8 @@ function homepage_pie_chart(critical, high, medium, low, info) {
function homepage_severity_plot(critical, high, medium, low) {
var options = {
xaxes: [{
- mode: 'time'
+ mode: 'time',
+ minTickSize: [1, "month"]
}],
yaxes: [{
min: 0
diff --git a/dojo/system_settings/views.py b/dojo/system_settings/views.py
index 4c952d57a0f..584fa547d32 100755
--- a/dojo/system_settings/views.py
+++ b/dojo/system_settings/views.py
@@ -1,5 +1,4 @@
import logging
-from typing import Tuple
from django.conf import settings
from django.contrib import messages
@@ -59,7 +58,7 @@ def validate_form(
self,
request: HttpRequest,
context: dict,
- ) -> Tuple[HttpRequest, bool]:
+ ) -> tuple[HttpRequest, bool]:
if context["form"].is_valid():
if (context["form"].cleaned_data["default_group"] is None and context["form"].cleaned_data["default_group_role"] is not None) or \
(context["form"].cleaned_data["default_group"] is not None and context["form"].cleaned_data["default_group_role"] is None):
diff --git a/dojo/templates/dojo/endpoints.html b/dojo/templates/dojo/endpoints.html
index 945a91cce23..37314bc3c3e 100755
--- a/dojo/templates/dojo/endpoints.html
+++ b/dojo/templates/dojo/endpoints.html
@@ -109,7 +109,7 @@
{% endif %}
{% include "dojo/snippets/tags.html" with tags=e.tags.all %}
- {% if not product_tab %}
+ {% if not product_tab and e.product %}
+ {{ else -}}
+
+{{ end -}}
+
+
+{{ if site.Params.doks.flexSearch -}}
+{{ partial "header/search-modal" . }}
+{{ end -}}
diff --git a/docs/netlify.toml b/docs/netlify.toml
new file mode 100644
index 00000000000..fca7810dde5
--- /dev/null
+++ b/docs/netlify.toml
@@ -0,0 +1,49 @@
+[build]
+ publish = "public"
+ functions = "functions"
+
+[build.environment]
+ NODE_VERSION = "20.11.0"
+ NPM_VERSION = "10.2.4"
+ HUGO_VERSION = "0.125.1"
+
+[context.production]
+ command = "npm run build"
+
+[context.deploy-preview]
+ command = "npm run build"
+
+[context.branch-deploy]
+ command = "npm run build"
+
+[context.next]
+ command = "npm run build"
+
+[context.next.environment]
+ HUGO_ENV = "next"
+
+[dev]
+ framework = "#custom"
+ command = "npm run dev"
+ targetPort = 1313
+ port = 8888
+ publish = "public"
+ autoLaunch = false
+
+# Redirects and rewrites — https://docs.netlify.com/routing/redirects/#syntax-for-the-netlify-configuration-file
+
+# Custom headers — https://docs.netlify.com/routing/headers/#syntax-for-the-netlify-configuration-file
+[[headers]]
+ for = "/*"
+ [headers.values]
+ Strict-Transport-Security = "max-age=31536000; includeSubDomains; preload"
+ X-Content-Type-Options = "nosniff"
+ X-XSS-Protection = "1; mode=block"
+ Content-Security-Policy = "default-src 'self'; manifest-src 'self'; connect-src 'self'; font-src 'self'; img-src 'self' https://avatars.githubusercontent.com data:; script-src 'self' 'nonce-dXNlcj0iaGVsbG8iLGRvbWFpbj0iaGVua3ZlcmxpbmRlLmNvbSIsZG9jdW1lbnQud3JpdGUodXNlcisiQCIrZG9tYWluKTs=' 'sha256-aWZ3y/RxbBYKHXH0z8+8ljrHG1mSBvyzSfxSMjBSaXk='; style-src 'self'"
+ X-Frame-Options = "SAMEORIGIN"
+ Referrer-Policy = "strict-origin"
+ Permissions-Policy = "geolocation=(self), microphone=(), camera=()"
+ Cache-Control= '''
+ public,
+ max-age=31536000'''
+ Access-Control-Allow-Origin = "*"
diff --git a/docs/package-lock.json b/docs/package-lock.json
index 93d84625c28..254062bd28d 100755
--- a/docs/package-lock.json
+++ b/docs/package-lock.json
@@ -1,1614 +1,4890 @@
{
- "name": "docs",
- "lockfileVersion": 2,
+ "name": "doks",
+ "version": "0.0.0",
+ "lockfileVersion": 3,
"requires": true,
"packages": {
"": {
+ "name": "doks",
+ "version": "0.0.0",
+ "license": "MIT",
+ "dependencies": {
+ "@tabler/icons": "^3.12.0",
+ "@thulite/doks-core": "^1.8.0",
+ "@thulite/images": "^3.3.0",
+ "@thulite/inline-svg": "^1.1.0",
+ "@thulite/seo": "^2.4.1",
+ "thulite": "^2.5.0"
+ },
"devDependencies": {
- "autoprefixer": "10.4.20",
- "postcss": "8.4.47",
- "postcss-cli": "11.0.0"
+ "prettier": "^3.3.3",
+ "vite": "^6.0.0"
+ },
+ "engines": {
+ "node": ">=20.11.0"
}
},
- "node_modules/@nodelib/fs.scandir": {
- "version": "2.1.5",
- "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
- "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
- "dev": true,
+ "node_modules/@ampproject/remapping": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
+ "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
+ "license": "Apache-2.0",
"dependencies": {
- "@nodelib/fs.stat": "2.0.5",
- "run-parallel": "^1.1.9"
+ "@jridgewell/gen-mapping": "^0.3.5",
+ "@jridgewell/trace-mapping": "^0.3.24"
},
"engines": {
- "node": ">= 8"
+ "node": ">=6.0.0"
}
},
- "node_modules/@nodelib/fs.stat": {
- "version": "2.0.5",
- "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
- "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
- "dev": true,
+ "node_modules/@babel/cli": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/cli/-/cli-7.25.9.tgz",
+ "integrity": "sha512-I+02IfrTiSanpxJBlZQYb18qCxB6c2Ih371cVpfgIrPQrjAYkf45XxomTJOG8JBWX5GY35/+TmhCMdJ4ZPkL8Q==",
+ "license": "MIT",
+ "dependencies": {
+ "@jridgewell/trace-mapping": "^0.3.25",
+ "commander": "^6.2.0",
+ "convert-source-map": "^2.0.0",
+ "fs-readdir-recursive": "^1.1.0",
+ "glob": "^7.2.0",
+ "make-dir": "^2.1.0",
+ "slash": "^2.0.0"
+ },
+ "bin": {
+ "babel": "bin/babel.js",
+ "babel-external-helpers": "bin/babel-external-helpers.js"
+ },
"engines": {
- "node": ">= 8"
+ "node": ">=6.9.0"
+ },
+ "optionalDependencies": {
+ "@nicolo-ribaudo/chokidar-2": "2.1.8-no-fsevents.3",
+ "chokidar": "^3.6.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
}
},
- "node_modules/@nodelib/fs.walk": {
- "version": "1.2.8",
- "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
- "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
- "dev": true,
+ "node_modules/@babel/code-frame": {
+ "version": "7.26.2",
+ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz",
+ "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==",
+ "license": "MIT",
"dependencies": {
- "@nodelib/fs.scandir": "2.1.5",
- "fastq": "^1.6.0"
+ "@babel/helper-validator-identifier": "^7.25.9",
+ "js-tokens": "^4.0.0",
+ "picocolors": "^1.0.0"
},
"engines": {
- "node": ">= 8"
+ "node": ">=6.9.0"
}
},
- "node_modules/@sindresorhus/merge-streams": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-1.0.0.tgz",
- "integrity": "sha512-rUV5WyJrJLoloD4NDN1V1+LDMDWOa4OTsT4yYJwQNpTU6FWxkxHpL7eu4w+DmiH8x/EAM1otkPE1+LaspIbplw==",
- "dev": true,
+ "node_modules/@babel/compat-data": {
+ "version": "7.26.2",
+ "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.2.tgz",
+ "integrity": "sha512-Z0WgzSEa+aUcdiJuCIqgujCshpMWgUpgOxXotrYPSA53hA3qopNaqcJpyr0hVb1FeWdnqFA35/fUtXgBK8srQg==",
+ "license": "MIT",
"engines": {
- "node": ">=18"
+ "node": ">=6.9.0"
+ }
+ },
+ "node_modules/@babel/core": {
+ "version": "7.26.0",
+ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.0.tgz",
+ "integrity": "sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==",
+ "license": "MIT",
+ "dependencies": {
+ "@ampproject/remapping": "^2.2.0",
+ "@babel/code-frame": "^7.26.0",
+ "@babel/generator": "^7.26.0",
+ "@babel/helper-compilation-targets": "^7.25.9",
+ "@babel/helper-module-transforms": "^7.26.0",
+ "@babel/helpers": "^7.26.0",
+ "@babel/parser": "^7.26.0",
+ "@babel/template": "^7.25.9",
+ "@babel/traverse": "^7.25.9",
+ "@babel/types": "^7.26.0",
+ "convert-source-map": "^2.0.0",
+ "debug": "^4.1.0",
+ "gensync": "^1.0.0-beta.2",
+ "json5": "^2.2.3",
+ "semver": "^6.3.1"
+ },
+ "engines": {
+ "node": ">=6.9.0"
},
"funding": {
- "url": "https://github.com/sponsors/sindresorhus"
+ "type": "opencollective",
+ "url": "https://opencollective.com/babel"
}
},
- "node_modules/ansi-regex": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
- "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
- "dev": true,
+ "node_modules/@babel/generator": {
+ "version": "7.26.2",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.2.tgz",
+ "integrity": "sha512-zevQbhbau95nkoxSq3f/DC/SC+EEOUZd3DYqfSkMhY2/wfSeaHV1Ew4vk8e+x8lja31IbyuUa2uQ3JONqKbysw==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/parser": "^7.26.2",
+ "@babel/types": "^7.26.0",
+ "@jridgewell/gen-mapping": "^0.3.5",
+ "@jridgewell/trace-mapping": "^0.3.25",
+ "jsesc": "^3.0.2"
+ },
"engines": {
- "node": ">=8"
+ "node": ">=6.9.0"
}
},
- "node_modules/ansi-styles": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
- "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
- "dev": true,
+ "node_modules/@babel/helper-annotate-as-pure": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz",
+ "integrity": "sha512-gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==",
+ "license": "MIT",
"dependencies": {
- "color-convert": "^2.0.1"
+ "@babel/types": "^7.25.9"
},
"engines": {
- "node": ">=8"
+ "node": ">=6.9.0"
+ }
+ },
+ "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.25.9.tgz",
+ "integrity": "sha512-C47lC7LIDCnz0h4vai/tpNOI95tCd5ZT3iBt/DBH5lXKHZsyNQv18yf1wIIg2ntiQNgmAvA+DgZ82iW8Qdym8g==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/traverse": "^7.25.9",
+ "@babel/types": "^7.25.9"
},
- "funding": {
- "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+ "engines": {
+ "node": ">=6.9.0"
}
},
- "node_modules/anymatch": {
- "version": "3.1.2",
- "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
- "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
- "dev": true,
+ "node_modules/@babel/helper-compilation-targets": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.9.tgz",
+ "integrity": "sha512-j9Db8Suy6yV/VHa4qzrj9yZfZxhLWQdVnRlXxmKLYlhWUVB1sB2G5sxuWYXk/whHD9iW76PmNzxZ4UCnTQTVEQ==",
+ "license": "MIT",
"dependencies": {
- "normalize-path": "^3.0.0",
- "picomatch": "^2.0.4"
+ "@babel/compat-data": "^7.25.9",
+ "@babel/helper-validator-option": "^7.25.9",
+ "browserslist": "^4.24.0",
+ "lru-cache": "^5.1.1",
+ "semver": "^6.3.1"
},
"engines": {
- "node": ">= 8"
+ "node": ">=6.9.0"
}
},
- "node_modules/autoprefixer": {
- "version": "10.4.20",
- "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.20.tgz",
- "integrity": "sha512-XY25y5xSv/wEoqzDyXXME4AFfkZI0P23z6Fs3YgymDnKJkCGOnkL0iTxCa85UTqaSgfcqyf3UA6+c7wUvx/16g==",
- "dev": true,
- "funding": [
- {
- "type": "opencollective",
- "url": "https://opencollective.com/postcss/"
- },
- {
- "type": "tidelift",
- "url": "https://tidelift.com/funding/github/npm/autoprefixer"
- },
- {
- "type": "github",
- "url": "https://github.com/sponsors/ai"
- }
- ],
+ "node_modules/@babel/helper-create-class-features-plugin": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.25.9.tgz",
+ "integrity": "sha512-UTZQMvt0d/rSz6KI+qdu7GQze5TIajwTS++GUozlw8VBJDEOAqSXwm1WvmYEZwqdqSGQshRocPDqrt4HBZB3fQ==",
+ "license": "MIT",
"dependencies": {
- "browserslist": "^4.23.3",
- "caniuse-lite": "^1.0.30001646",
- "fraction.js": "^4.3.7",
- "normalize-range": "^0.1.2",
- "picocolors": "^1.0.1",
- "postcss-value-parser": "^4.2.0"
+ "@babel/helper-annotate-as-pure": "^7.25.9",
+ "@babel/helper-member-expression-to-functions": "^7.25.9",
+ "@babel/helper-optimise-call-expression": "^7.25.9",
+ "@babel/helper-replace-supers": "^7.25.9",
+ "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9",
+ "@babel/traverse": "^7.25.9",
+ "semver": "^6.3.1"
},
- "bin": {
- "autoprefixer": "bin/autoprefixer"
+ "engines": {
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0"
+ }
+ },
+ "node_modules/@babel/helper-create-regexp-features-plugin": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.25.9.tgz",
+ "integrity": "sha512-ORPNZ3h6ZRkOyAa/SaHU+XsLZr0UQzRwuDQ0cczIA17nAzZ+85G5cVkOJIj7QavLZGSe8QXUmNFxSZzjcZF9bw==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/helper-annotate-as-pure": "^7.25.9",
+ "regexpu-core": "^6.1.1",
+ "semver": "^6.3.1"
},
"engines": {
- "node": "^10 || ^12 || >=14"
+ "node": ">=6.9.0"
},
"peerDependencies": {
- "postcss": "^8.1.0"
+ "@babel/core": "^7.0.0"
}
},
- "node_modules/binary-extensions": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
- "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
- "dev": true,
+ "node_modules/@babel/helper-define-polyfill-provider": {
+ "version": "0.6.3",
+ "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.6.3.tgz",
+ "integrity": "sha512-HK7Bi+Hj6H+VTHA3ZvBis7V/6hu9QuTrnMXNybfUf2iiuU/N97I8VjB+KbhFF8Rld/Lx5MzoCwPCpPjfK+n8Cg==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/helper-compilation-targets": "^7.22.6",
+ "@babel/helper-plugin-utils": "^7.22.5",
+ "debug": "^4.1.1",
+ "lodash.debounce": "^4.0.8",
+ "resolve": "^1.14.2"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+ }
+ },
+ "node_modules/@babel/helper-member-expression-to-functions": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.25.9.tgz",
+ "integrity": "sha512-wbfdZ9w5vk0C0oyHqAJbc62+vet5prjj01jjJ8sKn3j9h3MQQlflEdXYvuqRWjHnM12coDEqiC1IRCi0U/EKwQ==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/traverse": "^7.25.9",
+ "@babel/types": "^7.25.9"
+ },
"engines": {
- "node": ">=8"
+ "node": ">=6.9.0"
}
},
- "node_modules/braces": {
- "version": "3.0.3",
- "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
- "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
- "dev": true,
+ "node_modules/@babel/helper-module-imports": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz",
+ "integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==",
+ "license": "MIT",
"dependencies": {
- "fill-range": "^7.1.1"
+ "@babel/traverse": "^7.25.9",
+ "@babel/types": "^7.25.9"
},
"engines": {
- "node": ">=8"
+ "node": ">=6.9.0"
}
},
- "node_modules/browserslist": {
- "version": "4.23.3",
- "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.3.tgz",
- "integrity": "sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==",
- "dev": true,
- "funding": [
- {
- "type": "opencollective",
- "url": "https://opencollective.com/browserslist"
- },
- {
- "type": "tidelift",
- "url": "https://tidelift.com/funding/github/npm/browserslist"
- },
- {
- "type": "github",
- "url": "https://github.com/sponsors/ai"
- }
- ],
+ "node_modules/@babel/helper-module-transforms": {
+ "version": "7.26.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz",
+ "integrity": "sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==",
+ "license": "MIT",
"dependencies": {
- "caniuse-lite": "^1.0.30001646",
- "electron-to-chromium": "^1.5.4",
- "node-releases": "^2.0.18",
- "update-browserslist-db": "^1.1.0"
+ "@babel/helper-module-imports": "^7.25.9",
+ "@babel/helper-validator-identifier": "^7.25.9",
+ "@babel/traverse": "^7.25.9"
},
- "bin": {
- "browserslist": "cli.js"
+ "engines": {
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0"
+ }
+ },
+ "node_modules/@babel/helper-optimise-call-expression": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.25.9.tgz",
+ "integrity": "sha512-FIpuNaz5ow8VyrYcnXQTDRGvV6tTjkNtCK/RYNDXGSLlUD6cBuQTSw43CShGxjvfBTfcUA/r6UhUCbtYqkhcuQ==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/types": "^7.25.9"
},
"engines": {
- "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+ "node": ">=6.9.0"
}
},
- "node_modules/caniuse-lite": {
- "version": "1.0.30001646",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001646.tgz",
- "integrity": "sha512-dRg00gudiBDDTmUhClSdv3hqRfpbOnU28IpI1T6PBTLWa+kOj0681C8uML3PifYfREuBrVjDGhL3adYpBT6spw==",
- "dev": true,
- "funding": [
- {
- "type": "opencollective",
- "url": "https://opencollective.com/browserslist"
- },
- {
- "type": "tidelift",
- "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
- },
- {
- "type": "github",
- "url": "https://github.com/sponsors/ai"
- }
- ]
+ "node_modules/@babel/helper-plugin-utils": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.9.tgz",
+ "integrity": "sha512-kSMlyUVdWe25rEsRGviIgOWnoT/nfABVWlqt9N19/dIPWViAOW2s9wznP5tURbs/IDuNk4gPy3YdYRgH3uxhBw==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=6.9.0"
+ }
},
- "node_modules/chokidar": {
- "version": "3.5.3",
- "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
- "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
- "dev": true,
- "funding": [
- {
- "type": "individual",
- "url": "https://paulmillr.com/funding/"
- }
- ],
+ "node_modules/@babel/helper-remap-async-to-generator": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.25.9.tgz",
+ "integrity": "sha512-IZtukuUeBbhgOcaW2s06OXTzVNJR0ybm4W5xC1opWFFJMZbwRj5LCk+ByYH7WdZPZTt8KnFwA8pvjN2yqcPlgw==",
+ "license": "MIT",
"dependencies": {
- "anymatch": "~3.1.2",
- "braces": "~3.0.2",
- "glob-parent": "~5.1.2",
- "is-binary-path": "~2.1.0",
- "is-glob": "~4.0.1",
- "normalize-path": "~3.0.0",
- "readdirp": "~3.6.0"
+ "@babel/helper-annotate-as-pure": "^7.25.9",
+ "@babel/helper-wrap-function": "^7.25.9",
+ "@babel/traverse": "^7.25.9"
},
"engines": {
- "node": ">= 8.10.0"
+ "node": ">=6.9.0"
},
- "optionalDependencies": {
- "fsevents": "~2.3.2"
+ "peerDependencies": {
+ "@babel/core": "^7.0.0"
}
},
- "node_modules/cliui": {
- "version": "7.0.4",
- "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
- "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
- "dev": true,
+ "node_modules/@babel/helper-replace-supers": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.25.9.tgz",
+ "integrity": "sha512-IiDqTOTBQy0sWyeXyGSC5TBJpGFXBkRynjBeXsvbhQFKj2viwJC76Epz35YLU1fpe/Am6Vppb7W7zM4fPQzLsQ==",
+ "license": "MIT",
"dependencies": {
- "string-width": "^4.2.0",
- "strip-ansi": "^6.0.0",
- "wrap-ansi": "^7.0.0"
+ "@babel/helper-member-expression-to-functions": "^7.25.9",
+ "@babel/helper-optimise-call-expression": "^7.25.9",
+ "@babel/traverse": "^7.25.9"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0"
}
},
- "node_modules/color-convert": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
- "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
- "dev": true,
+ "node_modules/@babel/helper-simple-access": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.25.9.tgz",
+ "integrity": "sha512-c6WHXuiaRsJTyHYLJV75t9IqsmTbItYfdj99PnzYGQZkYKvan5/2jKJ7gu31J3/BJ/A18grImSPModuyG/Eo0Q==",
+ "license": "MIT",
"dependencies": {
- "color-name": "~1.1.4"
+ "@babel/traverse": "^7.25.9",
+ "@babel/types": "^7.25.9"
},
"engines": {
- "node": ">=7.0.0"
+ "node": ">=6.9.0"
}
},
- "node_modules/color-name": {
- "version": "1.1.4",
- "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
- "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
- "dev": true
- },
- "node_modules/dependency-graph": {
- "version": "0.11.0",
- "resolved": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.11.0.tgz",
- "integrity": "sha512-JeMq7fEshyepOWDfcfHK06N3MhyPhz++vtqWhMT5O9A3K42rdsEDpfdVqjaqaAhsw6a+ZqeDvQVtD0hFHQWrzg==",
- "dev": true,
+ "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.9.tgz",
+ "integrity": "sha512-K4Du3BFa3gvyhzgPcntrkDgZzQaq6uozzcpGbOO1OEJaI+EJdqWIMTLgFgQf6lrfiDFo5FU+BxKepI9RmZqahA==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/traverse": "^7.25.9",
+ "@babel/types": "^7.25.9"
+ },
"engines": {
- "node": ">= 0.6.0"
+ "node": ">=6.9.0"
}
},
- "node_modules/electron-to-chromium": {
- "version": "1.5.4",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.4.tgz",
- "integrity": "sha512-orzA81VqLyIGUEA77YkVA1D+N+nNfl2isJVjjmOyrlxuooZ19ynb+dOlaDTqd/idKRS9lDCSBmtzM+kyCsMnkA==",
- "dev": true
+ "node_modules/@babel/helper-string-parser": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
+ "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=6.9.0"
+ }
},
- "node_modules/emoji-regex": {
- "version": "8.0.0",
- "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
- "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
- "dev": true
+ "node_modules/@babel/helper-validator-identifier": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
+ "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=6.9.0"
+ }
},
- "node_modules/escalade": {
- "version": "3.1.2",
- "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
- "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
- "dev": true,
+ "node_modules/@babel/helper-validator-option": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz",
+ "integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==",
+ "license": "MIT",
"engines": {
- "node": ">=6"
+ "node": ">=6.9.0"
}
},
- "node_modules/fast-glob": {
- "version": "3.3.2",
- "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
- "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
- "dev": true,
+ "node_modules/@babel/helper-wrap-function": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.25.9.tgz",
+ "integrity": "sha512-ETzz9UTjQSTmw39GboatdymDq4XIQbR8ySgVrylRhPOFpsd+JrKHIuF0de7GCWmem+T4uC5z7EZguod7Wj4A4g==",
+ "license": "MIT",
"dependencies": {
- "@nodelib/fs.stat": "^2.0.2",
- "@nodelib/fs.walk": "^1.2.3",
- "glob-parent": "^5.1.2",
- "merge2": "^1.3.0",
- "micromatch": "^4.0.4"
+ "@babel/template": "^7.25.9",
+ "@babel/traverse": "^7.25.9",
+ "@babel/types": "^7.25.9"
},
"engines": {
- "node": ">=8.6.0"
+ "node": ">=6.9.0"
}
},
- "node_modules/fastq": {
- "version": "1.17.0",
- "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.0.tgz",
- "integrity": "sha512-zGygtijUMT7jnk3h26kUms3BkSDp4IfIKjmnqI2tvx6nuBfiF1UqOxbnLfzdv+apBy+53oaImsKtMw/xYbW+1w==",
- "dev": true,
+ "node_modules/@babel/helpers": {
+ "version": "7.26.0",
+ "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.0.tgz",
+ "integrity": "sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==",
+ "license": "MIT",
"dependencies": {
- "reusify": "^1.0.4"
+ "@babel/template": "^7.25.9",
+ "@babel/types": "^7.26.0"
+ },
+ "engines": {
+ "node": ">=6.9.0"
}
},
- "node_modules/fill-range": {
- "version": "7.1.1",
- "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
- "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
- "dev": true,
+ "node_modules/@babel/parser": {
+ "version": "7.26.2",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.2.tgz",
+ "integrity": "sha512-DWMCZH9WA4Maitz2q21SRKHo9QXZxkDsbNZoVD62gusNtNBBqDg9i7uOhASfTfIGNzW+O+r7+jAlM8dwphcJKQ==",
+ "license": "MIT",
"dependencies": {
- "to-regex-range": "^5.0.1"
+ "@babel/types": "^7.26.0"
+ },
+ "bin": {
+ "parser": "bin/babel-parser.js"
},
"engines": {
- "node": ">=8"
+ "node": ">=6.0.0"
}
},
- "node_modules/fraction.js": {
- "version": "4.3.7",
- "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz",
- "integrity": "sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==",
- "dev": true,
+ "node_modules/@babel/plugin-bugfix-firefox-class-in-computed-class-key": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.25.9.tgz",
+ "integrity": "sha512-ZkRyVkThtxQ/J6nv3JFYv1RYY+JT5BvU0y3k5bWrmuG4woXypRa4PXmm9RhOwodRkYFWqC0C0cqcJ4OqR7kW+g==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/helper-plugin-utils": "^7.25.9",
+ "@babel/traverse": "^7.25.9"
+ },
"engines": {
- "node": "*"
+ "node": ">=6.9.0"
},
- "funding": {
- "type": "patreon",
- "url": "https://github.com/sponsors/rawify"
+ "peerDependencies": {
+ "@babel/core": "^7.0.0"
}
},
- "node_modules/fs-extra": {
- "version": "11.0.0",
- "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.0.0.tgz",
- "integrity": "sha512-4YxRvMi4P5C3WQTvdRfrv5UVqbISpqjORFQAW5QPiKAauaxNCwrEdIi6pG3tDFhKKpMen+enEhHIzB/tvIO+/w==",
- "dev": true,
+ "node_modules/@babel/plugin-bugfix-safari-class-field-initializer-scope": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-class-field-initializer-scope/-/plugin-bugfix-safari-class-field-initializer-scope-7.25.9.tgz",
+ "integrity": "sha512-MrGRLZxLD/Zjj0gdU15dfs+HH/OXvnw/U4jJD8vpcP2CJQapPEv1IWwjc/qMg7ItBlPwSv1hRBbb7LeuANdcnw==",
+ "license": "MIT",
"dependencies": {
- "graceful-fs": "^4.2.0",
- "jsonfile": "^6.0.1",
- "universalify": "^2.0.0"
+ "@babel/helper-plugin-utils": "^7.25.9"
},
"engines": {
- "node": ">=14.14"
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0"
}
},
- "node_modules/fsevents": {
- "version": "2.3.2",
- "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
- "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
- "dev": true,
- "hasInstallScript": true,
- "optional": true,
- "os": [
- "darwin"
- ],
+ "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.25.9.tgz",
+ "integrity": "sha512-2qUwwfAFpJLZqxd02YW9btUCZHl+RFvdDkNfZwaIJrvB8Tesjsk8pEQkTvGwZXLqXUx/2oyY3ySRhm6HOXuCug==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/helper-plugin-utils": "^7.25.9"
+ },
"engines": {
- "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0"
}
},
- "node_modules/get-caller-file": {
- "version": "2.0.5",
- "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
- "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
- "dev": true,
+ "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.25.9.tgz",
+ "integrity": "sha512-6xWgLZTJXwilVjlnV7ospI3xi+sl8lN8rXXbBD6vYn3UYDlGsag8wrZkKcSI8G6KgqKP7vNFaDgeDnfAABq61g==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/helper-plugin-utils": "^7.25.9",
+ "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9",
+ "@babel/plugin-transform-optional-chaining": "^7.25.9"
+ },
"engines": {
- "node": "6.* || 8.* || >= 10.*"
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.13.0"
}
},
- "node_modules/get-stdin": {
- "version": "9.0.0",
- "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-9.0.0.tgz",
- "integrity": "sha512-dVKBjfWisLAicarI2Sf+JuBE/DghV4UzNAVe9yhEJuzeREd3JhOTE9cUaJTeSa77fsbQUK3pcOpJfM59+VKZaA==",
- "dev": true,
+ "node_modules/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly/-/plugin-bugfix-v8-static-class-fields-redefine-readonly-7.25.9.tgz",
+ "integrity": "sha512-aLnMXYPnzwwqhYSCyXfKkIkYgJ8zv9RK+roo9DkTXz38ynIhd9XCbN08s3MGvqL2MYGVUGdRQLL/JqBIeJhJBg==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/helper-plugin-utils": "^7.25.9",
+ "@babel/traverse": "^7.25.9"
+ },
"engines": {
- "node": ">=12"
+ "node": ">=6.9.0"
},
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
+ "peerDependencies": {
+ "@babel/core": "^7.0.0"
}
},
- "node_modules/glob-parent": {
- "version": "5.1.2",
- "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
- "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
- "dev": true,
+ "node_modules/@babel/plugin-proposal-private-property-in-object": {
+ "version": "7.21.0-placeholder-for-preset-env.2",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz",
+ "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
+ }
+ },
+ "node_modules/@babel/plugin-syntax-import-assertions": {
+ "version": "7.26.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.26.0.tgz",
+ "integrity": "sha512-QCWT5Hh830hK5EQa7XzuqIkQU9tT/whqbDz7kuaZMHFl1inRRg7JnuAEOQ0Ur0QUl0NufCk1msK2BeY79Aj/eg==",
+ "license": "MIT",
"dependencies": {
- "is-glob": "^4.0.1"
+ "@babel/helper-plugin-utils": "^7.25.9"
},
"engines": {
- "node": ">= 6"
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
}
},
- "node_modules/globby": {
- "version": "14.0.0",
- "resolved": "https://registry.npmjs.org/globby/-/globby-14.0.0.tgz",
- "integrity": "sha512-/1WM/LNHRAOH9lZta77uGbq0dAEQM+XjNesWwhlERDVenqothRbnzTrL3/LrIoEPPjeUHC3vrS6TwoyxeHs7MQ==",
- "dev": true,
+ "node_modules/@babel/plugin-syntax-import-attributes": {
+ "version": "7.26.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.26.0.tgz",
+ "integrity": "sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A==",
+ "license": "MIT",
"dependencies": {
- "@sindresorhus/merge-streams": "^1.0.0",
- "fast-glob": "^3.3.2",
- "ignore": "^5.2.4",
- "path-type": "^5.0.0",
- "slash": "^5.1.0",
- "unicorn-magic": "^0.1.0"
+ "@babel/helper-plugin-utils": "^7.25.9"
},
"engines": {
- "node": ">=18"
+ "node": ">=6.9.0"
},
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
}
},
- "node_modules/graceful-fs": {
- "version": "4.2.10",
- "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
- "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
- "dev": true
- },
- "node_modules/ignore": {
- "version": "5.3.0",
- "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.0.tgz",
- "integrity": "sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==",
- "dev": true,
+ "node_modules/@babel/plugin-syntax-unicode-sets-regex": {
+ "version": "7.18.6",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz",
+ "integrity": "sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/helper-create-regexp-features-plugin": "^7.18.6",
+ "@babel/helper-plugin-utils": "^7.18.6"
+ },
"engines": {
- "node": ">= 4"
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0"
}
},
- "node_modules/is-binary-path": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
- "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
- "dev": true,
+ "node_modules/@babel/plugin-transform-arrow-functions": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.25.9.tgz",
+ "integrity": "sha512-6jmooXYIwn9ca5/RylZADJ+EnSxVUS5sjeJ9UPk6RWRzXCmOJCy6dqItPJFpw2cuCangPK4OYr5uhGKcmrm5Qg==",
+ "license": "MIT",
"dependencies": {
- "binary-extensions": "^2.0.0"
+ "@babel/helper-plugin-utils": "^7.25.9"
},
"engines": {
- "node": ">=8"
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
}
},
- "node_modules/is-extglob": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
- "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
- "dev": true,
+ "node_modules/@babel/plugin-transform-async-generator-functions": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.25.9.tgz",
+ "integrity": "sha512-RXV6QAzTBbhDMO9fWwOmwwTuYaiPbggWQ9INdZqAYeSHyG7FzQ+nOZaUUjNwKv9pV3aE4WFqFm1Hnbci5tBCAw==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/helper-plugin-utils": "^7.25.9",
+ "@babel/helper-remap-async-to-generator": "^7.25.9",
+ "@babel/traverse": "^7.25.9"
+ },
"engines": {
- "node": ">=0.10.0"
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
}
},
- "node_modules/is-fullwidth-code-point": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
- "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
- "dev": true,
+ "node_modules/@babel/plugin-transform-async-to-generator": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.25.9.tgz",
+ "integrity": "sha512-NT7Ejn7Z/LjUH0Gv5KsBCxh7BH3fbLTV0ptHvpeMvrt3cPThHfJfst9Wrb7S8EvJ7vRTFI7z+VAvFVEQn/m5zQ==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/helper-module-imports": "^7.25.9",
+ "@babel/helper-plugin-utils": "^7.25.9",
+ "@babel/helper-remap-async-to-generator": "^7.25.9"
+ },
"engines": {
- "node": ">=8"
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
}
},
- "node_modules/is-glob": {
- "version": "4.0.3",
- "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
- "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
- "dev": true,
+ "node_modules/@babel/plugin-transform-block-scoped-functions": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.25.9.tgz",
+ "integrity": "sha512-toHc9fzab0ZfenFpsyYinOX0J/5dgJVA2fm64xPewu7CoYHWEivIWKxkK2rMi4r3yQqLnVmheMXRdG+k239CgA==",
+ "license": "MIT",
"dependencies": {
- "is-extglob": "^2.1.1"
+ "@babel/helper-plugin-utils": "^7.25.9"
},
"engines": {
- "node": ">=0.10.0"
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
}
},
- "node_modules/is-number": {
- "version": "7.0.0",
- "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
- "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
- "dev": true,
+ "node_modules/@babel/plugin-transform-block-scoping": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.25.9.tgz",
+ "integrity": "sha512-1F05O7AYjymAtqbsFETboN1NvBdcnzMerO+zlMyJBEz6WkMdejvGWw9p05iTSjC85RLlBseHHQpYaM4gzJkBGg==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/helper-plugin-utils": "^7.25.9"
+ },
"engines": {
- "node": ">=0.12.0"
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
}
},
- "node_modules/jsonfile": {
- "version": "6.1.0",
- "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
- "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
- "dev": true,
+ "node_modules/@babel/plugin-transform-class-properties": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.25.9.tgz",
+ "integrity": "sha512-bbMAII8GRSkcd0h0b4X+36GksxuheLFjP65ul9w6C3KgAamI3JqErNgSrosX6ZPj+Mpim5VvEbawXxJCyEUV3Q==",
+ "license": "MIT",
"dependencies": {
- "universalify": "^2.0.0"
+ "@babel/helper-create-class-features-plugin": "^7.25.9",
+ "@babel/helper-plugin-utils": "^7.25.9"
},
- "optionalDependencies": {
- "graceful-fs": "^4.1.6"
+ "engines": {
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
}
},
- "node_modules/lilconfig": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.0.0.tgz",
- "integrity": "sha512-K2U4W2Ff5ibV7j7ydLr+zLAkIg5JJ4lPn1Ltsdt+Tz/IjQ8buJ55pZAxoP34lqIiwtF9iAvtLv3JGv7CAyAg+g==",
- "dev": true,
+ "node_modules/@babel/plugin-transform-class-static-block": {
+ "version": "7.26.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.26.0.tgz",
+ "integrity": "sha512-6J2APTs7BDDm+UMqP1useWqhcRAXo0WIoVj26N7kPFB6S73Lgvyka4KTZYIxtgYXiN5HTyRObA72N2iu628iTQ==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/helper-create-class-features-plugin": "^7.25.9",
+ "@babel/helper-plugin-utils": "^7.25.9"
+ },
"engines": {
- "node": ">=14"
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.12.0"
}
},
- "node_modules/merge2": {
- "version": "1.4.1",
- "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
- "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
- "dev": true,
+ "node_modules/@babel/plugin-transform-classes": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.25.9.tgz",
+ "integrity": "sha512-mD8APIXmseE7oZvZgGABDyM34GUmK45Um2TXiBUt7PnuAxrgoSVf123qUzPxEr/+/BHrRn5NMZCdE2m/1F8DGg==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/helper-annotate-as-pure": "^7.25.9",
+ "@babel/helper-compilation-targets": "^7.25.9",
+ "@babel/helper-plugin-utils": "^7.25.9",
+ "@babel/helper-replace-supers": "^7.25.9",
+ "@babel/traverse": "^7.25.9",
+ "globals": "^11.1.0"
+ },
"engines": {
- "node": ">= 8"
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
}
},
- "node_modules/micromatch": {
- "version": "4.0.5",
- "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
- "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
- "dev": true,
+ "node_modules/@babel/plugin-transform-computed-properties": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.25.9.tgz",
+ "integrity": "sha512-HnBegGqXZR12xbcTHlJ9HGxw1OniltT26J5YpfruGqtUHlz/xKf/G2ak9e+t0rVqrjXa9WOhvYPz1ERfMj23AA==",
+ "license": "MIT",
"dependencies": {
- "braces": "^3.0.2",
- "picomatch": "^2.3.1"
+ "@babel/helper-plugin-utils": "^7.25.9",
+ "@babel/template": "^7.25.9"
},
"engines": {
- "node": ">=8.6"
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
}
},
- "node_modules/nanoid": {
- "version": "3.3.7",
- "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
- "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
- "dev": true,
- "funding": [
- {
- "type": "github",
- "url": "https://github.com/sponsors/ai"
- }
- ],
- "bin": {
- "nanoid": "bin/nanoid.cjs"
+ "node_modules/@babel/plugin-transform-destructuring": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.25.9.tgz",
+ "integrity": "sha512-WkCGb/3ZxXepmMiX101nnGiU+1CAdut8oHyEOHxkKuS1qKpU2SMXE2uSvfz8PBuLd49V6LEsbtyPhWC7fnkgvQ==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/helper-plugin-utils": "^7.25.9"
},
"engines": {
- "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
}
},
- "node_modules/node-releases": {
- "version": "2.0.18",
- "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz",
- "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==",
- "dev": true
+ "node_modules/@babel/plugin-transform-dotall-regex": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.25.9.tgz",
+ "integrity": "sha512-t7ZQ7g5trIgSRYhI9pIJtRl64KHotutUJsh4Eze5l7olJv+mRSg4/MmbZ0tv1eeqRbdvo/+trvJD/Oc5DmW2cA==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+ "@babel/helper-plugin-utils": "^7.25.9"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
+ }
},
- "node_modules/normalize-path": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
- "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
- "dev": true,
+ "node_modules/@babel/plugin-transform-duplicate-keys": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.25.9.tgz",
+ "integrity": "sha512-LZxhJ6dvBb/f3x8xwWIuyiAHy56nrRG3PeYTpBkkzkYRRQ6tJLu68lEF5VIqMUZiAV7a8+Tb78nEoMCMcqjXBw==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/helper-plugin-utils": "^7.25.9"
+ },
"engines": {
- "node": ">=0.10.0"
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
}
},
- "node_modules/normalize-range": {
- "version": "0.1.2",
- "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
- "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
- "dev": true,
+ "node_modules/@babel/plugin-transform-duplicate-named-capturing-groups-regex": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-named-capturing-groups-regex/-/plugin-transform-duplicate-named-capturing-groups-regex-7.25.9.tgz",
+ "integrity": "sha512-0UfuJS0EsXbRvKnwcLjFtJy/Sxc5J5jhLHnFhy7u4zih97Hz6tJkLU+O+FMMrNZrosUPxDi6sYxJ/EA8jDiAog==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+ "@babel/helper-plugin-utils": "^7.25.9"
+ },
"engines": {
- "node": ">=0.10.0"
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0"
}
},
- "node_modules/path-type": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/path-type/-/path-type-5.0.0.tgz",
- "integrity": "sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==",
- "dev": true,
+ "node_modules/@babel/plugin-transform-dynamic-import": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.25.9.tgz",
+ "integrity": "sha512-GCggjexbmSLaFhqsojeugBpeaRIgWNTcgKVq/0qIteFEqY2A+b9QidYadrWlnbWQUrW5fn+mCvf3tr7OeBFTyg==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/helper-plugin-utils": "^7.25.9"
+ },
"engines": {
- "node": ">=12"
+ "node": ">=6.9.0"
},
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
}
},
- "node_modules/picocolors": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz",
- "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==",
- "dev": true
+ "node_modules/@babel/plugin-transform-exponentiation-operator": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.25.9.tgz",
+ "integrity": "sha512-KRhdhlVk2nObA5AYa7QMgTMTVJdfHprfpAk4DjZVtllqRg9qarilstTKEhpVjyt+Npi8ThRyiV8176Am3CodPA==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/helper-builder-binary-assignment-operator-visitor": "^7.25.9",
+ "@babel/helper-plugin-utils": "^7.25.9"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
+ }
},
- "node_modules/picomatch": {
- "version": "2.3.1",
- "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
- "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
- "dev": true,
+ "node_modules/@babel/plugin-transform-export-namespace-from": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.25.9.tgz",
+ "integrity": "sha512-2NsEz+CxzJIVOPx2o9UsW1rXLqtChtLoVnwYHHiB04wS5sgn7mrV45fWMBX0Kk+ub9uXytVYfNP2HjbVbCB3Ww==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/helper-plugin-utils": "^7.25.9"
+ },
"engines": {
- "node": ">=8.6"
+ "node": ">=6.9.0"
},
- "funding": {
- "url": "https://github.com/sponsors/jonschlinkert"
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
}
},
- "node_modules/pify": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
- "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
- "dev": true,
+ "node_modules/@babel/plugin-transform-for-of": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.25.9.tgz",
+ "integrity": "sha512-LqHxduHoaGELJl2uhImHwRQudhCM50pT46rIBNvtT/Oql3nqiS3wOwP+5ten7NpYSXrrVLgtZU3DZmPtWZo16A==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/helper-plugin-utils": "^7.25.9",
+ "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
+ },
"engines": {
- "node": ">=0.10.0"
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
}
},
- "node_modules/postcss": {
- "version": "8.4.47",
- "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz",
- "integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==",
- "dev": true,
- "funding": [
- {
- "type": "opencollective",
- "url": "https://opencollective.com/postcss/"
- },
- {
- "type": "tidelift",
- "url": "https://tidelift.com/funding/github/npm/postcss"
- },
- {
- "type": "github",
- "url": "https://github.com/sponsors/ai"
- }
- ],
+ "node_modules/@babel/plugin-transform-function-name": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.25.9.tgz",
+ "integrity": "sha512-8lP+Yxjv14Vc5MuWBpJsoUCd3hD6V9DgBon2FVYL4jJgbnVQ9fTgYmonchzZJOVNgzEgbxp4OwAf6xz6M/14XA==",
+ "license": "MIT",
"dependencies": {
- "nanoid": "^3.3.7",
- "picocolors": "^1.1.0",
- "source-map-js": "^1.2.1"
+ "@babel/helper-compilation-targets": "^7.25.9",
+ "@babel/helper-plugin-utils": "^7.25.9",
+ "@babel/traverse": "^7.25.9"
},
"engines": {
- "node": "^10 || ^12 || >=14"
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
}
},
- "node_modules/postcss-cli": {
- "version": "11.0.0",
- "resolved": "https://registry.npmjs.org/postcss-cli/-/postcss-cli-11.0.0.tgz",
- "integrity": "sha512-xMITAI7M0u1yolVcXJ9XTZiO9aO49mcoKQy6pCDFdMh9kGqhzLVpWxeD/32M/QBmkhcGypZFFOLNLmIW4Pg4RA==",
- "dev": true,
+ "node_modules/@babel/plugin-transform-json-strings": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.25.9.tgz",
+ "integrity": "sha512-xoTMk0WXceiiIvsaquQQUaLLXSW1KJ159KP87VilruQm0LNNGxWzahxSS6T6i4Zg3ezp4vA4zuwiNUR53qmQAw==",
+ "license": "MIT",
"dependencies": {
- "chokidar": "^3.3.0",
- "dependency-graph": "^0.11.0",
- "fs-extra": "^11.0.0",
- "get-stdin": "^9.0.0",
- "globby": "^14.0.0",
- "picocolors": "^1.0.0",
- "postcss-load-config": "^5.0.0",
- "postcss-reporter": "^7.0.0",
- "pretty-hrtime": "^1.0.3",
- "read-cache": "^1.0.0",
- "slash": "^5.0.0",
- "yargs": "^17.0.0"
- },
- "bin": {
- "postcss": "index.js"
+ "@babel/helper-plugin-utils": "^7.25.9"
},
"engines": {
- "node": ">=18"
+ "node": ">=6.9.0"
},
"peerDependencies": {
- "postcss": "^8.0.0"
+ "@babel/core": "^7.0.0-0"
}
},
- "node_modules/postcss-load-config": {
- "version": "5.0.2",
- "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-5.0.2.tgz",
- "integrity": "sha512-Q8QR3FYbqOKa0bnC1UQ2bFq9/ulHX5Bi34muzitMr8aDtUelO5xKeJEYC/5smE0jNE9zdB/NBnOwXKexELbRlw==",
- "dev": true,
- "funding": [
- {
- "type": "opencollective",
- "url": "https://opencollective.com/postcss/"
- },
- {
- "type": "github",
- "url": "https://github.com/sponsors/ai"
- }
- ],
+ "node_modules/@babel/plugin-transform-literals": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.25.9.tgz",
+ "integrity": "sha512-9N7+2lFziW8W9pBl2TzaNht3+pgMIRP74zizeCSrtnSKVdUl8mAjjOP2OOVQAfZ881P2cNjDj1uAMEdeD50nuQ==",
+ "license": "MIT",
"dependencies": {
- "lilconfig": "^3.0.0",
- "yaml": "^2.3.4"
+ "@babel/helper-plugin-utils": "^7.25.9"
},
"engines": {
- "node": ">= 18"
+ "node": ">=6.9.0"
},
"peerDependencies": {
- "jiti": ">=1.21.0",
- "postcss": ">=8.0.9"
- },
- "peerDependenciesMeta": {
- "jiti": {
- "optional": true
- },
- "postcss": {
- "optional": true
- }
+ "@babel/core": "^7.0.0-0"
}
},
- "node_modules/postcss-reporter": {
- "version": "7.0.5",
- "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-7.0.5.tgz",
- "integrity": "sha512-glWg7VZBilooZGOFPhN9msJ3FQs19Hie7l5a/eE6WglzYqVeH3ong3ShFcp9kDWJT1g2Y/wd59cocf9XxBtkWA==",
- "dev": true,
+ "node_modules/@babel/plugin-transform-logical-assignment-operators": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.25.9.tgz",
+ "integrity": "sha512-wI4wRAzGko551Y8eVf6iOY9EouIDTtPb0ByZx+ktDGHwv6bHFimrgJM/2T021txPZ2s4c7bqvHbd+vXG6K948Q==",
+ "license": "MIT",
"dependencies": {
- "picocolors": "^1.0.0",
- "thenby": "^1.3.4"
+ "@babel/helper-plugin-utils": "^7.25.9"
},
"engines": {
- "node": ">=10"
- },
- "funding": {
- "type": "opencollective",
- "url": "https://opencollective.com/postcss/"
+ "node": ">=6.9.0"
},
"peerDependencies": {
- "postcss": "^8.1.0"
+ "@babel/core": "^7.0.0-0"
}
},
- "node_modules/postcss-value-parser": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
- "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
- "dev": true
- },
- "node_modules/pretty-hrtime": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
- "integrity": "sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==",
- "dev": true,
+ "node_modules/@babel/plugin-transform-member-expression-literals": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.25.9.tgz",
+ "integrity": "sha512-PYazBVfofCQkkMzh2P6IdIUaCEWni3iYEerAsRWuVd8+jlM1S9S9cz1dF9hIzyoZ8IA3+OwVYIp9v9e+GbgZhA==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/helper-plugin-utils": "^7.25.9"
+ },
"engines": {
- "node": ">= 0.8"
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
}
},
- "node_modules/queue-microtask": {
- "version": "1.2.3",
- "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
- "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
- "dev": true,
- "funding": [
- {
- "type": "github",
- "url": "https://github.com/sponsors/feross"
- },
- {
- "type": "patreon",
- "url": "https://www.patreon.com/feross"
- },
- {
- "type": "consulting",
- "url": "https://feross.org/support"
- }
- ]
+ "node_modules/@babel/plugin-transform-modules-amd": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.25.9.tgz",
+ "integrity": "sha512-g5T11tnI36jVClQlMlt4qKDLlWnG5pP9CSM4GhdRciTNMRgkfpo5cR6b4rGIOYPgRRuFAvwjPQ/Yk+ql4dyhbw==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/helper-module-transforms": "^7.25.9",
+ "@babel/helper-plugin-utils": "^7.25.9"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
+ }
},
- "node_modules/read-cache": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
- "integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==",
- "dev": true,
+ "node_modules/@babel/plugin-transform-modules-commonjs": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.25.9.tgz",
+ "integrity": "sha512-dwh2Ol1jWwL2MgkCzUSOvfmKElqQcuswAZypBSUsScMXvgdT8Ekq5YA6TtqpTVWH+4903NmboMuH1o9i8Rxlyg==",
+ "license": "MIT",
"dependencies": {
- "pify": "^2.3.0"
+ "@babel/helper-module-transforms": "^7.25.9",
+ "@babel/helper-plugin-utils": "^7.25.9",
+ "@babel/helper-simple-access": "^7.25.9"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
}
},
- "node_modules/readdirp": {
- "version": "3.6.0",
- "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
- "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
- "dev": true,
+ "node_modules/@babel/plugin-transform-modules-systemjs": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.25.9.tgz",
+ "integrity": "sha512-hyss7iIlH/zLHaehT+xwiymtPOpsiwIIRlCAOwBB04ta5Tt+lNItADdlXw3jAWZ96VJ2jlhl/c+PNIQPKNfvcA==",
+ "license": "MIT",
"dependencies": {
- "picomatch": "^2.2.1"
+ "@babel/helper-module-transforms": "^7.25.9",
+ "@babel/helper-plugin-utils": "^7.25.9",
+ "@babel/helper-validator-identifier": "^7.25.9",
+ "@babel/traverse": "^7.25.9"
},
"engines": {
- "node": ">=8.10.0"
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
}
},
- "node_modules/require-directory": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
- "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
- "dev": true,
+ "node_modules/@babel/plugin-transform-modules-umd": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.25.9.tgz",
+ "integrity": "sha512-bS9MVObUgE7ww36HEfwe6g9WakQ0KF07mQF74uuXdkoziUPfKyu/nIm663kz//e5O1nPInPFx36z7WJmJ4yNEw==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/helper-module-transforms": "^7.25.9",
+ "@babel/helper-plugin-utils": "^7.25.9"
+ },
"engines": {
- "node": ">=0.10.0"
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
}
},
- "node_modules/reusify": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
- "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
- "dev": true,
+ "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.25.9.tgz",
+ "integrity": "sha512-oqB6WHdKTGl3q/ItQhpLSnWWOpjUJLsOCLVyeFgeTktkBSCiurvPOsyt93gibI9CmuKvTUEtWmG5VhZD+5T/KA==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+ "@babel/helper-plugin-utils": "^7.25.9"
+ },
"engines": {
- "iojs": ">=1.0.0",
- "node": ">=0.10.0"
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0"
}
},
- "node_modules/run-parallel": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
- "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
- "dev": true,
- "funding": [
- {
- "type": "github",
- "url": "https://github.com/sponsors/feross"
- },
- {
- "type": "patreon",
- "url": "https://www.patreon.com/feross"
- },
- {
- "type": "consulting",
- "url": "https://feross.org/support"
- }
- ],
+ "node_modules/@babel/plugin-transform-new-target": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.25.9.tgz",
+ "integrity": "sha512-U/3p8X1yCSoKyUj2eOBIx3FOn6pElFOKvAAGf8HTtItuPyB+ZeOqfn+mvTtg9ZlOAjsPdK3ayQEjqHjU/yLeVQ==",
+ "license": "MIT",
"dependencies": {
- "queue-microtask": "^1.2.2"
+ "@babel/helper-plugin-utils": "^7.25.9"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
}
},
- "node_modules/slash": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz",
- "integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==",
- "dev": true,
+ "node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.25.9.tgz",
+ "integrity": "sha512-ENfftpLZw5EItALAD4WsY/KUWvhUlZndm5GC7G3evUsVeSJB6p0pBeLQUnRnBCBx7zV0RKQjR9kCuwrsIrjWog==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/helper-plugin-utils": "^7.25.9"
+ },
"engines": {
- "node": ">=14.16"
+ "node": ">=6.9.0"
},
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
}
},
- "node_modules/source-map-js": {
- "version": "1.2.1",
- "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
- "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
- "dev": true,
+ "node_modules/@babel/plugin-transform-numeric-separator": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.25.9.tgz",
+ "integrity": "sha512-TlprrJ1GBZ3r6s96Yq8gEQv82s8/5HnCVHtEJScUj90thHQbwe+E5MLhi2bbNHBEJuzrvltXSru+BUxHDoog7Q==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/helper-plugin-utils": "^7.25.9"
+ },
"engines": {
- "node": ">=0.10.0"
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
}
},
- "node_modules/string-width": {
- "version": "4.2.3",
- "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
- "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
- "dev": true,
+ "node_modules/@babel/plugin-transform-object-rest-spread": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.25.9.tgz",
+ "integrity": "sha512-fSaXafEE9CVHPweLYw4J0emp1t8zYTXyzN3UuG+lylqkvYd7RMrsOQ8TYx5RF231be0vqtFC6jnx3UmpJmKBYg==",
+ "license": "MIT",
"dependencies": {
- "emoji-regex": "^8.0.0",
- "is-fullwidth-code-point": "^3.0.0",
- "strip-ansi": "^6.0.1"
+ "@babel/helper-compilation-targets": "^7.25.9",
+ "@babel/helper-plugin-utils": "^7.25.9",
+ "@babel/plugin-transform-parameters": "^7.25.9"
},
"engines": {
- "node": ">=8"
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
}
},
- "node_modules/strip-ansi": {
- "version": "6.0.1",
- "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
- "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
- "dev": true,
+ "node_modules/@babel/plugin-transform-object-super": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.25.9.tgz",
+ "integrity": "sha512-Kj/Gh+Rw2RNLbCK1VAWj2U48yxxqL2x0k10nPtSdRa0O2xnHXalD0s+o1A6a0W43gJ00ANo38jxkQreckOzv5A==",
+ "license": "MIT",
"dependencies": {
- "ansi-regex": "^5.0.1"
+ "@babel/helper-plugin-utils": "^7.25.9",
+ "@babel/helper-replace-supers": "^7.25.9"
},
"engines": {
- "node": ">=8"
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
}
},
- "node_modules/thenby": {
- "version": "1.3.4",
- "resolved": "https://registry.npmjs.org/thenby/-/thenby-1.3.4.tgz",
- "integrity": "sha512-89Gi5raiWA3QZ4b2ePcEwswC3me9JIg+ToSgtE0JWeCynLnLxNr/f9G+xfo9K+Oj4AFdom8YNJjibIARTJmapQ==",
- "dev": true
+ "node_modules/@babel/plugin-transform-optional-catch-binding": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.25.9.tgz",
+ "integrity": "sha512-qM/6m6hQZzDcZF3onzIhZeDHDO43bkNNlOX0i8n3lR6zLbu0GN2d8qfM/IERJZYauhAHSLHy39NF0Ctdvcid7g==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/helper-plugin-utils": "^7.25.9"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
+ }
},
- "node_modules/to-regex-range": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
- "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
- "dev": true,
+ "node_modules/@babel/plugin-transform-optional-chaining": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.25.9.tgz",
+ "integrity": "sha512-6AvV0FsLULbpnXeBjrY4dmWF8F7gf8QnvTEoO/wX/5xm/xE1Xo8oPuD3MPS+KS9f9XBEAWN7X1aWr4z9HdOr7A==",
+ "license": "MIT",
"dependencies": {
- "is-number": "^7.0.0"
+ "@babel/helper-plugin-utils": "^7.25.9",
+ "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
},
"engines": {
- "node": ">=8.0"
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
}
},
- "node_modules/unicorn-magic": {
- "version": "0.1.0",
- "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.1.0.tgz",
- "integrity": "sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==",
- "dev": true,
+ "node_modules/@babel/plugin-transform-parameters": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.25.9.tgz",
+ "integrity": "sha512-wzz6MKwpnshBAiRmn4jR8LYz/g8Ksg0o80XmwZDlordjwEk9SxBzTWC7F5ef1jhbrbOW2DJ5J6ayRukrJmnr0g==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/helper-plugin-utils": "^7.25.9"
+ },
"engines": {
- "node": ">=18"
+ "node": ">=6.9.0"
},
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
}
},
- "node_modules/universalify": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
- "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
- "dev": true,
+ "node_modules/@babel/plugin-transform-private-methods": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.25.9.tgz",
+ "integrity": "sha512-D/JUozNpQLAPUVusvqMxyvjzllRaF8/nSrP1s2YGQT/W4LHK4xxsMcHjhOGTS01mp9Hda8nswb+FblLdJornQw==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/helper-create-class-features-plugin": "^7.25.9",
+ "@babel/helper-plugin-utils": "^7.25.9"
+ },
"engines": {
- "node": ">= 10.0.0"
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
}
},
- "node_modules/update-browserslist-db": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz",
- "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==",
- "dev": true,
- "funding": [
- {
- "type": "opencollective",
- "url": "https://opencollective.com/browserslist"
- },
- {
- "type": "tidelift",
- "url": "https://tidelift.com/funding/github/npm/browserslist"
- },
- {
- "type": "github",
- "url": "https://github.com/sponsors/ai"
- }
- ],
+ "node_modules/@babel/plugin-transform-private-property-in-object": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.25.9.tgz",
+ "integrity": "sha512-Evf3kcMqzXA3xfYJmZ9Pg1OvKdtqsDMSWBDzZOPLvHiTt36E75jLDQo5w1gtRU95Q4E5PDttrTf25Fw8d/uWLw==",
+ "license": "MIT",
"dependencies": {
- "escalade": "^3.1.2",
- "picocolors": "^1.0.1"
+ "@babel/helper-annotate-as-pure": "^7.25.9",
+ "@babel/helper-create-class-features-plugin": "^7.25.9",
+ "@babel/helper-plugin-utils": "^7.25.9"
},
- "bin": {
- "update-browserslist-db": "cli.js"
+ "engines": {
+ "node": ">=6.9.0"
},
"peerDependencies": {
- "browserslist": ">= 4.21.0"
+ "@babel/core": "^7.0.0-0"
}
},
- "node_modules/wrap-ansi": {
- "version": "7.0.0",
- "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
- "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
- "dev": true,
+ "node_modules/@babel/plugin-transform-property-literals": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.25.9.tgz",
+ "integrity": "sha512-IvIUeV5KrS/VPavfSM/Iu+RE6llrHrYIKY1yfCzyO/lMXHQ+p7uGhonmGVisv6tSBSVgWzMBohTcvkC9vQcQFA==",
+ "license": "MIT",
"dependencies": {
- "ansi-styles": "^4.0.0",
- "string-width": "^4.1.0",
- "strip-ansi": "^6.0.0"
+ "@babel/helper-plugin-utils": "^7.25.9"
},
"engines": {
- "node": ">=10"
+ "node": ">=6.9.0"
},
- "funding": {
- "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
}
},
- "node_modules/y18n": {
- "version": "5.0.8",
- "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
- "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
- "dev": true,
+ "node_modules/@babel/plugin-transform-regenerator": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.25.9.tgz",
+ "integrity": "sha512-vwDcDNsgMPDGP0nMqzahDWE5/MLcX8sv96+wfX7as7LoF/kr97Bo/7fI00lXY4wUXYfVmwIIyG80fGZ1uvt2qg==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/helper-plugin-utils": "^7.25.9",
+ "regenerator-transform": "^0.15.2"
+ },
"engines": {
- "node": ">=10"
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
}
},
- "node_modules/yaml": {
- "version": "2.3.4",
- "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.4.tgz",
- "integrity": "sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA==",
- "dev": true,
+ "node_modules/@babel/plugin-transform-regexp-modifiers": {
+ "version": "7.26.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regexp-modifiers/-/plugin-transform-regexp-modifiers-7.26.0.tgz",
+ "integrity": "sha512-vN6saax7lrA2yA/Pak3sCxuD6F5InBjn9IcrIKQPjpsLvuHYLVroTxjdlVRHjjBWxKOqIwpTXDkOssYT4BFdRw==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+ "@babel/helper-plugin-utils": "^7.25.9"
+ },
"engines": {
- "node": ">= 14"
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0"
}
},
- "node_modules/yargs": {
- "version": "17.5.1",
- "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz",
- "integrity": "sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==",
- "dev": true,
+ "node_modules/@babel/plugin-transform-reserved-words": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.25.9.tgz",
+ "integrity": "sha512-7DL7DKYjn5Su++4RXu8puKZm2XBPHyjWLUidaPEkCUBbE7IPcsrkRHggAOOKydH1dASWdcUBxrkOGNxUv5P3Jg==",
+ "license": "MIT",
"dependencies": {
- "cliui": "^7.0.2",
- "escalade": "^3.1.1",
- "get-caller-file": "^2.0.5",
- "require-directory": "^2.1.1",
- "string-width": "^4.2.3",
- "y18n": "^5.0.5",
- "yargs-parser": "^21.0.0"
+ "@babel/helper-plugin-utils": "^7.25.9"
},
"engines": {
- "node": ">=12"
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
}
},
- "node_modules/yargs-parser": {
- "version": "21.0.1",
- "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz",
- "integrity": "sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==",
- "dev": true,
+ "node_modules/@babel/plugin-transform-shorthand-properties": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.25.9.tgz",
+ "integrity": "sha512-MUv6t0FhO5qHnS/W8XCbHmiRWOphNufpE1IVxhK5kuN3Td9FT1x4rx4K42s3RYdMXCXpfWkGSbCSd0Z64xA7Ng==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/helper-plugin-utils": "^7.25.9"
+ },
"engines": {
- "node": ">=12"
- }
- }
- },
- "dependencies": {
- "@nodelib/fs.scandir": {
- "version": "2.1.5",
- "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
- "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
- "dev": true,
- "requires": {
- "@nodelib/fs.stat": "2.0.5",
- "run-parallel": "^1.1.9"
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
}
},
- "@nodelib/fs.stat": {
- "version": "2.0.5",
- "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
- "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
- "dev": true
- },
- "@nodelib/fs.walk": {
- "version": "1.2.8",
- "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
- "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
- "dev": true,
- "requires": {
- "@nodelib/fs.scandir": "2.1.5",
- "fastq": "^1.6.0"
+ "node_modules/@babel/plugin-transform-spread": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.25.9.tgz",
+ "integrity": "sha512-oNknIB0TbURU5pqJFVbOOFspVlrpVwo2H1+HUIsVDvp5VauGGDP1ZEvO8Nn5xyMEs3dakajOxlmkNW7kNgSm6A==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/helper-plugin-utils": "^7.25.9",
+ "@babel/helper-skip-transparent-expression-wrappers": "^7.25.9"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
}
},
- "@sindresorhus/merge-streams": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-1.0.0.tgz",
- "integrity": "sha512-rUV5WyJrJLoloD4NDN1V1+LDMDWOa4OTsT4yYJwQNpTU6FWxkxHpL7eu4w+DmiH8x/EAM1otkPE1+LaspIbplw==",
- "dev": true
- },
- "ansi-regex": {
- "version": "5.0.1",
- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
- "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
- "dev": true
- },
- "ansi-styles": {
- "version": "4.3.0",
- "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
- "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
- "dev": true,
- "requires": {
- "color-convert": "^2.0.1"
+ "node_modules/@babel/plugin-transform-sticky-regex": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.25.9.tgz",
+ "integrity": "sha512-WqBUSgeVwucYDP9U/xNRQam7xV8W5Zf+6Eo7T2SRVUFlhRiMNFdFz58u0KZmCVVqs2i7SHgpRnAhzRNmKfi2uA==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/helper-plugin-utils": "^7.25.9"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
}
},
- "anymatch": {
- "version": "3.1.2",
- "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.2.tgz",
- "integrity": "sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==",
- "dev": true,
- "requires": {
- "normalize-path": "^3.0.0",
- "picomatch": "^2.0.4"
+ "node_modules/@babel/plugin-transform-template-literals": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.25.9.tgz",
+ "integrity": "sha512-o97AE4syN71M/lxrCtQByzphAdlYluKPDBzDVzMmfCobUjjhAryZV0AIpRPrxN0eAkxXO6ZLEScmt+PNhj2OTw==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/helper-plugin-utils": "^7.25.9"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
}
},
- "autoprefixer": {
- "version": "10.4.20",
- "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.20.tgz",
- "integrity": "sha512-XY25y5xSv/wEoqzDyXXME4AFfkZI0P23z6Fs3YgymDnKJkCGOnkL0iTxCa85UTqaSgfcqyf3UA6+c7wUvx/16g==",
- "dev": true,
- "requires": {
- "browserslist": "^4.23.3",
- "caniuse-lite": "^1.0.30001646",
- "fraction.js": "^4.3.7",
- "normalize-range": "^0.1.2",
- "picocolors": "^1.0.1",
- "postcss-value-parser": "^4.2.0"
+ "node_modules/@babel/plugin-transform-typeof-symbol": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.25.9.tgz",
+ "integrity": "sha512-v61XqUMiueJROUv66BVIOi0Fv/CUuZuZMl5NkRoCVxLAnMexZ0A3kMe7vvZ0nulxMuMp0Mk6S5hNh48yki08ZA==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/helper-plugin-utils": "^7.25.9"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
}
},
- "binary-extensions": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
- "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
- "dev": true
- },
- "braces": {
- "version": "3.0.3",
- "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
- "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
- "dev": true,
- "requires": {
- "fill-range": "^7.1.1"
+ "node_modules/@babel/plugin-transform-unicode-escapes": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.25.9.tgz",
+ "integrity": "sha512-s5EDrE6bW97LtxOcGj1Khcx5AaXwiMmi4toFWRDP9/y0Woo6pXC+iyPu/KuhKtfSrNFd7jJB+/fkOtZy6aIC6Q==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/helper-plugin-utils": "^7.25.9"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
}
},
- "browserslist": {
- "version": "4.23.3",
- "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.3.tgz",
- "integrity": "sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==",
- "dev": true,
- "requires": {
- "caniuse-lite": "^1.0.30001646",
- "electron-to-chromium": "^1.5.4",
- "node-releases": "^2.0.18",
- "update-browserslist-db": "^1.1.0"
+ "node_modules/@babel/plugin-transform-unicode-property-regex": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.25.9.tgz",
+ "integrity": "sha512-Jt2d8Ga+QwRluxRQ307Vlxa6dMrYEMZCgGxoPR8V52rxPyldHu3hdlHspxaqYmE7oID5+kB+UKUB/eWS+DkkWg==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+ "@babel/helper-plugin-utils": "^7.25.9"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
}
},
- "caniuse-lite": {
- "version": "1.0.30001646",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001646.tgz",
- "integrity": "sha512-dRg00gudiBDDTmUhClSdv3hqRfpbOnU28IpI1T6PBTLWa+kOj0681C8uML3PifYfREuBrVjDGhL3adYpBT6spw==",
- "dev": true
- },
- "chokidar": {
- "version": "3.5.3",
- "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
- "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
- "dev": true,
- "requires": {
- "anymatch": "~3.1.2",
- "braces": "~3.0.2",
- "fsevents": "~2.3.2",
- "glob-parent": "~5.1.2",
- "is-binary-path": "~2.1.0",
- "is-glob": "~4.0.1",
- "normalize-path": "~3.0.0",
- "readdirp": "~3.6.0"
+ "node_modules/@babel/plugin-transform-unicode-regex": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.25.9.tgz",
+ "integrity": "sha512-yoxstj7Rg9dlNn9UQxzk4fcNivwv4nUYz7fYXBaKxvw/lnmPuOm/ikoELygbYq68Bls3D/D+NBPHiLwZdZZ4HA==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+ "@babel/helper-plugin-utils": "^7.25.9"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
}
},
- "cliui": {
- "version": "7.0.4",
- "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
- "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
- "dev": true,
- "requires": {
- "string-width": "^4.2.0",
- "strip-ansi": "^6.0.0",
- "wrap-ansi": "^7.0.0"
+ "node_modules/@babel/plugin-transform-unicode-sets-regex": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.25.9.tgz",
+ "integrity": "sha512-8BYqO3GeVNHtx69fdPshN3fnzUNLrWdHhk/icSwigksJGczKSizZ+Z6SBCxTs723Fr5VSNorTIK7a+R2tISvwQ==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/helper-create-regexp-features-plugin": "^7.25.9",
+ "@babel/helper-plugin-utils": "^7.25.9"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0"
}
},
- "color-convert": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
- "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
- "dev": true,
- "requires": {
- "color-name": "~1.1.4"
+ "node_modules/@babel/preset-env": {
+ "version": "7.26.0",
+ "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.26.0.tgz",
+ "integrity": "sha512-H84Fxq0CQJNdPFT2DrfnylZ3cf5K43rGfWK4LJGPpjKHiZlk0/RzwEus3PDDZZg+/Er7lCA03MVacueUuXdzfw==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/compat-data": "^7.26.0",
+ "@babel/helper-compilation-targets": "^7.25.9",
+ "@babel/helper-plugin-utils": "^7.25.9",
+ "@babel/helper-validator-option": "^7.25.9",
+ "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.25.9",
+ "@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.25.9",
+ "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.25.9",
+ "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.25.9",
+ "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "^7.25.9",
+ "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
+ "@babel/plugin-syntax-import-assertions": "^7.26.0",
+ "@babel/plugin-syntax-import-attributes": "^7.26.0",
+ "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
+ "@babel/plugin-transform-arrow-functions": "^7.25.9",
+ "@babel/plugin-transform-async-generator-functions": "^7.25.9",
+ "@babel/plugin-transform-async-to-generator": "^7.25.9",
+ "@babel/plugin-transform-block-scoped-functions": "^7.25.9",
+ "@babel/plugin-transform-block-scoping": "^7.25.9",
+ "@babel/plugin-transform-class-properties": "^7.25.9",
+ "@babel/plugin-transform-class-static-block": "^7.26.0",
+ "@babel/plugin-transform-classes": "^7.25.9",
+ "@babel/plugin-transform-computed-properties": "^7.25.9",
+ "@babel/plugin-transform-destructuring": "^7.25.9",
+ "@babel/plugin-transform-dotall-regex": "^7.25.9",
+ "@babel/plugin-transform-duplicate-keys": "^7.25.9",
+ "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.25.9",
+ "@babel/plugin-transform-dynamic-import": "^7.25.9",
+ "@babel/plugin-transform-exponentiation-operator": "^7.25.9",
+ "@babel/plugin-transform-export-namespace-from": "^7.25.9",
+ "@babel/plugin-transform-for-of": "^7.25.9",
+ "@babel/plugin-transform-function-name": "^7.25.9",
+ "@babel/plugin-transform-json-strings": "^7.25.9",
+ "@babel/plugin-transform-literals": "^7.25.9",
+ "@babel/plugin-transform-logical-assignment-operators": "^7.25.9",
+ "@babel/plugin-transform-member-expression-literals": "^7.25.9",
+ "@babel/plugin-transform-modules-amd": "^7.25.9",
+ "@babel/plugin-transform-modules-commonjs": "^7.25.9",
+ "@babel/plugin-transform-modules-systemjs": "^7.25.9",
+ "@babel/plugin-transform-modules-umd": "^7.25.9",
+ "@babel/plugin-transform-named-capturing-groups-regex": "^7.25.9",
+ "@babel/plugin-transform-new-target": "^7.25.9",
+ "@babel/plugin-transform-nullish-coalescing-operator": "^7.25.9",
+ "@babel/plugin-transform-numeric-separator": "^7.25.9",
+ "@babel/plugin-transform-object-rest-spread": "^7.25.9",
+ "@babel/plugin-transform-object-super": "^7.25.9",
+ "@babel/plugin-transform-optional-catch-binding": "^7.25.9",
+ "@babel/plugin-transform-optional-chaining": "^7.25.9",
+ "@babel/plugin-transform-parameters": "^7.25.9",
+ "@babel/plugin-transform-private-methods": "^7.25.9",
+ "@babel/plugin-transform-private-property-in-object": "^7.25.9",
+ "@babel/plugin-transform-property-literals": "^7.25.9",
+ "@babel/plugin-transform-regenerator": "^7.25.9",
+ "@babel/plugin-transform-regexp-modifiers": "^7.26.0",
+ "@babel/plugin-transform-reserved-words": "^7.25.9",
+ "@babel/plugin-transform-shorthand-properties": "^7.25.9",
+ "@babel/plugin-transform-spread": "^7.25.9",
+ "@babel/plugin-transform-sticky-regex": "^7.25.9",
+ "@babel/plugin-transform-template-literals": "^7.25.9",
+ "@babel/plugin-transform-typeof-symbol": "^7.25.9",
+ "@babel/plugin-transform-unicode-escapes": "^7.25.9",
+ "@babel/plugin-transform-unicode-property-regex": "^7.25.9",
+ "@babel/plugin-transform-unicode-regex": "^7.25.9",
+ "@babel/plugin-transform-unicode-sets-regex": "^7.25.9",
+ "@babel/preset-modules": "0.1.6-no-external-plugins",
+ "babel-plugin-polyfill-corejs2": "^0.4.10",
+ "babel-plugin-polyfill-corejs3": "^0.10.6",
+ "babel-plugin-polyfill-regenerator": "^0.6.1",
+ "core-js-compat": "^3.38.1",
+ "semver": "^6.3.1"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0"
}
},
- "color-name": {
- "version": "1.1.4",
- "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
- "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
- "dev": true
+ "node_modules/@babel/preset-modules": {
+ "version": "0.1.6-no-external-plugins",
+ "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz",
+ "integrity": "sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/helper-plugin-utils": "^7.0.0",
+ "@babel/types": "^7.4.4",
+ "esutils": "^2.0.2"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.0.0-0 || ^8.0.0-0 <8.0.0"
+ }
},
- "dependency-graph": {
- "version": "0.11.0",
- "resolved": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.11.0.tgz",
- "integrity": "sha512-JeMq7fEshyepOWDfcfHK06N3MhyPhz++vtqWhMT5O9A3K42rdsEDpfdVqjaqaAhsw6a+ZqeDvQVtD0hFHQWrzg==",
- "dev": true
+ "node_modules/@babel/runtime": {
+ "version": "7.26.0",
+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.0.tgz",
+ "integrity": "sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==",
+ "license": "MIT",
+ "dependencies": {
+ "regenerator-runtime": "^0.14.0"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ }
},
- "electron-to-chromium": {
- "version": "1.5.4",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.4.tgz",
- "integrity": "sha512-orzA81VqLyIGUEA77YkVA1D+N+nNfl2isJVjjmOyrlxuooZ19ynb+dOlaDTqd/idKRS9lDCSBmtzM+kyCsMnkA==",
- "dev": true
+ "node_modules/@babel/template": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz",
+ "integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/code-frame": "^7.25.9",
+ "@babel/parser": "^7.25.9",
+ "@babel/types": "^7.25.9"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ }
},
- "emoji-regex": {
- "version": "8.0.0",
- "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
- "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
- "dev": true
+ "node_modules/@babel/traverse": {
+ "version": "7.25.9",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.9.tgz",
+ "integrity": "sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/code-frame": "^7.25.9",
+ "@babel/generator": "^7.25.9",
+ "@babel/parser": "^7.25.9",
+ "@babel/template": "^7.25.9",
+ "@babel/types": "^7.25.9",
+ "debug": "^4.3.1",
+ "globals": "^11.1.0"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ }
},
- "escalade": {
- "version": "3.1.2",
- "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
- "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
- "dev": true
+ "node_modules/@babel/types": {
+ "version": "7.26.0",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.0.tgz",
+ "integrity": "sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/helper-string-parser": "^7.25.9",
+ "@babel/helper-validator-identifier": "^7.25.9"
+ },
+ "engines": {
+ "node": ">=6.9.0"
+ }
},
- "fast-glob": {
- "version": "3.3.2",
- "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
- "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
+ "node_modules/@esbuild/aix-ppc64": {
+ "version": "0.24.0",
+ "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.24.0.tgz",
+ "integrity": "sha512-WtKdFM7ls47zkKHFVzMz8opM7LkcsIp9amDUBIAWirg70RM71WRSjdILPsY5Uv1D42ZpUfaPILDlfactHgsRkw==",
+ "cpu": [
+ "ppc64"
+ ],
"dev": true,
- "requires": {
- "@nodelib/fs.stat": "^2.0.2",
- "@nodelib/fs.walk": "^1.2.3",
- "glob-parent": "^5.1.2",
- "merge2": "^1.3.0",
- "micromatch": "^4.0.4"
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "aix"
+ ],
+ "engines": {
+ "node": ">=18"
}
},
- "fastq": {
- "version": "1.17.0",
- "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.0.tgz",
- "integrity": "sha512-zGygtijUMT7jnk3h26kUms3BkSDp4IfIKjmnqI2tvx6nuBfiF1UqOxbnLfzdv+apBy+53oaImsKtMw/xYbW+1w==",
+ "node_modules/@esbuild/android-arm": {
+ "version": "0.24.0",
+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.24.0.tgz",
+ "integrity": "sha512-arAtTPo76fJ/ICkXWetLCc9EwEHKaeya4vMrReVlEIUCAUncH7M4bhMQ+M9Vf+FFOZJdTNMXNBrWwW+OXWpSew==",
+ "cpu": [
+ "arm"
+ ],
"dev": true,
- "requires": {
- "reusify": "^1.0.4"
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "android"
+ ],
+ "engines": {
+ "node": ">=18"
}
},
- "fill-range": {
- "version": "7.1.1",
- "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
- "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+ "node_modules/@esbuild/android-arm64": {
+ "version": "0.24.0",
+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.24.0.tgz",
+ "integrity": "sha512-Vsm497xFM7tTIPYK9bNTYJyF/lsP590Qc1WxJdlB6ljCbdZKU9SY8i7+Iin4kyhV/KV5J2rOKsBQbB77Ab7L/w==",
+ "cpu": [
+ "arm64"
+ ],
"dev": true,
- "requires": {
- "to-regex-range": "^5.0.1"
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "android"
+ ],
+ "engines": {
+ "node": ">=18"
}
},
- "fraction.js": {
- "version": "4.3.7",
- "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz",
- "integrity": "sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==",
- "dev": true
- },
- "fs-extra": {
- "version": "11.0.0",
- "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.0.0.tgz",
- "integrity": "sha512-4YxRvMi4P5C3WQTvdRfrv5UVqbISpqjORFQAW5QPiKAauaxNCwrEdIi6pG3tDFhKKpMen+enEhHIzB/tvIO+/w==",
+ "node_modules/@esbuild/android-x64": {
+ "version": "0.24.0",
+ "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.24.0.tgz",
+ "integrity": "sha512-t8GrvnFkiIY7pa7mMgJd7p8p8qqYIz1NYiAoKc75Zyv73L3DZW++oYMSHPRarcotTKuSs6m3hTOa5CKHaS02TQ==",
+ "cpu": [
+ "x64"
+ ],
"dev": true,
- "requires": {
- "graceful-fs": "^4.2.0",
- "jsonfile": "^6.0.1",
- "universalify": "^2.0.0"
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "android"
+ ],
+ "engines": {
+ "node": ">=18"
}
},
- "fsevents": {
- "version": "2.3.2",
- "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
- "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+ "node_modules/@esbuild/darwin-arm64": {
+ "version": "0.24.0",
+ "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.24.0.tgz",
+ "integrity": "sha512-CKyDpRbK1hXwv79soeTJNHb5EiG6ct3efd/FTPdzOWdbZZfGhpbcqIpiD0+vwmpu0wTIL97ZRPZu8vUt46nBSw==",
+ "cpu": [
+ "arm64"
+ ],
"dev": true,
- "optional": true
- },
- "get-caller-file": {
- "version": "2.0.5",
- "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
- "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
- "dev": true
- },
- "get-stdin": {
- "version": "9.0.0",
- "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-9.0.0.tgz",
- "integrity": "sha512-dVKBjfWisLAicarI2Sf+JuBE/DghV4UzNAVe9yhEJuzeREd3JhOTE9cUaJTeSa77fsbQUK3pcOpJfM59+VKZaA==",
- "dev": true
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "darwin"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
},
- "glob-parent": {
- "version": "5.1.2",
- "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
- "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+ "node_modules/@esbuild/darwin-x64": {
+ "version": "0.24.0",
+ "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.24.0.tgz",
+ "integrity": "sha512-rgtz6flkVkh58od4PwTRqxbKH9cOjaXCMZgWD905JOzjFKW+7EiUObfd/Kav+A6Gyud6WZk9w+xu6QLytdi2OA==",
+ "cpu": [
+ "x64"
+ ],
"dev": true,
- "requires": {
- "is-glob": "^4.0.1"
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "darwin"
+ ],
+ "engines": {
+ "node": ">=18"
}
},
- "globby": {
- "version": "14.0.0",
- "resolved": "https://registry.npmjs.org/globby/-/globby-14.0.0.tgz",
- "integrity": "sha512-/1WM/LNHRAOH9lZta77uGbq0dAEQM+XjNesWwhlERDVenqothRbnzTrL3/LrIoEPPjeUHC3vrS6TwoyxeHs7MQ==",
+ "node_modules/@esbuild/freebsd-arm64": {
+ "version": "0.24.0",
+ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.24.0.tgz",
+ "integrity": "sha512-6Mtdq5nHggwfDNLAHkPlyLBpE5L6hwsuXZX8XNmHno9JuL2+bg2BX5tRkwjyfn6sKbxZTq68suOjgWqCicvPXA==",
+ "cpu": [
+ "arm64"
+ ],
"dev": true,
- "requires": {
- "@sindresorhus/merge-streams": "^1.0.0",
- "fast-glob": "^3.3.2",
- "ignore": "^5.2.4",
- "path-type": "^5.0.0",
- "slash": "^5.1.0",
- "unicorn-magic": "^0.1.0"
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "freebsd"
+ ],
+ "engines": {
+ "node": ">=18"
}
},
- "graceful-fs": {
- "version": "4.2.10",
- "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
- "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
- "dev": true
- },
- "ignore": {
- "version": "5.3.0",
- "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.0.tgz",
- "integrity": "sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==",
- "dev": true
- },
- "is-binary-path": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
- "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+ "node_modules/@esbuild/freebsd-x64": {
+ "version": "0.24.0",
+ "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.24.0.tgz",
+ "integrity": "sha512-D3H+xh3/zphoX8ck4S2RxKR6gHlHDXXzOf6f/9dbFt/NRBDIE33+cVa49Kil4WUjxMGW0ZIYBYtaGCa2+OsQwQ==",
+ "cpu": [
+ "x64"
+ ],
"dev": true,
- "requires": {
- "binary-extensions": "^2.0.0"
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "freebsd"
+ ],
+ "engines": {
+ "node": ">=18"
}
},
- "is-extglob": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
- "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
- "dev": true
- },
- "is-fullwidth-code-point": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
- "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
- "dev": true
- },
- "is-glob": {
- "version": "4.0.3",
- "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
- "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+ "node_modules/@esbuild/linux-arm": {
+ "version": "0.24.0",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.24.0.tgz",
+ "integrity": "sha512-gJKIi2IjRo5G6Glxb8d3DzYXlxdEj2NlkixPsqePSZMhLudqPhtZ4BUrpIuTjJYXxvF9njql+vRjB2oaC9XpBw==",
+ "cpu": [
+ "arm"
+ ],
"dev": true,
- "requires": {
- "is-extglob": "^2.1.1"
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=18"
}
},
- "is-number": {
- "version": "7.0.0",
- "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
- "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
- "dev": true
- },
- "jsonfile": {
- "version": "6.1.0",
- "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
- "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+ "node_modules/@esbuild/linux-arm64": {
+ "version": "0.24.0",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.24.0.tgz",
+ "integrity": "sha512-TDijPXTOeE3eaMkRYpcy3LarIg13dS9wWHRdwYRnzlwlA370rNdZqbcp0WTyyV/k2zSxfko52+C7jU5F9Tfj1g==",
+ "cpu": [
+ "arm64"
+ ],
"dev": true,
- "requires": {
- "graceful-fs": "^4.1.6",
- "universalify": "^2.0.0"
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=18"
}
},
- "lilconfig": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.0.0.tgz",
- "integrity": "sha512-K2U4W2Ff5ibV7j7ydLr+zLAkIg5JJ4lPn1Ltsdt+Tz/IjQ8buJ55pZAxoP34lqIiwtF9iAvtLv3JGv7CAyAg+g==",
- "dev": true
- },
- "merge2": {
- "version": "1.4.1",
- "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
- "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
- "dev": true
+ "node_modules/@esbuild/linux-ia32": {
+ "version": "0.24.0",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.24.0.tgz",
+ "integrity": "sha512-K40ip1LAcA0byL05TbCQ4yJ4swvnbzHscRmUilrmP9Am7//0UjPreh4lpYzvThT2Quw66MhjG//20mrufm40mA==",
+ "cpu": [
+ "ia32"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
},
- "micromatch": {
- "version": "4.0.5",
- "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
- "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+ "node_modules/@esbuild/linux-loong64": {
+ "version": "0.24.0",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.24.0.tgz",
+ "integrity": "sha512-0mswrYP/9ai+CU0BzBfPMZ8RVm3RGAN/lmOMgW4aFUSOQBjA31UP8Mr6DDhWSuMwj7jaWOT0p0WoZ6jeHhrD7g==",
+ "cpu": [
+ "loong64"
+ ],
"dev": true,
- "requires": {
- "braces": "^3.0.2",
- "picomatch": "^2.3.1"
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=18"
}
},
- "nanoid": {
- "version": "3.3.7",
- "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
- "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
- "dev": true
+ "node_modules/@esbuild/linux-mips64el": {
+ "version": "0.24.0",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.24.0.tgz",
+ "integrity": "sha512-hIKvXm0/3w/5+RDtCJeXqMZGkI2s4oMUGj3/jM0QzhgIASWrGO5/RlzAzm5nNh/awHE0A19h/CvHQe6FaBNrRA==",
+ "cpu": [
+ "mips64el"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
},
- "node-releases": {
- "version": "2.0.18",
- "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz",
- "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==",
- "dev": true
+ "node_modules/@esbuild/linux-ppc64": {
+ "version": "0.24.0",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.24.0.tgz",
+ "integrity": "sha512-HcZh5BNq0aC52UoocJxaKORfFODWXZxtBaaZNuN3PUX3MoDsChsZqopzi5UupRhPHSEHotoiptqikjN/B77mYQ==",
+ "cpu": [
+ "ppc64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
},
- "normalize-path": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
- "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
- "dev": true
+ "node_modules/@esbuild/linux-riscv64": {
+ "version": "0.24.0",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.24.0.tgz",
+ "integrity": "sha512-bEh7dMn/h3QxeR2KTy1DUszQjUrIHPZKyO6aN1X4BCnhfYhuQqedHaa5MxSQA/06j3GpiIlFGSsy1c7Gf9padw==",
+ "cpu": [
+ "riscv64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
},
- "normalize-range": {
- "version": "0.1.2",
- "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
- "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
- "dev": true
+ "node_modules/@esbuild/linux-s390x": {
+ "version": "0.24.0",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.24.0.tgz",
+ "integrity": "sha512-ZcQ6+qRkw1UcZGPyrCiHHkmBaj9SiCD8Oqd556HldP+QlpUIe2Wgn3ehQGVoPOvZvtHm8HPx+bH20c9pvbkX3g==",
+ "cpu": [
+ "s390x"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
},
- "path-type": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/path-type/-/path-type-5.0.0.tgz",
- "integrity": "sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==",
- "dev": true
+ "node_modules/@esbuild/linux-x64": {
+ "version": "0.24.0",
+ "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.24.0.tgz",
+ "integrity": "sha512-vbutsFqQ+foy3wSSbmjBXXIJ6PL3scghJoM8zCL142cGaZKAdCZHyf+Bpu/MmX9zT9Q0zFBVKb36Ma5Fzfa8xA==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
},
- "picocolors": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.0.tgz",
- "integrity": "sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==",
- "dev": true
+ "node_modules/@esbuild/netbsd-x64": {
+ "version": "0.24.0",
+ "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.24.0.tgz",
+ "integrity": "sha512-hjQ0R/ulkO8fCYFsG0FZoH+pWgTTDreqpqY7UnQntnaKv95uP5iW3+dChxnx7C3trQQU40S+OgWhUVwCjVFLvg==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "netbsd"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
},
- "picomatch": {
- "version": "2.3.1",
- "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
- "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
- "dev": true
+ "node_modules/@esbuild/openbsd-arm64": {
+ "version": "0.24.0",
+ "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.24.0.tgz",
+ "integrity": "sha512-MD9uzzkPQbYehwcN583yx3Tu5M8EIoTD+tUgKF982WYL9Pf5rKy9ltgD0eUgs8pvKnmizxjXZyLt0z6DC3rRXg==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "openbsd"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
},
- "pify": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
- "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
- "dev": true
+ "node_modules/@esbuild/openbsd-x64": {
+ "version": "0.24.0",
+ "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.24.0.tgz",
+ "integrity": "sha512-4ir0aY1NGUhIC1hdoCzr1+5b43mw99uNwVzhIq1OY3QcEwPDO3B7WNXBzaKY5Nsf1+N11i1eOfFcq+D/gOS15Q==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "openbsd"
+ ],
+ "engines": {
+ "node": ">=18"
+ }
},
- "postcss": {
- "version": "8.4.47",
- "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.47.tgz",
- "integrity": "sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==",
+ "node_modules/@esbuild/sunos-x64": {
+ "version": "0.24.0",
+ "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.24.0.tgz",
+ "integrity": "sha512-jVzdzsbM5xrotH+W5f1s+JtUy1UWgjU0Cf4wMvffTB8m6wP5/kx0KiaLHlbJO+dMgtxKV8RQ/JvtlFcdZ1zCPA==",
+ "cpu": [
+ "x64"
+ ],
"dev": true,
- "requires": {
- "nanoid": "^3.3.7",
- "picocolors": "^1.1.0",
- "source-map-js": "^1.2.1"
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "sunos"
+ ],
+ "engines": {
+ "node": ">=18"
}
},
- "postcss-cli": {
- "version": "11.0.0",
- "resolved": "https://registry.npmjs.org/postcss-cli/-/postcss-cli-11.0.0.tgz",
- "integrity": "sha512-xMITAI7M0u1yolVcXJ9XTZiO9aO49mcoKQy6pCDFdMh9kGqhzLVpWxeD/32M/QBmkhcGypZFFOLNLmIW4Pg4RA==",
+ "node_modules/@esbuild/win32-arm64": {
+ "version": "0.24.0",
+ "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.24.0.tgz",
+ "integrity": "sha512-iKc8GAslzRpBytO2/aN3d2yb2z8XTVfNV0PjGlCxKo5SgWmNXx82I/Q3aG1tFfS+A2igVCY97TJ8tnYwpUWLCA==",
+ "cpu": [
+ "arm64"
+ ],
"dev": true,
- "requires": {
- "chokidar": "^3.3.0",
- "dependency-graph": "^0.11.0",
- "fs-extra": "^11.0.0",
- "get-stdin": "^9.0.0",
- "globby": "^14.0.0",
- "picocolors": "^1.0.0",
- "postcss-load-config": "^5.0.0",
- "postcss-reporter": "^7.0.0",
- "pretty-hrtime": "^1.0.3",
- "read-cache": "^1.0.0",
- "slash": "^5.0.0",
- "yargs": "^17.0.0"
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "win32"
+ ],
+ "engines": {
+ "node": ">=18"
}
},
- "postcss-load-config": {
- "version": "5.0.2",
- "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-5.0.2.tgz",
- "integrity": "sha512-Q8QR3FYbqOKa0bnC1UQ2bFq9/ulHX5Bi34muzitMr8aDtUelO5xKeJEYC/5smE0jNE9zdB/NBnOwXKexELbRlw==",
+ "node_modules/@esbuild/win32-ia32": {
+ "version": "0.24.0",
+ "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.24.0.tgz",
+ "integrity": "sha512-vQW36KZolfIudCcTnaTpmLQ24Ha1RjygBo39/aLkM2kmjkWmZGEJ5Gn9l5/7tzXA42QGIoWbICfg6KLLkIw6yw==",
+ "cpu": [
+ "ia32"
+ ],
"dev": true,
- "requires": {
- "lilconfig": "^3.0.0",
- "yaml": "^2.3.4"
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "win32"
+ ],
+ "engines": {
+ "node": ">=18"
}
},
- "postcss-reporter": {
- "version": "7.0.5",
- "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-7.0.5.tgz",
- "integrity": "sha512-glWg7VZBilooZGOFPhN9msJ3FQs19Hie7l5a/eE6WglzYqVeH3ong3ShFcp9kDWJT1g2Y/wd59cocf9XxBtkWA==",
+ "node_modules/@esbuild/win32-x64": {
+ "version": "0.24.0",
+ "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.24.0.tgz",
+ "integrity": "sha512-7IAFPrjSQIJrGsK6flwg7NFmwBoSTyF3rl7If0hNUFQU4ilTsEPL6GuMuU9BfIWVVGuRnuIidkSMC+c0Otu8IA==",
+ "cpu": [
+ "x64"
+ ],
"dev": true,
- "requires": {
- "picocolors": "^1.0.0",
- "thenby": "^1.3.4"
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "win32"
+ ],
+ "engines": {
+ "node": ">=18"
}
},
- "postcss-value-parser": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
- "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
- "dev": true
+ "node_modules/@fullhuman/postcss-purgecss": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/@fullhuman/postcss-purgecss/-/postcss-purgecss-6.0.0.tgz",
+ "integrity": "sha512-sUvk5PV7O5xvTJcxDYrQ00xlKtSxivvJdZrwgxE8F1GmNMs7w9U+dSbr83N/qEs9b+f+6QsZKXDs0k8nMjBIqA==",
+ "license": "MIT",
+ "dependencies": {
+ "purgecss": "^6.0.0"
+ },
+ "peerDependencies": {
+ "postcss": "^8.0.0"
+ }
},
- "pretty-hrtime": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
- "integrity": "sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==",
- "dev": true
+ "node_modules/@isaacs/cliui": {
+ "version": "8.0.2",
+ "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
+ "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+ "license": "ISC",
+ "dependencies": {
+ "string-width": "^5.1.2",
+ "string-width-cjs": "npm:string-width@^4.2.0",
+ "strip-ansi": "^7.0.1",
+ "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+ "wrap-ansi": "^8.1.0",
+ "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
+ },
+ "engines": {
+ "node": ">=12"
+ }
},
- "queue-microtask": {
- "version": "1.2.3",
- "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
- "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
- "dev": true
+ "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
+ "version": "6.1.0",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
+ "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+ }
},
- "read-cache": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
- "integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==",
+ "node_modules/@isaacs/cliui/node_modules/ansi-styles": {
+ "version": "6.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+ "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+ }
+ },
+ "node_modules/@isaacs/cliui/node_modules/emoji-regex": {
+ "version": "9.2.2",
+ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+ "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+ "license": "MIT"
+ },
+ "node_modules/@isaacs/cliui/node_modules/string-width": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+ "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+ "license": "MIT",
+ "dependencies": {
+ "eastasianwidth": "^0.2.0",
+ "emoji-regex": "^9.2.2",
+ "strip-ansi": "^7.0.1"
+ },
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/@isaacs/cliui/node_modules/strip-ansi": {
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+ "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+ "license": "MIT",
+ "dependencies": {
+ "ansi-regex": "^6.0.1"
+ },
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+ }
+ },
+ "node_modules/@isaacs/cliui/node_modules/wrap-ansi": {
+ "version": "8.1.0",
+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+ "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+ "license": "MIT",
+ "dependencies": {
+ "ansi-styles": "^6.1.0",
+ "string-width": "^5.0.1",
+ "strip-ansi": "^7.0.1"
+ },
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+ }
+ },
+ "node_modules/@jridgewell/gen-mapping": {
+ "version": "0.3.5",
+ "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
+ "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
+ "license": "MIT",
+ "dependencies": {
+ "@jridgewell/set-array": "^1.2.1",
+ "@jridgewell/sourcemap-codec": "^1.4.10",
+ "@jridgewell/trace-mapping": "^0.3.24"
+ },
+ "engines": {
+ "node": ">=6.0.0"
+ }
+ },
+ "node_modules/@jridgewell/resolve-uri": {
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+ "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=6.0.0"
+ }
+ },
+ "node_modules/@jridgewell/set-array": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
+ "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=6.0.0"
+ }
+ },
+ "node_modules/@jridgewell/sourcemap-codec": {
+ "version": "1.5.0",
+ "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
+ "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
+ "license": "MIT"
+ },
+ "node_modules/@jridgewell/trace-mapping": {
+ "version": "0.3.25",
+ "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+ "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+ "license": "MIT",
+ "dependencies": {
+ "@jridgewell/resolve-uri": "^3.1.0",
+ "@jridgewell/sourcemap-codec": "^1.4.14"
+ }
+ },
+ "node_modules/@nicolo-ribaudo/chokidar-2": {
+ "version": "2.1.8-no-fsevents.3",
+ "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8-no-fsevents.3.tgz",
+ "integrity": "sha512-s88O1aVtXftvp5bCPB7WnmXc5IwOZZ7YPuwNPt+GtOOXpPvad1LfbmjYv+qII7zP6RU2QGnqve27dnLycEnyEQ==",
+ "license": "MIT",
+ "optional": true
+ },
+ "node_modules/@nodelib/fs.scandir": {
+ "version": "2.1.5",
+ "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+ "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+ "license": "MIT",
+ "dependencies": {
+ "@nodelib/fs.stat": "2.0.5",
+ "run-parallel": "^1.1.9"
+ },
+ "engines": {
+ "node": ">= 8"
+ }
+ },
+ "node_modules/@nodelib/fs.stat": {
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+ "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+ "license": "MIT",
+ "engines": {
+ "node": ">= 8"
+ }
+ },
+ "node_modules/@nodelib/fs.walk": {
+ "version": "1.2.8",
+ "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+ "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+ "license": "MIT",
+ "dependencies": {
+ "@nodelib/fs.scandir": "2.1.5",
+ "fastq": "^1.6.0"
+ },
+ "engines": {
+ "node": ">= 8"
+ }
+ },
+ "node_modules/@pkgjs/parseargs": {
+ "version": "0.11.0",
+ "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
+ "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+ "license": "MIT",
+ "optional": true,
+ "engines": {
+ "node": ">=14"
+ }
+ },
+ "node_modules/@popperjs/core": {
+ "version": "2.11.8",
+ "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz",
+ "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==",
+ "license": "MIT",
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/popperjs"
+ }
+ },
+ "node_modules/@rollup/rollup-android-arm-eabi": {
+ "version": "4.27.4",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.27.4.tgz",
+ "integrity": "sha512-2Y3JT6f5MrQkICUyRVCw4oa0sutfAsgaSsb0Lmmy1Wi2y7X5vT9Euqw4gOsCyy0YfKURBg35nhUKZS4mDcfULw==",
+ "cpu": [
+ "arm"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "android"
+ ]
+ },
+ "node_modules/@rollup/rollup-android-arm64": {
+ "version": "4.27.4",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.27.4.tgz",
+ "integrity": "sha512-wzKRQXISyi9UdCVRqEd0H4cMpzvHYt1f/C3CoIjES6cG++RHKhrBj2+29nPF0IB5kpy9MS71vs07fvrNGAl/iA==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "android"
+ ]
+ },
+ "node_modules/@rollup/rollup-darwin-arm64": {
+ "version": "4.27.4",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.27.4.tgz",
+ "integrity": "sha512-PlNiRQapift4LNS8DPUHuDX/IdXiLjf8mc5vdEmUR0fF/pyy2qWwzdLjB+iZquGr8LuN4LnUoSEvKRwjSVYz3Q==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "darwin"
+ ]
+ },
+ "node_modules/@rollup/rollup-darwin-x64": {
+ "version": "4.27.4",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.27.4.tgz",
+ "integrity": "sha512-o9bH2dbdgBDJaXWJCDTNDYa171ACUdzpxSZt+u/AAeQ20Nk5x+IhA+zsGmrQtpkLiumRJEYef68gcpn2ooXhSQ==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "darwin"
+ ]
+ },
+ "node_modules/@rollup/rollup-freebsd-arm64": {
+ "version": "4.27.4",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.27.4.tgz",
+ "integrity": "sha512-NBI2/i2hT9Q+HySSHTBh52da7isru4aAAo6qC3I7QFVsuhxi2gM8t/EI9EVcILiHLj1vfi+VGGPaLOUENn7pmw==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "freebsd"
+ ]
+ },
+ "node_modules/@rollup/rollup-freebsd-x64": {
+ "version": "4.27.4",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.27.4.tgz",
+ "integrity": "sha512-wYcC5ycW2zvqtDYrE7deary2P2UFmSh85PUpAx+dwTCO9uw3sgzD6Gv9n5X4vLaQKsrfTSZZ7Z7uynQozPVvWA==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "freebsd"
+ ]
+ },
+ "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
+ "version": "4.27.4",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.27.4.tgz",
+ "integrity": "sha512-9OwUnK/xKw6DyRlgx8UizeqRFOfi9mf5TYCw1uolDaJSbUmBxP85DE6T4ouCMoN6pXw8ZoTeZCSEfSaYo+/s1w==",
+ "cpu": [
+ "arm"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@rollup/rollup-linux-arm-musleabihf": {
+ "version": "4.27.4",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.27.4.tgz",
+ "integrity": "sha512-Vgdo4fpuphS9V24WOV+KwkCVJ72u7idTgQaBoLRD0UxBAWTF9GWurJO9YD9yh00BzbkhpeXtm6na+MvJU7Z73A==",
+ "cpu": [
+ "arm"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@rollup/rollup-linux-arm64-gnu": {
+ "version": "4.27.4",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.27.4.tgz",
+ "integrity": "sha512-pleyNgyd1kkBkw2kOqlBx+0atfIIkkExOTiifoODo6qKDSpnc6WzUY5RhHdmTdIJXBdSnh6JknnYTtmQyobrVg==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@rollup/rollup-linux-arm64-musl": {
+ "version": "4.27.4",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.27.4.tgz",
+ "integrity": "sha512-caluiUXvUuVyCHr5DxL8ohaaFFzPGmgmMvwmqAITMpV/Q+tPoaHZ/PWa3t8B2WyoRcIIuu1hkaW5KkeTDNSnMA==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
+ "version": "4.27.4",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.27.4.tgz",
+ "integrity": "sha512-FScrpHrO60hARyHh7s1zHE97u0KlT/RECzCKAdmI+LEoC1eDh/RDji9JgFqyO+wPDb86Oa/sXkily1+oi4FzJQ==",
+ "cpu": [
+ "ppc64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@rollup/rollup-linux-riscv64-gnu": {
+ "version": "4.27.4",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.27.4.tgz",
+ "integrity": "sha512-qyyprhyGb7+RBfMPeww9FlHwKkCXdKHeGgSqmIXw9VSUtvyFZ6WZRtnxgbuz76FK7LyoN8t/eINRbPUcvXB5fw==",
+ "cpu": [
+ "riscv64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@rollup/rollup-linux-s390x-gnu": {
+ "version": "4.27.4",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.27.4.tgz",
+ "integrity": "sha512-PFz+y2kb6tbh7m3A7nA9++eInGcDVZUACulf/KzDtovvdTizHpZaJty7Gp0lFwSQcrnebHOqxF1MaKZd7psVRg==",
+ "cpu": [
+ "s390x"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@rollup/rollup-linux-x64-gnu": {
+ "version": "4.27.4",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.27.4.tgz",
+ "integrity": "sha512-Ni8mMtfo+o/G7DVtweXXV/Ol2TFf63KYjTtoZ5f078AUgJTmaIJnj4JFU7TK/9SVWTaSJGxPi5zMDgK4w+Ez7Q==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@rollup/rollup-linux-x64-musl": {
+ "version": "4.27.4",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.27.4.tgz",
+ "integrity": "sha512-5AeeAF1PB9TUzD+3cROzFTnAJAcVUGLuR8ng0E0WXGkYhp6RD6L+6szYVX+64Rs0r72019KHZS1ka1q+zU/wUw==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "linux"
+ ]
+ },
+ "node_modules/@rollup/rollup-win32-arm64-msvc": {
+ "version": "4.27.4",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.27.4.tgz",
+ "integrity": "sha512-yOpVsA4K5qVwu2CaS3hHxluWIK5HQTjNV4tWjQXluMiiiu4pJj4BN98CvxohNCpcjMeTXk/ZMJBRbgRg8HBB6A==",
+ "cpu": [
+ "arm64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "win32"
+ ]
+ },
+ "node_modules/@rollup/rollup-win32-ia32-msvc": {
+ "version": "4.27.4",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.27.4.tgz",
+ "integrity": "sha512-KtwEJOaHAVJlxV92rNYiG9JQwQAdhBlrjNRp7P9L8Cb4Rer3in+0A+IPhJC9y68WAi9H0sX4AiG2NTsVlmqJeQ==",
+ "cpu": [
+ "ia32"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "win32"
+ ]
+ },
+ "node_modules/@rollup/rollup-win32-x64-msvc": {
+ "version": "4.27.4",
+ "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.27.4.tgz",
+ "integrity": "sha512-3j4jx1TppORdTAoBJRd+/wJRGCPC0ETWkXOecJ6PPZLj6SptXkrXcNqdj0oclbKML6FkQltdz7bBA3rUSirZug==",
+ "cpu": [
+ "x64"
+ ],
+ "dev": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "win32"
+ ]
+ },
+ "node_modules/@sindresorhus/merge-streams": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-2.3.0.tgz",
+ "integrity": "sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=18"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/@tabler/icons": {
+ "version": "3.23.0",
+ "resolved": "https://registry.npmjs.org/@tabler/icons/-/icons-3.23.0.tgz",
+ "integrity": "sha512-Cz+X58jfRm0g/KcupXXuPw5knj671lNR054AnmLXvCjudiQBWI0wZulDDSsqDoGezvBzMTNPQtNcjLkZs82ZxQ==",
+ "license": "MIT",
+ "funding": {
+ "type": "github",
+ "url": "https://github.com/sponsors/codecalm"
+ }
+ },
+ "node_modules/@thulite/bootstrap": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/@thulite/bootstrap/-/bootstrap-1.2.0.tgz",
+ "integrity": "sha512-l/5KFUkoZuOiXy110felHgQgciBpGvpK2jqs0aQiUas4dJbgmc6oN1TgplIWLdWlXm70HxHAtvYJGNIVcOg0jQ==",
+ "license": "MIT",
+ "dependencies": {
+ "@popperjs/core": "^2.11.8",
+ "bootstrap": "^5.3.3"
+ },
+ "engines": {
+ "node": ">=20.11.0"
+ }
+ },
+ "node_modules/@thulite/core": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/@thulite/core/-/core-1.4.0.tgz",
+ "integrity": "sha512-Z+DK+MoSCf+jvaTANEL2nnQlcaly2gkYEIb/FhnC9aEkrUbZztF9jlAc2xAvaUx3Ojxs5NkU4/kO+SHDE/hpQg==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/cli": "^7.24.8",
+ "@babel/core": "^7.25.2",
+ "@babel/preset-env": "^7.25.4",
+ "@fullhuman/postcss-purgecss": "^6.0.0",
+ "autoprefixer": "^10.4.20",
+ "lazysizes": "^5.3.2",
+ "modern-css-reset": "^1.4.0",
+ "postcss": "^8.4.41",
+ "postcss-cli": "^11.0.0",
+ "purgecss-whitelister": "^2.4.0",
+ "quicklink": "^2.3.0"
+ },
+ "engines": {
+ "node": ">=20.11.0"
+ }
+ },
+ "node_modules/@thulite/doks-core": {
+ "version": "1.8.0",
+ "resolved": "https://registry.npmjs.org/@thulite/doks-core/-/doks-core-1.8.0.tgz",
+ "integrity": "sha512-aouKSFQdssEt4wIsVYiVvvz5ZHxqme45EbLo31BvmEz8MMvovakq+o8ymFUcg90fdcAGhTcYzLKz5jlRZsc3TQ==",
+ "license": "MIT",
+ "dependencies": {
+ "@thulite/bootstrap": "^1.2.0",
+ "clipboard": "^2.0.11",
+ "flexsearch": "^0.7.43"
+ },
+ "engines": {
+ "node": ">=20.11.0"
+ }
+ },
+ "node_modules/@thulite/images": {
+ "version": "3.3.0",
+ "resolved": "https://registry.npmjs.org/@thulite/images/-/images-3.3.0.tgz",
+ "integrity": "sha512-62RYN0HCewFLrG884DRlGhLypdP5VfQRlVGfI4RTS2r0tgZ5rD3/1neCFDEg7qyaYt7hH1n3ojLhyfOGRuR97w==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=20.11.0"
+ }
+ },
+ "node_modules/@thulite/inline-svg": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/@thulite/inline-svg/-/inline-svg-1.2.0.tgz",
+ "integrity": "sha512-ffibNW17QJfwkPqe+AlIyCJFQiNqVQ9eFFsftPqQxx4CzVyP8HyYQUkWdgLFaxqWLN7ErxqNoC1Ibcmflqwm1w==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=20.11.0"
+ }
+ },
+ "node_modules/@thulite/seo": {
+ "version": "2.4.1",
+ "resolved": "https://registry.npmjs.org/@thulite/seo/-/seo-2.4.1.tgz",
+ "integrity": "sha512-ZHGud+gNZLjWP9WgxfA8t4H1+8Ql8xodnUnBA6QIJ/mKKhBYnomqCjFaeYE1t/5khglHrofyZagn0JXiaQ0NaA==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=20.11.0"
+ }
+ },
+ "node_modules/@types/estree": {
+ "version": "1.0.6",
+ "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
+ "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
+ "dev": true,
+ "license": "MIT"
+ },
+ "node_modules/ansi-regex": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+ "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/ansi-styles": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+ "license": "MIT",
+ "dependencies": {
+ "color-convert": "^2.0.1"
+ },
+ "engines": {
+ "node": ">=8"
+ },
+ "funding": {
+ "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+ }
+ },
+ "node_modules/anymatch": {
+ "version": "3.1.3",
+ "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+ "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+ "license": "ISC",
+ "dependencies": {
+ "normalize-path": "^3.0.0",
+ "picomatch": "^2.0.4"
+ },
+ "engines": {
+ "node": ">= 8"
+ }
+ },
+ "node_modules/autoprefixer": {
+ "version": "10.4.20",
+ "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.20.tgz",
+ "integrity": "sha512-XY25y5xSv/wEoqzDyXXME4AFfkZI0P23z6Fs3YgymDnKJkCGOnkL0iTxCa85UTqaSgfcqyf3UA6+c7wUvx/16g==",
+ "funding": [
+ {
+ "type": "opencollective",
+ "url": "https://opencollective.com/postcss/"
+ },
+ {
+ "type": "tidelift",
+ "url": "https://tidelift.com/funding/github/npm/autoprefixer"
+ },
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/ai"
+ }
+ ],
+ "license": "MIT",
+ "dependencies": {
+ "browserslist": "^4.23.3",
+ "caniuse-lite": "^1.0.30001646",
+ "fraction.js": "^4.3.7",
+ "normalize-range": "^0.1.2",
+ "picocolors": "^1.0.1",
+ "postcss-value-parser": "^4.2.0"
+ },
+ "bin": {
+ "autoprefixer": "bin/autoprefixer"
+ },
+ "engines": {
+ "node": "^10 || ^12 || >=14"
+ },
+ "peerDependencies": {
+ "postcss": "^8.1.0"
+ }
+ },
+ "node_modules/babel-plugin-polyfill-corejs2": {
+ "version": "0.4.12",
+ "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.12.tgz",
+ "integrity": "sha512-CPWT6BwvhrTO2d8QVorhTCQw9Y43zOu7G9HigcfxvepOU6b8o3tcWad6oVgZIsZCTt42FFv97aA7ZJsbM4+8og==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/compat-data": "^7.22.6",
+ "@babel/helper-define-polyfill-provider": "^0.6.3",
+ "semver": "^6.3.1"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+ }
+ },
+ "node_modules/babel-plugin-polyfill-corejs3": {
+ "version": "0.10.6",
+ "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.10.6.tgz",
+ "integrity": "sha512-b37+KR2i/khY5sKmWNVQAnitvquQbNdWy6lJdsr0kmquCKEEUgMKK4SboVM3HtfnZilfjr4MMQ7vY58FVWDtIA==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/helper-define-polyfill-provider": "^0.6.2",
+ "core-js-compat": "^3.38.0"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+ }
+ },
+ "node_modules/babel-plugin-polyfill-regenerator": {
+ "version": "0.6.3",
+ "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.6.3.tgz",
+ "integrity": "sha512-LiWSbl4CRSIa5x/JAU6jZiG9eit9w6mz+yVMFwDE83LAWvt0AfGBoZ7HS/mkhrKuh2ZlzfVZYKoLjXdqw6Yt7Q==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/helper-define-polyfill-provider": "^0.6.3"
+ },
+ "peerDependencies": {
+ "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
+ }
+ },
+ "node_modules/balanced-match": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+ "license": "MIT"
+ },
+ "node_modules/binary-extensions": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
+ "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=8"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/bootstrap": {
+ "version": "5.3.3",
+ "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.3.tgz",
+ "integrity": "sha512-8HLCdWgyoMguSO9o+aH+iuZ+aht+mzW0u3HIMzVu7Srrpv7EBBxTnrFlSCskwdY1+EOFQSm7uMJhNQHkdPcmjg==",
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/twbs"
+ },
+ {
+ "type": "opencollective",
+ "url": "https://opencollective.com/bootstrap"
+ }
+ ],
+ "license": "MIT",
+ "peerDependencies": {
+ "@popperjs/core": "^2.11.8"
+ }
+ },
+ "node_modules/brace-expansion": {
+ "version": "1.1.11",
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+ "license": "MIT",
+ "dependencies": {
+ "balanced-match": "^1.0.0",
+ "concat-map": "0.0.1"
+ }
+ },
+ "node_modules/braces": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+ "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+ "license": "MIT",
+ "dependencies": {
+ "fill-range": "^7.1.1"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/browserslist": {
+ "version": "4.24.2",
+ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.2.tgz",
+ "integrity": "sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==",
+ "funding": [
+ {
+ "type": "opencollective",
+ "url": "https://opencollective.com/browserslist"
+ },
+ {
+ "type": "tidelift",
+ "url": "https://tidelift.com/funding/github/npm/browserslist"
+ },
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/ai"
+ }
+ ],
+ "license": "MIT",
+ "dependencies": {
+ "caniuse-lite": "^1.0.30001669",
+ "electron-to-chromium": "^1.5.41",
+ "node-releases": "^2.0.18",
+ "update-browserslist-db": "^1.1.1"
+ },
+ "bin": {
+ "browserslist": "cli.js"
+ },
+ "engines": {
+ "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+ }
+ },
+ "node_modules/camelcase": {
+ "version": "5.3.1",
+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+ "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/caniuse-lite": {
+ "version": "1.0.30001684",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001684.tgz",
+ "integrity": "sha512-G1LRwLIQjBQoyq0ZJGqGIJUXzJ8irpbjHLpVRXDvBEScFJ9b17sgK6vlx0GAJFE21okD7zXl08rRRUfq6HdoEQ==",
+ "funding": [
+ {
+ "type": "opencollective",
+ "url": "https://opencollective.com/browserslist"
+ },
+ {
+ "type": "tidelift",
+ "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+ },
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/ai"
+ }
+ ],
+ "license": "CC-BY-4.0"
+ },
+ "node_modules/chokidar": {
+ "version": "3.6.0",
+ "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+ "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+ "license": "MIT",
+ "dependencies": {
+ "anymatch": "~3.1.2",
+ "braces": "~3.0.2",
+ "glob-parent": "~5.1.2",
+ "is-binary-path": "~2.1.0",
+ "is-glob": "~4.0.1",
+ "normalize-path": "~3.0.0",
+ "readdirp": "~3.6.0"
+ },
+ "engines": {
+ "node": ">= 8.10.0"
+ },
+ "funding": {
+ "url": "https://paulmillr.com/funding/"
+ },
+ "optionalDependencies": {
+ "fsevents": "~2.3.2"
+ }
+ },
+ "node_modules/clipboard": {
+ "version": "2.0.11",
+ "resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.11.tgz",
+ "integrity": "sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==",
+ "license": "MIT",
+ "dependencies": {
+ "good-listener": "^1.2.2",
+ "select": "^1.1.2",
+ "tiny-emitter": "^2.0.0"
+ }
+ },
+ "node_modules/cliui": {
+ "version": "8.0.1",
+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
+ "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
+ "license": "ISC",
+ "dependencies": {
+ "string-width": "^4.2.0",
+ "strip-ansi": "^6.0.1",
+ "wrap-ansi": "^7.0.0"
+ },
+ "engines": {
+ "node": ">=12"
+ }
+ },
+ "node_modules/color-convert": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+ "license": "MIT",
+ "dependencies": {
+ "color-name": "~1.1.4"
+ },
+ "engines": {
+ "node": ">=7.0.0"
+ }
+ },
+ "node_modules/color-name": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+ "license": "MIT"
+ },
+ "node_modules/commander": {
+ "version": "6.2.1",
+ "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
+ "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
+ "license": "MIT",
+ "engines": {
+ "node": ">= 6"
+ }
+ },
+ "node_modules/concat-map": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+ "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+ "license": "MIT"
+ },
+ "node_modules/convert-source-map": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+ "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+ "license": "MIT"
+ },
+ "node_modules/core-js-compat": {
+ "version": "3.39.0",
+ "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.39.0.tgz",
+ "integrity": "sha512-VgEUx3VwlExr5no0tXlBt+silBvhTryPwCXRI2Id1PN8WTKu7MreethvddqOubrYxkFdv/RnYrqlv1sFNAUelw==",
+ "license": "MIT",
+ "dependencies": {
+ "browserslist": "^4.24.2"
+ },
+ "funding": {
+ "type": "opencollective",
+ "url": "https://opencollective.com/core-js"
+ }
+ },
+ "node_modules/cross-spawn": {
+ "version": "7.0.6",
+ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+ "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+ "license": "MIT",
+ "dependencies": {
+ "path-key": "^3.1.0",
+ "shebang-command": "^2.0.0",
+ "which": "^2.0.1"
+ },
+ "engines": {
+ "node": ">= 8"
+ }
+ },
+ "node_modules/cssesc": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+ "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+ "license": "MIT",
+ "bin": {
+ "cssesc": "bin/cssesc"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/debug": {
+ "version": "4.3.7",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+ "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+ "license": "MIT",
+ "dependencies": {
+ "ms": "^2.1.3"
+ },
+ "engines": {
+ "node": ">=6.0"
+ },
+ "peerDependenciesMeta": {
+ "supports-color": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/decamelize": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+ "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/delegate": {
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz",
+ "integrity": "sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==",
+ "license": "MIT"
+ },
+ "node_modules/dependency-graph": {
+ "version": "0.11.0",
+ "resolved": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.11.0.tgz",
+ "integrity": "sha512-JeMq7fEshyepOWDfcfHK06N3MhyPhz++vtqWhMT5O9A3K42rdsEDpfdVqjaqaAhsw6a+ZqeDvQVtD0hFHQWrzg==",
+ "license": "MIT",
+ "engines": {
+ "node": ">= 0.6.0"
+ }
+ },
+ "node_modules/eastasianwidth": {
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+ "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+ "license": "MIT"
+ },
+ "node_modules/electron-to-chromium": {
+ "version": "1.5.65",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.65.tgz",
+ "integrity": "sha512-PWVzBjghx7/wop6n22vS2MLU8tKGd4Q91aCEGhG/TYmW6PP5OcSXcdnxTe1NNt0T66N8D6jxh4kC8UsdzOGaIw==",
+ "license": "ISC"
+ },
+ "node_modules/emoji-regex": {
+ "version": "8.0.0",
+ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+ "license": "MIT"
+ },
+ "node_modules/esbuild": {
+ "version": "0.24.0",
+ "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.24.0.tgz",
+ "integrity": "sha512-FuLPevChGDshgSicjisSooU0cemp/sGXR841D5LHMB7mTVOmsEHcAxaH3irL53+8YDIeVNQEySh4DaYU/iuPqQ==",
+ "dev": true,
+ "hasInstallScript": true,
+ "license": "MIT",
+ "bin": {
+ "esbuild": "bin/esbuild"
+ },
+ "engines": {
+ "node": ">=18"
+ },
+ "optionalDependencies": {
+ "@esbuild/aix-ppc64": "0.24.0",
+ "@esbuild/android-arm": "0.24.0",
+ "@esbuild/android-arm64": "0.24.0",
+ "@esbuild/android-x64": "0.24.0",
+ "@esbuild/darwin-arm64": "0.24.0",
+ "@esbuild/darwin-x64": "0.24.0",
+ "@esbuild/freebsd-arm64": "0.24.0",
+ "@esbuild/freebsd-x64": "0.24.0",
+ "@esbuild/linux-arm": "0.24.0",
+ "@esbuild/linux-arm64": "0.24.0",
+ "@esbuild/linux-ia32": "0.24.0",
+ "@esbuild/linux-loong64": "0.24.0",
+ "@esbuild/linux-mips64el": "0.24.0",
+ "@esbuild/linux-ppc64": "0.24.0",
+ "@esbuild/linux-riscv64": "0.24.0",
+ "@esbuild/linux-s390x": "0.24.0",
+ "@esbuild/linux-x64": "0.24.0",
+ "@esbuild/netbsd-x64": "0.24.0",
+ "@esbuild/openbsd-arm64": "0.24.0",
+ "@esbuild/openbsd-x64": "0.24.0",
+ "@esbuild/sunos-x64": "0.24.0",
+ "@esbuild/win32-arm64": "0.24.0",
+ "@esbuild/win32-ia32": "0.24.0",
+ "@esbuild/win32-x64": "0.24.0"
+ }
+ },
+ "node_modules/escalade": {
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+ "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/esutils": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+ "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+ "license": "BSD-2-Clause",
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/fast-glob": {
+ "version": "3.3.2",
+ "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
+ "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
+ "license": "MIT",
+ "dependencies": {
+ "@nodelib/fs.stat": "^2.0.2",
+ "@nodelib/fs.walk": "^1.2.3",
+ "glob-parent": "^5.1.2",
+ "merge2": "^1.3.0",
+ "micromatch": "^4.0.4"
+ },
+ "engines": {
+ "node": ">=8.6.0"
+ }
+ },
+ "node_modules/fastq": {
+ "version": "1.17.1",
+ "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
+ "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
+ "license": "ISC",
+ "dependencies": {
+ "reusify": "^1.0.4"
+ }
+ },
+ "node_modules/fill-range": {
+ "version": "7.1.1",
+ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+ "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+ "license": "MIT",
+ "dependencies": {
+ "to-regex-range": "^5.0.1"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/find-up": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+ "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+ "license": "MIT",
+ "dependencies": {
+ "locate-path": "^5.0.0",
+ "path-exists": "^4.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/flexsearch": {
+ "version": "0.7.43",
+ "resolved": "https://registry.npmjs.org/flexsearch/-/flexsearch-0.7.43.tgz",
+ "integrity": "sha512-c5o/+Um8aqCSOXGcZoqZOm+NqtVwNsvVpWv6lfmSclU954O3wvQKxxK8zj74fPaSJbXpSLTs4PRhh+wnoCXnKg==",
+ "license": "Apache-2.0"
+ },
+ "node_modules/foreground-child": {
+ "version": "3.3.0",
+ "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz",
+ "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==",
+ "license": "ISC",
+ "dependencies": {
+ "cross-spawn": "^7.0.0",
+ "signal-exit": "^4.0.1"
+ },
+ "engines": {
+ "node": ">=14"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/isaacs"
+ }
+ },
+ "node_modules/fraction.js": {
+ "version": "4.3.7",
+ "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz",
+ "integrity": "sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==",
+ "license": "MIT",
+ "engines": {
+ "node": "*"
+ },
+ "funding": {
+ "type": "patreon",
+ "url": "https://github.com/sponsors/rawify"
+ }
+ },
+ "node_modules/fs-extra": {
+ "version": "11.2.0",
+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
+ "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
+ "license": "MIT",
+ "dependencies": {
+ "graceful-fs": "^4.2.0",
+ "jsonfile": "^6.0.1",
+ "universalify": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=14.14"
+ }
+ },
+ "node_modules/fs-readdir-recursive": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz",
+ "integrity": "sha512-GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA==",
+ "license": "MIT"
+ },
+ "node_modules/fs.realpath": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+ "license": "ISC"
+ },
+ "node_modules/fsevents": {
+ "version": "2.3.3",
+ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+ "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+ "hasInstallScript": true,
+ "license": "MIT",
+ "optional": true,
+ "os": [
+ "darwin"
+ ],
+ "engines": {
+ "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+ }
+ },
+ "node_modules/function-bind": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+ "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+ "license": "MIT",
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/gensync": {
+ "version": "1.0.0-beta.2",
+ "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+ "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=6.9.0"
+ }
+ },
+ "node_modules/get-caller-file": {
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+ "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+ "license": "ISC",
+ "engines": {
+ "node": "6.* || 8.* || >= 10.*"
+ }
+ },
+ "node_modules/get-stdin": {
+ "version": "9.0.0",
+ "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-9.0.0.tgz",
+ "integrity": "sha512-dVKBjfWisLAicarI2Sf+JuBE/DghV4UzNAVe9yhEJuzeREd3JhOTE9cUaJTeSa77fsbQUK3pcOpJfM59+VKZaA==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/glob": {
+ "version": "7.2.3",
+ "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+ "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+ "deprecated": "Glob versions prior to v9 are no longer supported",
+ "license": "ISC",
+ "dependencies": {
+ "fs.realpath": "^1.0.0",
+ "inflight": "^1.0.4",
+ "inherits": "2",
+ "minimatch": "^3.1.1",
+ "once": "^1.3.0",
+ "path-is-absolute": "^1.0.0"
+ },
+ "engines": {
+ "node": "*"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/isaacs"
+ }
+ },
+ "node_modules/glob-all": {
+ "version": "3.3.1",
+ "resolved": "https://registry.npmjs.org/glob-all/-/glob-all-3.3.1.tgz",
+ "integrity": "sha512-Y+ESjdI7ZgMwfzanHZYQ87C59jOO0i+Hd+QYtVt9PhLi6d8wlOpzQnfBxWUlaTuAoR3TkybLqqbIoWveU4Ji7Q==",
+ "license": "MIT",
+ "dependencies": {
+ "glob": "^7.2.3",
+ "yargs": "^15.3.1"
+ },
+ "bin": {
+ "glob-all": "bin/glob-all"
+ }
+ },
+ "node_modules/glob-all/node_modules/cliui": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+ "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+ "license": "ISC",
+ "dependencies": {
+ "string-width": "^4.2.0",
+ "strip-ansi": "^6.0.0",
+ "wrap-ansi": "^6.2.0"
+ }
+ },
+ "node_modules/glob-all/node_modules/wrap-ansi": {
+ "version": "6.2.0",
+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+ "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+ "license": "MIT",
+ "dependencies": {
+ "ansi-styles": "^4.0.0",
+ "string-width": "^4.1.0",
+ "strip-ansi": "^6.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/glob-all/node_modules/y18n": {
+ "version": "4.0.3",
+ "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+ "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
+ "license": "ISC"
+ },
+ "node_modules/glob-all/node_modules/yargs": {
+ "version": "15.4.1",
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
+ "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+ "license": "MIT",
+ "dependencies": {
+ "cliui": "^6.0.0",
+ "decamelize": "^1.2.0",
+ "find-up": "^4.1.0",
+ "get-caller-file": "^2.0.1",
+ "require-directory": "^2.1.1",
+ "require-main-filename": "^2.0.0",
+ "set-blocking": "^2.0.0",
+ "string-width": "^4.2.0",
+ "which-module": "^2.0.0",
+ "y18n": "^4.0.0",
+ "yargs-parser": "^18.1.2"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/glob-all/node_modules/yargs-parser": {
+ "version": "18.1.3",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+ "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+ "license": "ISC",
+ "dependencies": {
+ "camelcase": "^5.0.0",
+ "decamelize": "^1.2.0"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/glob-parent": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+ "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+ "license": "ISC",
+ "dependencies": {
+ "is-glob": "^4.0.1"
+ },
+ "engines": {
+ "node": ">= 6"
+ }
+ },
+ "node_modules/globals": {
+ "version": "11.12.0",
+ "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+ "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/globby": {
+ "version": "14.0.2",
+ "resolved": "https://registry.npmjs.org/globby/-/globby-14.0.2.tgz",
+ "integrity": "sha512-s3Fq41ZVh7vbbe2PN3nrW7yC7U7MFVc5c98/iTl9c2GawNMKx/J648KQRW6WKkuU8GIbbh2IXfIRQjOZnXcTnw==",
+ "license": "MIT",
+ "dependencies": {
+ "@sindresorhus/merge-streams": "^2.1.0",
+ "fast-glob": "^3.3.2",
+ "ignore": "^5.2.4",
+ "path-type": "^5.0.0",
+ "slash": "^5.1.0",
+ "unicorn-magic": "^0.1.0"
+ },
+ "engines": {
+ "node": ">=18"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/globby/node_modules/slash": {
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz",
+ "integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=14.16"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/gonzales-pe": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-4.3.0.tgz",
+ "integrity": "sha512-otgSPpUmdWJ43VXyiNgEYE4luzHCL2pz4wQ0OnDluC6Eg4Ko3Vexy/SrSynglw/eR+OhkzmqFCZa/OFa/RgAOQ==",
+ "license": "MIT",
+ "dependencies": {
+ "minimist": "^1.2.5"
+ },
+ "bin": {
+ "gonzales": "bin/gonzales.js"
+ },
+ "engines": {
+ "node": ">=0.6.0"
+ }
+ },
+ "node_modules/good-listener": {
+ "version": "1.2.2",
+ "resolved": "https://registry.npmjs.org/good-listener/-/good-listener-1.2.2.tgz",
+ "integrity": "sha512-goW1b+d9q/HIwbVYZzZ6SsTr4IgE+WA44A0GmPIQstuOrgsFcT7VEJ48nmr9GaRtNu0XTKacFLGnBPAM6Afouw==",
+ "license": "MIT",
+ "dependencies": {
+ "delegate": "^3.1.2"
+ }
+ },
+ "node_modules/graceful-fs": {
+ "version": "4.2.11",
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+ "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+ "license": "ISC"
+ },
+ "node_modules/hasown": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+ "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+ "license": "MIT",
+ "dependencies": {
+ "function-bind": "^1.1.2"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ }
+ },
+ "node_modules/ignore": {
+ "version": "5.3.2",
+ "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+ "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
+ "license": "MIT",
+ "engines": {
+ "node": ">= 4"
+ }
+ },
+ "node_modules/inflight": {
+ "version": "1.0.6",
+ "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+ "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+ "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
+ "license": "ISC",
+ "dependencies": {
+ "once": "^1.3.0",
+ "wrappy": "1"
+ }
+ },
+ "node_modules/inherits": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+ "license": "ISC"
+ },
+ "node_modules/invariant": {
+ "version": "2.2.2",
+ "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz",
+ "integrity": "sha512-FUiAFCOgp7bBzHfa/fK+Uc/vqywvdN9Wg3CiTprLcE630mrhxjDS5MlBkHzeI6+bC/6bq9VX/hxBt05fPAT5WA==",
+ "license": "BSD-3-Clause",
+ "dependencies": {
+ "loose-envify": "^1.0.0"
+ }
+ },
+ "node_modules/is-binary-path": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+ "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+ "license": "MIT",
+ "dependencies": {
+ "binary-extensions": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/is-core-module": {
+ "version": "2.15.1",
+ "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz",
+ "integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==",
+ "license": "MIT",
+ "dependencies": {
+ "hasown": "^2.0.2"
+ },
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/is-extglob": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+ "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/is-fullwidth-code-point": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+ "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/is-glob": {
+ "version": "4.0.3",
+ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+ "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+ "license": "MIT",
+ "dependencies": {
+ "is-extglob": "^2.1.1"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/is-number": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+ "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=0.12.0"
+ }
+ },
+ "node_modules/isexe": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+ "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+ "license": "ISC"
+ },
+ "node_modules/jackspeak": {
+ "version": "3.4.3",
+ "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
+ "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
+ "license": "BlueOak-1.0.0",
+ "dependencies": {
+ "@isaacs/cliui": "^8.0.2"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/isaacs"
+ },
+ "optionalDependencies": {
+ "@pkgjs/parseargs": "^0.11.0"
+ }
+ },
+ "node_modules/js-tokens": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+ "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+ "license": "MIT"
+ },
+ "node_modules/jsesc": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz",
+ "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==",
+ "license": "MIT",
+ "bin": {
+ "jsesc": "bin/jsesc"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/json5": {
+ "version": "2.2.3",
+ "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+ "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+ "license": "MIT",
+ "bin": {
+ "json5": "lib/cli.js"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/jsonfile": {
+ "version": "6.1.0",
+ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+ "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+ "license": "MIT",
+ "dependencies": {
+ "universalify": "^2.0.0"
+ },
+ "optionalDependencies": {
+ "graceful-fs": "^4.1.6"
+ }
+ },
+ "node_modules/lazysizes": {
+ "version": "5.3.2",
+ "resolved": "https://registry.npmjs.org/lazysizes/-/lazysizes-5.3.2.tgz",
+ "integrity": "sha512-22UzWP+Vedi/sMeOr8O7FWimRVtiNJV2HCa+V8+peZOw6QbswN9k58VUhd7i6iK5bw5QkYrF01LJbeJe0PV8jg==",
+ "license": "MIT"
+ },
+ "node_modules/lilconfig": {
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.2.tgz",
+ "integrity": "sha512-eop+wDAvpItUys0FWkHIKeC9ybYrTGbU41U5K7+bttZZeohvnY7M9dZ5kB21GNWiFT2q1OoPTvncPCgSOVO5ow==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=14"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/antonk52"
+ }
+ },
+ "node_modules/locate-path": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+ "license": "MIT",
+ "dependencies": {
+ "p-locate": "^4.1.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/lodash": {
+ "version": "4.17.21",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+ "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+ "license": "MIT"
+ },
+ "node_modules/lodash.debounce": {
+ "version": "4.0.8",
+ "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
+ "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==",
+ "license": "MIT"
+ },
+ "node_modules/loose-envify": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+ "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+ "license": "MIT",
+ "dependencies": {
+ "js-tokens": "^3.0.0 || ^4.0.0"
+ },
+ "bin": {
+ "loose-envify": "cli.js"
+ }
+ },
+ "node_modules/lru-cache": {
+ "version": "5.1.1",
+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+ "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+ "license": "ISC",
+ "dependencies": {
+ "yallist": "^3.0.2"
+ }
+ },
+ "node_modules/make-dir": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+ "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+ "license": "MIT",
+ "dependencies": {
+ "pify": "^4.0.1",
+ "semver": "^5.6.0"
+ },
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/make-dir/node_modules/semver": {
+ "version": "5.7.2",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+ "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+ "license": "ISC",
+ "bin": {
+ "semver": "bin/semver"
+ }
+ },
+ "node_modules/merge2": {
+ "version": "1.4.1",
+ "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+ "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+ "license": "MIT",
+ "engines": {
+ "node": ">= 8"
+ }
+ },
+ "node_modules/micromatch": {
+ "version": "4.0.8",
+ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+ "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+ "license": "MIT",
+ "dependencies": {
+ "braces": "^3.0.3",
+ "picomatch": "^2.3.1"
+ },
+ "engines": {
+ "node": ">=8.6"
+ }
+ },
+ "node_modules/minimatch": {
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+ "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+ "license": "ISC",
+ "dependencies": {
+ "brace-expansion": "^1.1.7"
+ },
+ "engines": {
+ "node": "*"
+ }
+ },
+ "node_modules/minimist": {
+ "version": "1.2.8",
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+ "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+ "license": "MIT",
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/minipass": {
+ "version": "7.1.2",
+ "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+ "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+ "license": "ISC",
+ "engines": {
+ "node": ">=16 || 14 >=14.17"
+ }
+ },
+ "node_modules/modern-css-reset": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/modern-css-reset/-/modern-css-reset-1.4.0.tgz",
+ "integrity": "sha512-0crZmSFmrxkI7159rvQWjpDhy0u4+Awg/iOycJdlVn0RSeft/a+6BrQHR3IqvmdK25sqt0o6Z5Ap7cWgUee2rw==",
+ "license": "MIT"
+ },
+ "node_modules/ms": {
+ "version": "2.1.3",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+ "license": "MIT"
+ },
+ "node_modules/nanoid": {
+ "version": "3.3.8",
+ "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
+ "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/ai"
+ }
+ ],
+ "bin": {
+ "nanoid": "bin/nanoid.cjs"
+ },
+ "engines": {
+ "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+ }
+ },
+ "node_modules/node-releases": {
+ "version": "2.0.18",
+ "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz",
+ "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==",
+ "license": "MIT"
+ },
+ "node_modules/normalize-path": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+ "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/normalize-range": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
+ "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/object-assign": {
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+ "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+ "license": "MIT",
+ "peer": true,
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/once": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+ "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+ "license": "ISC",
+ "dependencies": {
+ "wrappy": "1"
+ }
+ },
+ "node_modules/p-limit": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+ "license": "MIT",
+ "dependencies": {
+ "p-try": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=6"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/p-locate": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+ "license": "MIT",
+ "dependencies": {
+ "p-limit": "^2.2.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/p-try": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+ "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/package-json-from-dist": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
+ "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
+ "license": "BlueOak-1.0.0"
+ },
+ "node_modules/path-exists": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+ "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/path-is-absolute": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+ "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/path-key": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+ "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/path-parse": {
+ "version": "1.0.7",
+ "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+ "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+ "license": "MIT"
+ },
+ "node_modules/path-scurry": {
+ "version": "1.11.1",
+ "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
+ "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
+ "license": "BlueOak-1.0.0",
+ "dependencies": {
+ "lru-cache": "^10.2.0",
+ "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+ },
+ "engines": {
+ "node": ">=16 || 14 >=14.18"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/isaacs"
+ }
+ },
+ "node_modules/path-scurry/node_modules/lru-cache": {
+ "version": "10.4.3",
+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+ "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+ "license": "ISC"
+ },
+ "node_modules/path-type": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/path-type/-/path-type-5.0.0.tgz",
+ "integrity": "sha512-5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=12"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/picocolors": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+ "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+ "license": "ISC"
+ },
+ "node_modules/picomatch": {
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+ "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=8.6"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/jonschlinkert"
+ }
+ },
+ "node_modules/pify": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+ "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/postcss": {
+ "version": "8.4.49",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz",
+ "integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==",
+ "funding": [
+ {
+ "type": "opencollective",
+ "url": "https://opencollective.com/postcss/"
+ },
+ {
+ "type": "tidelift",
+ "url": "https://tidelift.com/funding/github/npm/postcss"
+ },
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/ai"
+ }
+ ],
+ "license": "MIT",
+ "dependencies": {
+ "nanoid": "^3.3.7",
+ "picocolors": "^1.1.1",
+ "source-map-js": "^1.2.1"
+ },
+ "engines": {
+ "node": "^10 || ^12 || >=14"
+ }
+ },
+ "node_modules/postcss-cli": {
+ "version": "11.0.0",
+ "resolved": "https://registry.npmjs.org/postcss-cli/-/postcss-cli-11.0.0.tgz",
+ "integrity": "sha512-xMITAI7M0u1yolVcXJ9XTZiO9aO49mcoKQy6pCDFdMh9kGqhzLVpWxeD/32M/QBmkhcGypZFFOLNLmIW4Pg4RA==",
+ "license": "MIT",
+ "dependencies": {
+ "chokidar": "^3.3.0",
+ "dependency-graph": "^0.11.0",
+ "fs-extra": "^11.0.0",
+ "get-stdin": "^9.0.0",
+ "globby": "^14.0.0",
+ "picocolors": "^1.0.0",
+ "postcss-load-config": "^5.0.0",
+ "postcss-reporter": "^7.0.0",
+ "pretty-hrtime": "^1.0.3",
+ "read-cache": "^1.0.0",
+ "slash": "^5.0.0",
+ "yargs": "^17.0.0"
+ },
+ "bin": {
+ "postcss": "index.js"
+ },
+ "engines": {
+ "node": ">=18"
+ },
+ "peerDependencies": {
+ "postcss": "^8.0.0"
+ }
+ },
+ "node_modules/postcss-cli/node_modules/slash": {
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz",
+ "integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=14.16"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
+ },
+ "node_modules/postcss-load-config": {
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-5.1.0.tgz",
+ "integrity": "sha512-G5AJ+IX0aD0dygOE0yFZQ/huFFMSNneyfp0e3/bT05a8OfPC5FUoZRPfGijUdGOJNMewJiwzcHJXFafFzeKFVA==",
+ "funding": [
+ {
+ "type": "opencollective",
+ "url": "https://opencollective.com/postcss/"
+ },
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/ai"
+ }
+ ],
+ "license": "MIT",
+ "dependencies": {
+ "lilconfig": "^3.1.1",
+ "yaml": "^2.4.2"
+ },
+ "engines": {
+ "node": ">= 18"
+ },
+ "peerDependencies": {
+ "jiti": ">=1.21.0",
+ "postcss": ">=8.0.9",
+ "tsx": "^4.8.1"
+ },
+ "peerDependenciesMeta": {
+ "jiti": {
+ "optional": true
+ },
+ "postcss": {
+ "optional": true
+ },
+ "tsx": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/postcss-reporter": {
+ "version": "7.1.0",
+ "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-7.1.0.tgz",
+ "integrity": "sha512-/eoEylGWyy6/DOiMP5lmFRdmDKThqgn7D6hP2dXKJI/0rJSO1ADFNngZfDzxL0YAxFvws+Rtpuji1YIHj4mySA==",
+ "funding": [
+ {
+ "type": "opencollective",
+ "url": "https://opencollective.com/postcss/"
+ },
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/ai"
+ }
+ ],
+ "license": "MIT",
+ "dependencies": {
+ "picocolors": "^1.0.0",
+ "thenby": "^1.3.4"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "peerDependencies": {
+ "postcss": "^8.1.0"
+ }
+ },
+ "node_modules/postcss-selector-parser": {
+ "version": "6.1.2",
+ "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
+ "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+ "license": "MIT",
+ "dependencies": {
+ "cssesc": "^3.0.0",
+ "util-deprecate": "^1.0.2"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/postcss-value-parser": {
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
+ "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+ "license": "MIT"
+ },
+ "node_modules/prettier": {
+ "version": "3.4.1",
+ "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.4.1.tgz",
+ "integrity": "sha512-G+YdqtITVZmOJje6QkXQWzl3fSfMxFwm1tjTyo9exhkmWSqC4Yhd1+lug++IlR2mvRVAxEDDWYkQdeSztajqgg==",
"dev": true,
- "requires": {
+ "license": "MIT",
+ "bin": {
+ "prettier": "bin/prettier.cjs"
+ },
+ "engines": {
+ "node": ">=14"
+ },
+ "funding": {
+ "url": "https://github.com/prettier/prettier?sponsor=1"
+ }
+ },
+ "node_modules/pretty-hrtime": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
+ "integrity": "sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==",
+ "license": "MIT",
+ "engines": {
+ "node": ">= 0.8"
+ }
+ },
+ "node_modules/prop-types": {
+ "version": "15.8.1",
+ "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
+ "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
+ "license": "MIT",
+ "peer": true,
+ "dependencies": {
+ "loose-envify": "^1.4.0",
+ "object-assign": "^4.1.1",
+ "react-is": "^16.13.1"
+ }
+ },
+ "node_modules/purgecss": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/purgecss/-/purgecss-6.0.0.tgz",
+ "integrity": "sha512-s3EBxg5RSWmpqd0KGzNqPiaBbWDz1/As+2MzoYVGMqgDqRTLBhJW6sywfTBek7OwNfoS/6pS0xdtvChNhFj2cw==",
+ "license": "MIT",
+ "dependencies": {
+ "commander": "^12.0.0",
+ "glob": "^10.3.10",
+ "postcss": "^8.4.4",
+ "postcss-selector-parser": "^6.0.7"
+ },
+ "bin": {
+ "purgecss": "bin/purgecss.js"
+ }
+ },
+ "node_modules/purgecss-whitelister": {
+ "version": "2.4.0",
+ "resolved": "https://registry.npmjs.org/purgecss-whitelister/-/purgecss-whitelister-2.4.0.tgz",
+ "integrity": "sha512-O0jBUDtY9dU9tUT0vA1FvwFdkKDerxzteYaBV49JCbm+QJLFKMlIsf5Kp5cdbLatHQNjJtV8VB8eXtISoZL2Dg==",
+ "license": "MIT",
+ "dependencies": {
+ "glob-all": "^3.1.0",
+ "gonzales-pe": "^4.2.4",
+ "scss-parser": "1.0.3"
+ }
+ },
+ "node_modules/purgecss/node_modules/brace-expansion": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+ "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+ "license": "MIT",
+ "dependencies": {
+ "balanced-match": "^1.0.0"
+ }
+ },
+ "node_modules/purgecss/node_modules/commander": {
+ "version": "12.1.0",
+ "resolved": "https://registry.npmjs.org/commander/-/commander-12.1.0.tgz",
+ "integrity": "sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=18"
+ }
+ },
+ "node_modules/purgecss/node_modules/glob": {
+ "version": "10.4.5",
+ "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+ "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+ "license": "ISC",
+ "dependencies": {
+ "foreground-child": "^3.1.0",
+ "jackspeak": "^3.1.2",
+ "minimatch": "^9.0.4",
+ "minipass": "^7.1.2",
+ "package-json-from-dist": "^1.0.0",
+ "path-scurry": "^1.11.1"
+ },
+ "bin": {
+ "glob": "dist/esm/bin.mjs"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/isaacs"
+ }
+ },
+ "node_modules/purgecss/node_modules/minimatch": {
+ "version": "9.0.5",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+ "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+ "license": "ISC",
+ "dependencies": {
+ "brace-expansion": "^2.0.1"
+ },
+ "engines": {
+ "node": ">=16 || 14 >=14.17"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/isaacs"
+ }
+ },
+ "node_modules/queue-microtask": {
+ "version": "1.2.3",
+ "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+ "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/feross"
+ },
+ {
+ "type": "patreon",
+ "url": "https://www.patreon.com/feross"
+ },
+ {
+ "type": "consulting",
+ "url": "https://feross.org/support"
+ }
+ ],
+ "license": "MIT"
+ },
+ "node_modules/quicklink": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/quicklink/-/quicklink-2.3.0.tgz",
+ "integrity": "sha512-FyTanYArl5Gz2/C0ZjErvfFJtem/+d1RM4eK0jiXO6mL4Zjje+xsYtcK3ZtKX2Yb3HSfah5HekWrH2qhttYQjQ==",
+ "license": "Apache-2.0",
+ "dependencies": {
+ "route-manifest": "^1.0.0",
+ "throttles": "^1.0.0"
+ },
+ "peerDependencies": {
+ "react": "^16.8.0",
+ "react-dom": "^16.8.0"
+ }
+ },
+ "node_modules/react": {
+ "version": "16.14.0",
+ "resolved": "https://registry.npmjs.org/react/-/react-16.14.0.tgz",
+ "integrity": "sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==",
+ "license": "MIT",
+ "peer": true,
+ "dependencies": {
+ "loose-envify": "^1.1.0",
+ "object-assign": "^4.1.1",
+ "prop-types": "^15.6.2"
+ },
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/react-dom": {
+ "version": "16.14.0",
+ "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.14.0.tgz",
+ "integrity": "sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw==",
+ "license": "MIT",
+ "peer": true,
+ "dependencies": {
+ "loose-envify": "^1.1.0",
+ "object-assign": "^4.1.1",
+ "prop-types": "^15.6.2",
+ "scheduler": "^0.19.1"
+ },
+ "peerDependencies": {
+ "react": "^16.14.0"
+ }
+ },
+ "node_modules/react-is": {
+ "version": "16.13.1",
+ "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+ "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
+ "license": "MIT",
+ "peer": true
+ },
+ "node_modules/read-cache": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
+ "integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==",
+ "license": "MIT",
+ "dependencies": {
"pify": "^2.3.0"
}
},
- "readdirp": {
- "version": "3.6.0",
- "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
- "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
- "dev": true,
- "requires": {
- "picomatch": "^2.2.1"
+ "node_modules/read-cache/node_modules/pify": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+ "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/readdirp": {
+ "version": "3.6.0",
+ "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+ "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+ "license": "MIT",
+ "dependencies": {
+ "picomatch": "^2.2.1"
+ },
+ "engines": {
+ "node": ">=8.10.0"
+ }
+ },
+ "node_modules/regenerate": {
+ "version": "1.4.2",
+ "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
+ "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
+ "license": "MIT"
+ },
+ "node_modules/regenerate-unicode-properties": {
+ "version": "10.2.0",
+ "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.2.0.tgz",
+ "integrity": "sha512-DqHn3DwbmmPVzeKj9woBadqmXxLvQoQIwu7nopMc72ztvxVmVk2SBhSnx67zuye5TP+lJsb/TBQsjLKhnDf3MA==",
+ "license": "MIT",
+ "dependencies": {
+ "regenerate": "^1.4.2"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/regenerator-runtime": {
+ "version": "0.14.1",
+ "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
+ "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==",
+ "license": "MIT"
+ },
+ "node_modules/regenerator-transform": {
+ "version": "0.15.2",
+ "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz",
+ "integrity": "sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==",
+ "license": "MIT",
+ "dependencies": {
+ "@babel/runtime": "^7.8.4"
+ }
+ },
+ "node_modules/regexparam": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/regexparam/-/regexparam-1.3.0.tgz",
+ "integrity": "sha512-6IQpFBv6e5vz1QAqI+V4k8P2e/3gRrqfCJ9FI+O1FLQTO+Uz6RXZEZOPmTJ6hlGj7gkERzY5BRCv09whKP96/g==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/regexpu-core": {
+ "version": "6.2.0",
+ "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-6.2.0.tgz",
+ "integrity": "sha512-H66BPQMrv+V16t8xtmq+UC0CBpiTBA60V8ibS1QVReIp8T1z8hwFxqcGzm9K6lgsN7sB5edVH8a+ze6Fqm4weA==",
+ "license": "MIT",
+ "dependencies": {
+ "regenerate": "^1.4.2",
+ "regenerate-unicode-properties": "^10.2.0",
+ "regjsgen": "^0.8.0",
+ "regjsparser": "^0.12.0",
+ "unicode-match-property-ecmascript": "^2.0.0",
+ "unicode-match-property-value-ecmascript": "^2.1.0"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/regjsgen": {
+ "version": "0.8.0",
+ "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.8.0.tgz",
+ "integrity": "sha512-RvwtGe3d7LvWiDQXeQw8p5asZUmfU1G/l6WbUXeHta7Y2PEIvBTwH6E2EfmYUK8pxcxEdEmaomqyp0vZZ7C+3Q==",
+ "license": "MIT"
+ },
+ "node_modules/regjsparser": {
+ "version": "0.12.0",
+ "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.12.0.tgz",
+ "integrity": "sha512-cnE+y8bz4NhMjISKbgeVJtqNbtf5QpjZP+Bslo+UqkIt9QPnX9q095eiRRASJG1/tz6dlNr6Z5NsBiWYokp6EQ==",
+ "license": "BSD-2-Clause",
+ "dependencies": {
+ "jsesc": "~3.0.2"
+ },
+ "bin": {
+ "regjsparser": "bin/parser"
+ }
+ },
+ "node_modules/require-directory": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+ "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/require-main-filename": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+ "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+ "license": "ISC"
+ },
+ "node_modules/resolve": {
+ "version": "1.22.8",
+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
+ "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
+ "license": "MIT",
+ "dependencies": {
+ "is-core-module": "^2.13.0",
+ "path-parse": "^1.0.7",
+ "supports-preserve-symlinks-flag": "^1.0.0"
+ },
+ "bin": {
+ "resolve": "bin/resolve"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
+ }
+ },
+ "node_modules/reusify": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+ "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+ "license": "MIT",
+ "engines": {
+ "iojs": ">=1.0.0",
+ "node": ">=0.10.0"
+ }
+ },
+ "node_modules/rollup": {
+ "version": "4.27.4",
+ "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.27.4.tgz",
+ "integrity": "sha512-RLKxqHEMjh/RGLsDxAEsaLO3mWgyoU6x9w6n1ikAzet4B3gI2/3yP6PWY2p9QzRTh6MfEIXB3MwsOY0Iv3vNrw==",
+ "dev": true,
+ "license": "MIT",
+ "dependencies": {
+ "@types/estree": "1.0.6"
+ },
+ "bin": {
+ "rollup": "dist/bin/rollup"
+ },
+ "engines": {
+ "node": ">=18.0.0",
+ "npm": ">=8.0.0"
+ },
+ "optionalDependencies": {
+ "@rollup/rollup-android-arm-eabi": "4.27.4",
+ "@rollup/rollup-android-arm64": "4.27.4",
+ "@rollup/rollup-darwin-arm64": "4.27.4",
+ "@rollup/rollup-darwin-x64": "4.27.4",
+ "@rollup/rollup-freebsd-arm64": "4.27.4",
+ "@rollup/rollup-freebsd-x64": "4.27.4",
+ "@rollup/rollup-linux-arm-gnueabihf": "4.27.4",
+ "@rollup/rollup-linux-arm-musleabihf": "4.27.4",
+ "@rollup/rollup-linux-arm64-gnu": "4.27.4",
+ "@rollup/rollup-linux-arm64-musl": "4.27.4",
+ "@rollup/rollup-linux-powerpc64le-gnu": "4.27.4",
+ "@rollup/rollup-linux-riscv64-gnu": "4.27.4",
+ "@rollup/rollup-linux-s390x-gnu": "4.27.4",
+ "@rollup/rollup-linux-x64-gnu": "4.27.4",
+ "@rollup/rollup-linux-x64-musl": "4.27.4",
+ "@rollup/rollup-win32-arm64-msvc": "4.27.4",
+ "@rollup/rollup-win32-ia32-msvc": "4.27.4",
+ "@rollup/rollup-win32-x64-msvc": "4.27.4",
+ "fsevents": "~2.3.2"
+ }
+ },
+ "node_modules/route-manifest": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/route-manifest/-/route-manifest-1.0.0.tgz",
+ "integrity": "sha512-qn0xJr4nnF4caj0erOLLAHYiNyzqhzpUbgDQcEHrmBoG4sWCDLnIXLH7VccNSxe9cWgbP2Kw/OjME+eH3CeRSA==",
+ "license": "MIT",
+ "dependencies": {
+ "regexparam": "^1.3.0"
+ },
+ "engines": {
+ "node": ">= 6"
+ }
+ },
+ "node_modules/run-parallel": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+ "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+ "funding": [
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/feross"
+ },
+ {
+ "type": "patreon",
+ "url": "https://www.patreon.com/feross"
+ },
+ {
+ "type": "consulting",
+ "url": "https://feross.org/support"
+ }
+ ],
+ "license": "MIT",
+ "dependencies": {
+ "queue-microtask": "^1.2.2"
+ }
+ },
+ "node_modules/scheduler": {
+ "version": "0.19.1",
+ "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz",
+ "integrity": "sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==",
+ "license": "MIT",
+ "peer": true,
+ "dependencies": {
+ "loose-envify": "^1.1.0",
+ "object-assign": "^4.1.1"
+ }
+ },
+ "node_modules/scss-parser": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/scss-parser/-/scss-parser-1.0.3.tgz",
+ "integrity": "sha512-XQKCfOJERmhn1yoNRUyxv9wgkf4DIv29Jk0m4FiZforeiCmGxrby8K3not7tQ8GK1yvtd9N0OnNimNetJ8V+zQ==",
+ "license": "SEE LICENSE IN README",
+ "dependencies": {
+ "invariant": "2.2.2",
+ "lodash": "^4.17.4"
+ },
+ "engines": {
+ "node": ">=6.0.0"
+ }
+ },
+ "node_modules/select": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/select/-/select-1.1.2.tgz",
+ "integrity": "sha512-OwpTSOfy6xSs1+pwcNrv0RBMOzI39Lp3qQKUTPVVPRjCdNa5JH/oPRiqsesIskK8TVgmRiHwO4KXlV2Li9dANA==",
+ "license": "MIT"
+ },
+ "node_modules/semver": {
+ "version": "6.3.1",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+ "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+ "license": "ISC",
+ "bin": {
+ "semver": "bin/semver.js"
}
},
- "require-directory": {
- "version": "2.1.1",
- "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
- "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
- "dev": true
+ "node_modules/set-blocking": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+ "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
+ "license": "ISC"
},
- "reusify": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
- "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
- "dev": true
+ "node_modules/shebang-command": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+ "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+ "license": "MIT",
+ "dependencies": {
+ "shebang-regex": "^3.0.0"
+ },
+ "engines": {
+ "node": ">=8"
+ }
},
- "run-parallel": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
- "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
- "dev": true,
- "requires": {
- "queue-microtask": "^1.2.2"
+ "node_modules/shebang-regex": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+ "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=8"
}
},
- "slash": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz",
- "integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==",
- "dev": true
+ "node_modules/signal-exit": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+ "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+ "license": "ISC",
+ "engines": {
+ "node": ">=14"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/isaacs"
+ }
+ },
+ "node_modules/slash": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
+ "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=6"
+ }
},
- "source-map-js": {
+ "node_modules/source-map-js": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
"integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
- "dev": true
+ "license": "BSD-3-Clause",
+ "engines": {
+ "node": ">=0.10.0"
+ }
},
- "string-width": {
+ "node_modules/string-width": {
"version": "4.2.3",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
"integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
- "dev": true,
- "requires": {
+ "license": "MIT",
+ "dependencies": {
"emoji-regex": "^8.0.0",
"is-fullwidth-code-point": "^3.0.0",
"strip-ansi": "^6.0.1"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/string-width-cjs": {
+ "name": "string-width",
+ "version": "4.2.3",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+ "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+ "license": "MIT",
+ "dependencies": {
+ "emoji-regex": "^8.0.0",
+ "is-fullwidth-code-point": "^3.0.0",
+ "strip-ansi": "^6.0.1"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/strip-ansi": {
+ "version": "6.0.1",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+ "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+ "license": "MIT",
+ "dependencies": {
+ "ansi-regex": "^5.0.1"
+ },
+ "engines": {
+ "node": ">=8"
}
},
- "strip-ansi": {
+ "node_modules/strip-ansi-cjs": {
+ "name": "strip-ansi",
"version": "6.0.1",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
"integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
- "dev": true,
- "requires": {
+ "license": "MIT",
+ "dependencies": {
"ansi-regex": "^5.0.1"
+ },
+ "engines": {
+ "node": ">=8"
+ }
+ },
+ "node_modules/supports-preserve-symlinks-flag": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+ "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+ "license": "MIT",
+ "engines": {
+ "node": ">= 0.4"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/ljharb"
}
},
- "thenby": {
+ "node_modules/thenby": {
"version": "1.3.4",
"resolved": "https://registry.npmjs.org/thenby/-/thenby-1.3.4.tgz",
"integrity": "sha512-89Gi5raiWA3QZ4b2ePcEwswC3me9JIg+ToSgtE0JWeCynLnLxNr/f9G+xfo9K+Oj4AFdom8YNJjibIARTJmapQ==",
- "dev": true
+ "license": "Apache-2.0"
+ },
+ "node_modules/throttles": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/throttles/-/throttles-1.0.1.tgz",
+ "integrity": "sha512-fab7Xg+zELr9KOv4fkaBoe/b3L0GMGLd0IBSCn16GoE/Qx6/OfCr1eGNyEcDU2pUA79qQfZ8kPQWlRuok4YwTw==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=6"
+ }
+ },
+ "node_modules/thulite": {
+ "version": "2.5.0",
+ "resolved": "https://registry.npmjs.org/thulite/-/thulite-2.5.0.tgz",
+ "integrity": "sha512-Qu6WZ9ea9/3hVhiQ9s14sbaa2CCVbM5qhdmTBTFVOrKlxFmn34S77OrToiixO2Tb2jQE3lwzR/D4QB50BUSIQA==",
+ "license": "MIT",
+ "dependencies": {
+ "@thulite/core": "^1.4.0"
+ },
+ "engines": {
+ "node": ">=20.11.0"
+ }
+ },
+ "node_modules/tiny-emitter": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
+ "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==",
+ "license": "MIT"
},
- "to-regex-range": {
+ "node_modules/to-regex-range": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
- "dev": true,
- "requires": {
+ "license": "MIT",
+ "dependencies": {
"is-number": "^7.0.0"
+ },
+ "engines": {
+ "node": ">=8.0"
+ }
+ },
+ "node_modules/unicode-canonical-property-names-ecmascript": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.1.tgz",
+ "integrity": "sha512-dA8WbNeb2a6oQzAQ55YlT5vQAWGV9WXOsi3SskE3bcCdM0P4SDd+24zS/OCacdRq5BkdsRj9q3Pg6YyQoxIGqg==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/unicode-match-property-ecmascript": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
+ "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
+ "license": "MIT",
+ "dependencies": {
+ "unicode-canonical-property-names-ecmascript": "^2.0.0",
+ "unicode-property-aliases-ecmascript": "^2.0.0"
+ },
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/unicode-match-property-value-ecmascript": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.2.0.tgz",
+ "integrity": "sha512-4IehN3V/+kkr5YeSSDDQG8QLqO26XpL2XP3GQtqwlT/QYSECAwFztxVHjlbh0+gjJ3XmNLS0zDsbgs9jWKExLg==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=4"
+ }
+ },
+ "node_modules/unicode-property-aliases-ecmascript": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz",
+ "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==",
+ "license": "MIT",
+ "engines": {
+ "node": ">=4"
}
},
- "unicorn-magic": {
+ "node_modules/unicorn-magic": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.1.0.tgz",
"integrity": "sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==",
- "dev": true
+ "license": "MIT",
+ "engines": {
+ "node": ">=18"
+ },
+ "funding": {
+ "url": "https://github.com/sponsors/sindresorhus"
+ }
},
- "universalify": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
- "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
- "dev": true
+ "node_modules/universalify": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+ "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+ "license": "MIT",
+ "engines": {
+ "node": ">= 10.0.0"
+ }
},
- "update-browserslist-db": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz",
- "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==",
+ "node_modules/update-browserslist-db": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz",
+ "integrity": "sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==",
+ "funding": [
+ {
+ "type": "opencollective",
+ "url": "https://opencollective.com/browserslist"
+ },
+ {
+ "type": "tidelift",
+ "url": "https://tidelift.com/funding/github/npm/browserslist"
+ },
+ {
+ "type": "github",
+ "url": "https://github.com/sponsors/ai"
+ }
+ ],
+ "license": "MIT",
+ "dependencies": {
+ "escalade": "^3.2.0",
+ "picocolors": "^1.1.0"
+ },
+ "bin": {
+ "update-browserslist-db": "cli.js"
+ },
+ "peerDependencies": {
+ "browserslist": ">= 4.21.0"
+ }
+ },
+ "node_modules/util-deprecate": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+ "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+ "license": "MIT"
+ },
+ "node_modules/vite": {
+ "version": "6.0.1",
+ "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.1.tgz",
+ "integrity": "sha512-Ldn6gorLGr4mCdFnmeAOLweJxZ34HjKnDm4HGo6P66IEqTxQb36VEdFJQENKxWjupNfoIjvRUnswjn1hpYEpjQ==",
"dev": true,
- "requires": {
- "escalade": "^3.1.2",
- "picocolors": "^1.0.1"
+ "license": "MIT",
+ "dependencies": {
+ "esbuild": "^0.24.0",
+ "postcss": "^8.4.49",
+ "rollup": "^4.23.0"
+ },
+ "bin": {
+ "vite": "bin/vite.js"
+ },
+ "engines": {
+ "node": "^18.0.0 || ^20.0.0 || >=22.0.0"
+ },
+ "funding": {
+ "url": "https://github.com/vitejs/vite?sponsor=1"
+ },
+ "optionalDependencies": {
+ "fsevents": "~2.3.3"
+ },
+ "peerDependencies": {
+ "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0",
+ "jiti": ">=1.21.0",
+ "less": "*",
+ "lightningcss": "^1.21.0",
+ "sass": "*",
+ "sass-embedded": "*",
+ "stylus": "*",
+ "sugarss": "*",
+ "terser": "^5.16.0",
+ "tsx": "^4.8.1",
+ "yaml": "^2.4.2"
+ },
+ "peerDependenciesMeta": {
+ "@types/node": {
+ "optional": true
+ },
+ "jiti": {
+ "optional": true
+ },
+ "less": {
+ "optional": true
+ },
+ "lightningcss": {
+ "optional": true
+ },
+ "sass": {
+ "optional": true
+ },
+ "sass-embedded": {
+ "optional": true
+ },
+ "stylus": {
+ "optional": true
+ },
+ "sugarss": {
+ "optional": true
+ },
+ "terser": {
+ "optional": true
+ },
+ "tsx": {
+ "optional": true
+ },
+ "yaml": {
+ "optional": true
+ }
+ }
+ },
+ "node_modules/which": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+ "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+ "license": "ISC",
+ "dependencies": {
+ "isexe": "^2.0.0"
+ },
+ "bin": {
+ "node-which": "bin/node-which"
+ },
+ "engines": {
+ "node": ">= 8"
}
},
- "wrap-ansi": {
+ "node_modules/which-module": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz",
+ "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==",
+ "license": "ISC"
+ },
+ "node_modules/wrap-ansi": {
"version": "7.0.0",
"resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
"integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
- "dev": true,
- "requires": {
+ "license": "MIT",
+ "dependencies": {
+ "ansi-styles": "^4.0.0",
+ "string-width": "^4.1.0",
+ "strip-ansi": "^6.0.0"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+ }
+ },
+ "node_modules/wrap-ansi-cjs": {
+ "name": "wrap-ansi",
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+ "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+ "license": "MIT",
+ "dependencies": {
"ansi-styles": "^4.0.0",
"string-width": "^4.1.0",
"strip-ansi": "^6.0.0"
+ },
+ "engines": {
+ "node": ">=10"
+ },
+ "funding": {
+ "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
}
},
- "y18n": {
+ "node_modules/wrappy": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+ "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+ "license": "ISC"
+ },
+ "node_modules/y18n": {
"version": "5.0.8",
"resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
"integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
- "dev": true
- },
- "yaml": {
- "version": "2.3.4",
- "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.4.tgz",
- "integrity": "sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA==",
- "dev": true
- },
- "yargs": {
- "version": "17.5.1",
- "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz",
- "integrity": "sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==",
- "dev": true,
- "requires": {
- "cliui": "^7.0.2",
+ "license": "ISC",
+ "engines": {
+ "node": ">=10"
+ }
+ },
+ "node_modules/yallist": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+ "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+ "license": "ISC"
+ },
+ "node_modules/yaml": {
+ "version": "2.6.1",
+ "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.6.1.tgz",
+ "integrity": "sha512-7r0XPzioN/Q9kXBro/XPnA6kznR73DHq+GXh5ON7ZozRO6aMjbmiBuKste2wslTFkC5d1dw0GooOCepZXJ2SAg==",
+ "license": "ISC",
+ "bin": {
+ "yaml": "bin.mjs"
+ },
+ "engines": {
+ "node": ">= 14"
+ }
+ },
+ "node_modules/yargs": {
+ "version": "17.7.2",
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
+ "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
+ "license": "MIT",
+ "dependencies": {
+ "cliui": "^8.0.1",
"escalade": "^3.1.1",
"get-caller-file": "^2.0.5",
"require-directory": "^2.1.1",
"string-width": "^4.2.3",
"y18n": "^5.0.5",
- "yargs-parser": "^21.0.0"
+ "yargs-parser": "^21.1.1"
+ },
+ "engines": {
+ "node": ">=12"
}
},
- "yargs-parser": {
- "version": "21.0.1",
- "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.1.tgz",
- "integrity": "sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==",
- "dev": true
+ "node_modules/yargs-parser": {
+ "version": "21.1.1",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+ "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+ "license": "ISC",
+ "engines": {
+ "node": ">=12"
+ }
}
}
}
diff --git a/docs/package.json b/docs/package.json
index 9720854bf00..801971d41e2 100755
--- a/docs/package.json
+++ b/docs/package.json
@@ -1,7 +1,29 @@
{
+ "name": "doks",
+ "version": "0.0.0",
+ "description": "Doks theme",
+ "author": "Thulite",
+ "license": "MIT",
+ "scripts": {
+ "create": "hugo new",
+ "dev": "hugo server --disableFastRender --noHTTPCache",
+ "format": "prettier **/** -w -c",
+ "build": "hugo --minify --gc",
+ "preview": "vite preview --outDir public"
+ },
+ "dependencies": {
+ "@thulite/doks-core": "^1.8.0",
+ "@thulite/images": "^3.3.0",
+ "@thulite/inline-svg": "^1.1.0",
+ "@thulite/seo": "^2.4.1",
+ "@tabler/icons": "^3.12.0",
+ "thulite": "^2.5.0"
+ },
"devDependencies": {
- "postcss": "8.4.47",
- "autoprefixer": "10.4.20",
- "postcss-cli": "11.0.0"
+ "prettier": "^3.3.3",
+ "vite": "^6.0.0"
+ },
+ "engines": {
+ "node": ">=20.11.0"
}
-}
+}
\ No newline at end of file
diff --git a/docs/static/.gitkeep b/docs/static/.gitkeep
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/docs/static/fonts/worksans/work-sans-v19-latin-500.woff2 b/docs/static/fonts/worksans/work-sans-v19-latin-500.woff2
new file mode 100644
index 00000000000..f400e01be45
Binary files /dev/null and b/docs/static/fonts/worksans/work-sans-v19-latin-500.woff2 differ
diff --git a/docs/static/fonts/worksans/work-sans-v19-latin-regular.woff2 b/docs/static/fonts/worksans/work-sans-v19-latin-regular.woff2
new file mode 100644
index 00000000000..a701d033994
Binary files /dev/null and b/docs/static/fonts/worksans/work-sans-v19-latin-regular.woff2 differ
diff --git a/dojo/__init__.py b/dojo/__init__.py
index 9572cd89329..d6ab484dc20 100755
--- a/dojo/__init__.py
+++ b/dojo/__init__.py
@@ -4,6 +4,6 @@
# Django starts so that shared_task will use this app.
from .celery import app as celery_app # noqa: F401
-__version__ = "2.39.4"
+__version__ = "2.41.3"
__url__ = "https://github.com/DefectDojo/django-DefectDojo"
__docs__ = "https://documentation.defectdojo.com"
diff --git a/dojo/api_v2/prefetch/prefetcher.py b/dojo/api_v2/prefetch/prefetcher.py
index 917afd2a048..1c45e309dce 100755
--- a/dojo/api_v2/prefetch/prefetcher.py
+++ b/dojo/api_v2/prefetch/prefetcher.py
@@ -24,6 +24,7 @@ def _build_serializers():
Returns:
dict[model, serializer]: map of model to their serializer
+
"""
def _is_model_serializer(obj):
@@ -61,6 +62,7 @@ def _find_serializer(self, field_type):
Returns:
rest_framework.serializers.ModelSerializer: The serializer if one has been found or None
+
"""
# If the type is represented in the map then return the serializer
if field_type in self._serializers:
@@ -80,6 +82,7 @@ def _prefetch(self, entry, fields_to_fetch):
Args:
entry (ModelInstance): Instance of a model as returned by a django queryset
field_to_fetch (list[string]): fields to prefetch
+
"""
for field_to_fetch in fields_to_fetch:
# Get the field from the instance
diff --git a/dojo/api_v2/prefetch/utils.py b/dojo/api_v2/prefetch/utils.py
index 5e588e03ce8..eefb1b642ec 100755
--- a/dojo/api_v2/prefetch/utils.py
+++ b/dojo/api_v2/prefetch/utils.py
@@ -12,6 +12,7 @@ def _is_many_to_many_relation(field):
Returns:
bool: true if the field is a many-to-many relationship
+
"""
return isinstance(field, related.ManyToManyDescriptor)
@@ -27,6 +28,7 @@ def _is_one_to_one_relation(field):
Returns:
bool: true if the field is a one-to-one relationship
+
"""
return isinstance(field, related.ForwardManyToOneDescriptor)
@@ -38,6 +40,7 @@ def _get_prefetchable_fields(serializer):
Args:
serializer (Serializer): [description]
+
"""
def _is_field_prefetchable(field):
diff --git a/dojo/api_v2/serializers.py b/dojo/api_v2/serializers.py
index 499289d83fc..708d024e847 100755
--- a/dojo/api_v2/serializers.py
+++ b/dojo/api_v2/serializers.py
@@ -1,9 +1,9 @@
+import collections
import json
import logging
import os
import re
from datetime import datetime
-from typing import List
import six
import tagulous
@@ -284,10 +284,10 @@ def _pop_tags(self, validated_data):
return (to_be_tagged, validated_data)
-class RequestResponseDict(list):
+class RequestResponseDict(collections.UserList):
def __init__(self, *args, **kwargs):
pretty_print = kwargs.pop("pretty_print", True)
- list.__init__(self, *args, **kwargs)
+ collections.UserList.__init__(self, *args, **kwargs)
self.pretty_print = pretty_print
def __add__(self, rhs):
@@ -372,10 +372,7 @@ def to_representation(self, value):
if not isinstance(value, RequestResponseDict):
if not isinstance(value, list):
# this will trigger when a queryset is found...
- if self.order_by:
- burps = value.all().order_by(*self.order_by)
- else:
- burps = value.all()
+ burps = value.all().order_by(*self.order_by) if self.order_by else value.all()
value = [
{
"request": burp.get_request(),
@@ -420,6 +417,51 @@ class Meta:
fields = "__all__"
+class MetadataSerializer(serializers.Serializer):
+ name = serializers.CharField(max_length=120)
+ value = serializers.CharField(max_length=300)
+
+
+class MetaMainSerializer(serializers.Serializer):
+ id = serializers.IntegerField(read_only=True)
+
+ product = serializers.PrimaryKeyRelatedField(
+ queryset=Product.objects.all(),
+ required=False,
+ default=None,
+ allow_null=True,
+ )
+ endpoint = serializers.PrimaryKeyRelatedField(
+ queryset=Endpoint.objects.all(),
+ required=False,
+ default=None,
+ allow_null=True,
+ )
+ finding = serializers.PrimaryKeyRelatedField(
+ queryset=Finding.objects.all(),
+ required=False,
+ default=None,
+ allow_null=True,
+ )
+ metadata = MetadataSerializer(many=True)
+
+ def validate(self, data):
+ product_id = data.get("product", None)
+ endpoint_id = data.get("endpoint", None)
+ finding_id = data.get("finding", None)
+ metadata = data.get("metadata")
+
+ for item in metadata:
+ # this will only verify that one and only one of product, endpoint, or finding is passed...
+ DojoMeta(product=product_id,
+ endpoint=endpoint_id,
+ finding=finding_id,
+ name=item.get("name"),
+ value=item.get("value")).clean()
+
+ return data
+
+
class ProductMetaSerializer(serializers.ModelSerializer):
class Meta:
model = DojoMeta
@@ -510,10 +552,7 @@ def update(self, instance, validated_data):
return instance
def create(self, validated_data):
- if "password" in validated_data:
- password = validated_data.pop("password")
- else:
- password = None
+ password = validated_data.pop("password", None)
new_configuration_permissions = None
if (
@@ -539,10 +578,7 @@ def create(self, validated_data):
return user
def validate(self, data):
- if self.instance is not None:
- instance_is_superuser = self.instance.is_superuser
- else:
- instance_is_superuser = False
+ instance_is_superuser = self.instance.is_superuser if self.instance is not None else False
data_is_superuser = data.get("is_superuser", False)
if not self.context["request"].user.is_superuser and (
instance_is_superuser or data_is_superuser
@@ -806,20 +842,8 @@ class Meta:
def validate(self, data):
if file := data.get("file"):
- ext = os.path.splitext(file.name)[1] # [0] returns path+filename
- valid_extensions = settings.FILE_UPLOAD_TYPES
- if ext.lower() not in valid_extensions:
- if accepted_extensions := f"{', '.join(valid_extensions)}":
- msg = (
- "Unsupported extension. Supported extensions are as "
- f"follows: {accepted_extensions}"
- )
- else:
- msg = (
- "File uploads are prohibited due to the list of acceptable "
- "file extensions being empty"
- )
- raise ValidationError(msg)
+ # the clean will validate the file extensions and raise a Validation error if the extensions are not accepted
+ FileUpload(title=file.name, file=file).clean()
return data
return None
@@ -1187,7 +1211,7 @@ class Meta:
def validate(self, data):
- if not self.context["request"].method == "PATCH":
+ if self.context["request"].method != "PATCH":
if "product" not in data:
msg = "Product is required"
raise serializers.ValidationError(msg)
@@ -1303,6 +1327,11 @@ def validate(self, data):
msg = "Either engagement or finding or finding_group has to be set."
raise serializers.ValidationError(msg)
+ if finding:
+ if (linked_finding := jira_helper.jira_already_linked(finding, data.get("jira_key"), data.get("jira_id"))) is not None:
+ msg = "JIRA issue " + data.get("jira_key") + " already linked to " + reverse("view_finding", args=(linked_finding.id,))
+ raise serializers.ValidationError(msg)
+
return data
@@ -1519,7 +1548,7 @@ def get_engagement(self, obj):
)
def validate(self, data):
- def validate_findings_have_same_engagement(finding_objects: List[Finding]):
+ def validate_findings_have_same_engagement(finding_objects: list[Finding]):
engagements = finding_objects.values_list("test__engagement__id", flat=True).distinct().count()
if engagements > 1:
msg = "You are not permitted to add findings from multiple engagements"
@@ -2080,7 +2109,7 @@ def get_findings_count(self, obj) -> int:
return obj.findings_count
# TODO: maybe extend_schema_field is needed here?
- # def get_findings_list(self, obj) -> List[int]:
+ # def get_findings_list(self, obj) -> list[int]:
# return obj.open_findings_list
@@ -2253,7 +2282,7 @@ def setup_common_context(self, data: dict) -> dict:
"""
context = dict(data)
# update some vars
- context["scan"] = data.pop("file", None)
+ context["scan"] = data.pop("file")
if context.get("auto_create_context"):
environment = Development_Environment.objects.get_or_create(name=data.get("environment", "Development"))[0]
@@ -2295,6 +2324,13 @@ def setup_common_context(self, data: dict) -> dict:
if context.get("scan_date")
else None
)
+
+ # engagement end date was not being used at all and so target_end would also turn into None
+ # in this case, do not want to change target_end unless engagement_end exists
+ eng_end_date = context.get("engagement_end_date")
+ if eng_end_date:
+ context["target_end"] = context.get("engagement_end_date")
+
return context
@@ -2754,6 +2790,11 @@ class ReportGenerateSerializer(serializers.Serializer):
)
+class EngagementUpdateJiraEpicSerializer(serializers.Serializer):
+ epic_name = serializers.CharField(required=False, max_length=200)
+ epic_priority = serializers.CharField(required=False, allow_null=True)
+
+
class TagSerializer(serializers.Serializer):
tags = TagListSerializerField(required=True)
diff --git a/dojo/api_v2/views.py b/dojo/api_v2/views.py
index b75f745824b..1b10308c3ab 100755
--- a/dojo/api_v2/views.py
+++ b/dojo/api_v2/views.py
@@ -517,6 +517,10 @@ def notes(self, request, pk=None):
new_note.errors, status=status.HTTP_400_BAD_REQUEST,
)
+ notes = engagement.notes.filter(note_type=note_type).first()
+ if notes and note_type and note_type.is_single:
+ return Response("Only one instance of this note_type allowed on an engagement.", status=status.HTTP_400_BAD_REQUEST)
+
author = request.user
note = Notes(
entry=entry,
@@ -653,6 +657,36 @@ def download_file(self, request, file_id, pk=None):
# send file
return generate_file_response(file_object)
+ @extend_schema(
+ request=serializers.EngagementUpdateJiraEpicSerializer,
+ responses={status.HTTP_200_OK: serializers.EngagementUpdateJiraEpicSerializer},
+ )
+ @action(
+ detail=True, methods=["post"], permission_classes=[IsAuthenticated],
+ )
+ def update_jira_epic(self, request, pk=None):
+ engagement = self.get_object()
+ try:
+
+ if engagement.has_jira_issue:
+ jira_helper.update_epic(engagement, **request.data)
+ response = Response(
+ {"info": "Jira Epic update query sent"},
+ status=status.HTTP_200_OK,
+ )
+ else:
+ jira_helper.add_epic(engagement, **request.data)
+ response = Response(
+ {"info": "Jira Epic create query sent"},
+ status=status.HTTP_200_OK,
+ )
+ return response
+ except ValidationError:
+ return Response(
+ {"error": "Bad Request!"},
+ status=status.HTTP_400_BAD_REQUEST,
+ )
+
# @extend_schema_view(**schema_with_prefetch())
# Nested models with prefetch make the response schema too long for Swagger UI
@@ -1090,6 +1124,11 @@ def notes(self, request, pk=None):
new_note.errors, status=status.HTTP_400_BAD_REQUEST,
)
+ if finding.notes:
+ notes = finding.notes.filter(note_type=note_type).first()
+ if notes and note_type and note_type.is_single:
+ return Response("Only one instance of this note_type allowed on a finding.", status=status.HTTP_400_BAD_REQUEST)
+
author = request.user
note = Notes(
entry=entry,
@@ -1493,9 +1532,7 @@ def metadata(self, request, pk=None):
return self._get_metadata(request, finding)
if request.method == "POST":
return self._add_metadata(request, finding)
- if request.method == "PUT":
- return self._edit_metadata(request, finding)
- if request.method == "PATCH":
+ if request.method in ["PUT", "PATCH"]:
return self._edit_metadata(request, finding)
if request.method == "DELETE":
return self._remove_metadata(request, finding)
@@ -1662,6 +1699,61 @@ class DojoMetaViewSet(
def get_queryset(self):
return get_authorized_dojo_meta(Permissions.Product_View)
+ @extend_schema(
+ methods=["post", "patch"],
+ request=serializers.MetaMainSerializer,
+ responses={status.HTTP_200_OK: serializers.MetaMainSerializer},
+ filters=False,
+ )
+ @action(
+ detail=False, methods=["post", "patch"], pagination_class=None,
+ )
+ def batch(self, request, pk=None):
+ serialized_data = serializers.MetaMainSerializer(data=request.data)
+ if serialized_data.is_valid(raise_exception=True):
+ if request.method == "POST":
+ self.process_post(request.data)
+ if request.method == "PATCH":
+ self.process_patch(request.data)
+
+ return Response(status=status.HTTP_201_CREATED, data=serialized_data.data)
+
+ def process_post(self: object, data: dict):
+ product = Product.objects.filter(id=data.get("product")).first()
+ finding = Finding.objects.filter(id=data.get("finding")).first()
+ endpoint = Endpoint.objects.filter(id=data.get("endpoint")).first()
+ metalist = data.get("metadata")
+ for metadata in metalist:
+ try:
+ DojoMeta.objects.create(
+ product=product,
+ finding=finding,
+ endpoint=endpoint,
+ name=metadata.get("name"),
+ value=metadata.get("value"),
+ )
+ except (IntegrityError) as ex: # this should not happen as the data was validated in the batch call
+ raise ValidationError(str(ex))
+
+ def process_patch(self: object, data: dict):
+ product = Product.objects.filter(id=data.get("product")).first()
+ finding = Finding.objects.filter(id=data.get("finding")).first()
+ endpoint = Endpoint.objects.filter(id=data.get("endpoint")).first()
+ metalist = data.get("metadata")
+ for metadata in metalist:
+ dojometa = DojoMeta.objects.filter(product=product, finding=finding, endpoint=endpoint, name=metadata.get("name"))
+ if dojometa:
+ try:
+ dojometa.update(
+ name=metadata.get("name"),
+ value=metadata.get("value"),
+ )
+ except (IntegrityError) as ex:
+ raise ValidationError(str(ex))
+ else:
+ msg = f"Metadata {metadata.get('name')} not found for object."
+ raise ValidationError(msg)
+
@extend_schema_view(**schema_with_prefetch())
class ProductViewSet(
@@ -2105,6 +2197,10 @@ def notes(self, request, pk=None):
new_note.errors, status=status.HTTP_400_BAD_REQUEST,
)
+ notes = test.notes.filter(note_type=note_type).first()
+ if notes and note_type and note_type.is_single:
+ return Response("Only one instance of this note_type allowed on a test.", status=status.HTTP_400_BAD_REQUEST)
+
author = request.user
note = Notes(
entry=entry,
@@ -2864,24 +2960,15 @@ def report_generate(request, obj, options):
if eng.name:
engagement_name = eng.name
engagement_target_start = eng.target_start
- if eng.target_end:
- engagement_target_end = eng.target_end
- else:
- engagement_target_end = "ongoing"
+ engagement_target_end = eng.target_end or "ongoing"
if eng.test_set.all():
for t in eng.test_set.all():
test_type_name = t.test_type.name
if t.environment:
test_environment_name = t.environment.name
test_target_start = t.target_start
- if t.target_end:
- test_target_end = t.target_end
- else:
- test_target_end = "ongoing"
- if eng.test_strategy:
- test_strategy_ref = eng.test_strategy
- else:
- test_strategy_ref = ""
+ test_target_end = t.target_end or "ongoing"
+ test_strategy_ref = eng.test_strategy or ""
total_findings = len(findings.qs.all())
elif type(obj).__name__ == "Product":
@@ -2891,20 +2978,14 @@ def report_generate(request, obj, options):
if eng.name:
engagement_name = eng.name
engagement_target_start = eng.target_start
- if eng.target_end:
- engagement_target_end = eng.target_end
- else:
- engagement_target_end = "ongoing"
+ engagement_target_end = eng.target_end or "ongoing"
if eng.test_set.all():
for t in eng.test_set.all():
test_type_name = t.test_type.name
if t.environment:
test_environment_name = t.environment.name
- if eng.test_strategy:
- test_strategy_ref = eng.test_strategy
- else:
- test_strategy_ref = ""
+ test_strategy_ref = eng.test_strategy or ""
total_findings = len(findings.qs.all())
elif type(obj).__name__ == "Engagement":
@@ -2912,38 +2993,26 @@ def report_generate(request, obj, options):
if eng.name:
engagement_name = eng.name
engagement_target_start = eng.target_start
- if eng.target_end:
- engagement_target_end = eng.target_end
- else:
- engagement_target_end = "ongoing"
+ engagement_target_end = eng.target_end or "ongoing"
if eng.test_set.all():
for t in eng.test_set.all():
test_type_name = t.test_type.name
if t.environment:
test_environment_name = t.environment.name
- if eng.test_strategy:
- test_strategy_ref = eng.test_strategy
- else:
- test_strategy_ref = ""
+ test_strategy_ref = eng.test_strategy or ""
total_findings = len(findings.qs.all())
elif type(obj).__name__ == "Test":
t = obj
test_type_name = t.test_type.name
test_target_start = t.target_start
- if t.target_end:
- test_target_end = t.target_end
- else:
- test_target_end = "ongoing"
+ test_target_end = t.target_end or "ongoing"
total_findings = len(findings.qs.all())
if t.engagement.name:
engagement_name = t.engagement.name
engagement_target_start = t.engagement.target_start
- if t.engagement.target_end:
- engagement_target_end = t.engagement.target_end
- else:
- engagement_target_end = "ongoing"
+ engagement_target_end = t.engagement.target_end or "ongoing"
else:
pass # do nothing
@@ -3114,6 +3183,29 @@ class QuestionnaireEngagementSurveyViewSet(
def get_queryset(self):
return Engagement_Survey.objects.all().order_by("id")
+ @extend_schema(
+ request=OpenApiTypes.NONE,
+ parameters=[
+ OpenApiParameter(
+ "engagement_id", OpenApiTypes.INT, OpenApiParameter.PATH,
+ ),
+ ],
+ responses={status.HTTP_200_OK: serializers.QuestionnaireAnsweredSurveySerializer},
+ )
+ @action(
+ detail=True, methods=["post"], url_path=r"link_engagement/(?P
+ {{ end -}}
+
+
+
+
+
+ 
+
+
+ {{ partial "main/showFlexSearch" . }}
+ {{ $showFlexSearch := .Scratch.Get "showFlexSearch" -}}
+ {{ if $showFlexSearch -}}
+
+ {{ end -}}
+
+
+ {{ if (in site.Params.doks.sectionNav .Section) -}}
+
+
+ {{ end -}}
+
+
+
+
+
+
+
+
+ {{ if site.Params.doks.navBarButton -}}
+ {{ site.Params.doks.navBarButtonText }}
+ {{ end -}}
+
+
+
+{{ if site.Params.doks.navbarSticky -}}
+
+
+
+ {{ partial "main/showFlexSearch" . }}
+ {{ $showFlexSearch := .Scratch.Get "showFlexSearch" -}}
+ {{ if $showFlexSearch -}}
+
+ {{ end -}}
+
+
+ {{ if (in site.Params.doks.sectionNav .Section) -}}
+
+
+ {{ end -}}
+
+
+
+
+
+
+
+
+ {{ if site.Params.doks.navBarButton -}}
+ {{ site.Params.doks.navBarButtonText }}
+ {{ end -}}
+
+
{% endif %}
{% include "dojo/snippets/tags.html" with tags=e.tags.all %}
- {% if not product_tab %}
+ {% if not product_tab and e.product %}
{{ e.product }}
{% include "dojo/snippets/tags.html" with tags=e.product.tags.all %}
diff --git a/dojo/templates/dojo/findings_list_snippet.html b/dojo/templates/dojo/findings_list_snippet.html
index c498ecc961a..87d85309abe 100755
--- a/dojo/templates/dojo/findings_list_snippet.html
+++ b/dojo/templates/dojo/findings_list_snippet.html
@@ -384,6 +384,11 @@
{% trans "Planned Remediation" %}
+ {% if filter_name != 'Closed' %}
+
+ {% trans "Reviewers" %}
+
+ {% endif %}
{% endblock header %}
@@ -721,6 +726,16 @@
{% if finding.planned_remediation_date %}{{ finding.planned_remediation_date }}{% endif %}
+ {% if filter_name != 'Closed' %}
+
+ {% if finding.reviewers %}
+ {% for reviewer in finding.reviewers.all %}
+ {{reviewer.get_full_name}}
+ {% if not forloop.last %}
{% endif %}
+ {% endfor %}
+ {% endif %}
+
+ {% endif %}
{% endblock body %}
{% endfor %}
@@ -801,6 +816,9 @@
{% endif %}
{ "data": "service" },
{ "data": "planned_remediation_date" },
+ {% if filter_name != 'Closed' %}
+ { "data": "reviewers" },
+ {% endif %}
];
{% endblock datatables_columns %}
diff --git a/dojo/templates/notifications/alert/engagement_closed.tpl b/dojo/templates/notifications/alert/engagement_closed.tpl
new file mode 100644
index 00000000000..2468c566e30
--- /dev/null
+++ b/dojo/templates/notifications/alert/engagement_closed.tpl
@@ -0,0 +1,3 @@
+{% load i18n %}{% blocktranslate trimmed with eng_name=engagement.name eng_product=engagement.product %}
+The engagement "{{ eng_name }}" has been closed in the product "{{ eng_product }}".
+{% endblocktranslate %}
\ No newline at end of file
diff --git a/dojo/templates/notifications/mail/engagement_closed.tpl b/dojo/templates/notifications/mail/engagement_closed.tpl
new file mode 100644
index 00000000000..68eef654865
--- /dev/null
+++ b/dojo/templates/notifications/mail/engagement_closed.tpl
@@ -0,0 +1,41 @@
+{% load i18n %}
+{% load navigation_tags %}
+{% load display_tags %}
+{% url 'view_product' engagement.product.id as product_url %}
+{% url 'view_engagement' engagement.id as engagement_url %}
+
+
+ {% autoescape on %}
+
+ {% trans "Hello" %},
+
+
+ {% blocktranslate trimmed with engagement_name=engagement.name engagement_product=engagement.product prod_url=product_url|full_url eng_url=engagement_url|full_url%}
+ The engagement "{{ engagement_name }}" has been closed in the product "{{ engagement_product }}". It can be viewed here: {{product}} / {{ engagement_name }}
+ {% endblocktranslate %}
+
+
+
+ {% trans "Kind regards" %},
+
+ {% if system_settings.team_name %}
+ {{ system_settings.team_name }}
+ {% else %}
+ Defect Dojo
+ {% endif %}
+
+
+
+ {% url 'notifications' as notification_url %}
+ {% trans "You can manage your notification settings here" %}: {{ notification_url|full_url }}
+
+ {% if system_settings.disclaimer and system_settings.disclaimer.strip %}
+
+
+ {% trans "Disclaimer" %}
+ {{ system_settings.disclaimer }}
+
+ {% endif %}
+ {% endautoescape %}
+
+
diff --git a/dojo/templates/notifications/msteams/engagement_closed.tpl b/dojo/templates/notifications/msteams/engagement_closed.tpl
new file mode 100644
index 00000000000..3e6bfeed0df
--- /dev/null
+++ b/dojo/templates/notifications/msteams/engagement_closed.tpl
@@ -0,0 +1,44 @@
+{% load i18n %}
+{% load display_tags %}
+{
+ "@context": "https://schema.org/extensions",
+ "@type": "MessageCard",
+ "title": "{% trans "Engagement closed" %}",
+ "summary": "{% trans "Engagement closed" %}",
+ "sections": [
+ {
+ "activityTitle": "DefectDojo",
+ "activityImage": "https://raw.githubusercontent.com/DefectDojo/django-DefectDojo/master/dojo/static/dojo/img/chop.png",
+ "text": "{% trans "An engagement has been closed" %}.",
+ "facts": [
+ {
+ "name": "{% trans "Product" %}:",
+ "value": "{{ engagement.product.name }}"
+ },
+ {
+ "name": "{% trans "Engagement" %}:",
+ "value": "{{ engagement.name }}"
+ }
+ ]
+ }
+ {% if system_settings.disclaimer and system_settings.disclaimer.strip %}
+ ,{
+ "activityTitle": "{% trans "Disclaimer" %}",
+ "text": "{{ system_settings.disclaimer }}"
+ }
+ {% endif %}
+
+ ],
+ "potentialAction": [
+ {
+ "@type": "OpenUri",
+ "name": "{% trans "View Engagement" %}",
+ "targets": [
+ {
+ "os": "default",
+ "uri": "{{ url|full_url }}"
+ }
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/dojo/templates/notifications/slack/engagement_closed.tpl b/dojo/templates/notifications/slack/engagement_closed.tpl
new file mode 100644
index 00000000000..313c7a1c937
--- /dev/null
+++ b/dojo/templates/notifications/slack/engagement_closed.tpl
@@ -0,0 +1,10 @@
+{% load i18n %}
+{% load display_tags %}
+{% blocktranslate trimmed with name=engagement.name eng_product=engagement.product eng_url=url|full_url %}
+The engagement "{{ name }}" has been closed in the product "{{ eng_product }}". It can be viewed here: {{ eng_url }}
+{% endblocktranslate %}
+{% if system_settings.disclaimer and system_settings.disclaimer.strip %}
+
+ {% trans "Disclaimer" %}:
+ {{ system_settings.disclaimer }}
+{% endif %}
diff --git a/dojo/templates/notifications/webhooks/subtemplates/base.tpl b/dojo/templates/notifications/webhooks/subtemplates/base.tpl
index 44946cd8dd3..3b6e30da989 100644
--- a/dojo/templates/notifications/webhooks/subtemplates/base.tpl
+++ b/dojo/templates/notifications/webhooks/subtemplates/base.tpl
@@ -1,6 +1,7 @@
{% load display_tags %}
---
-description: {{ description | default_if_none:'' }}
+description: "{{ description | default_if_none:'' }}"
+title: "{{ title | default_if_none:'' }}"
user: {{ user | default_if_none:'' }}
{% if url %}
url_ui: {{ url|full_url }}
diff --git a/dojo/templatetags/authorization_tags.py b/dojo/templatetags/authorization_tags.py
index fd40caba7ae..ecf3eb02a60 100755
--- a/dojo/templatetags/authorization_tags.py
+++ b/dojo/templatetags/authorization_tags.py
@@ -43,10 +43,7 @@ def has_global_permission(permission):
@register.filter
def has_configuration_permission(permission, request):
- if request is None:
- user = crum.get_current_user()
- else:
- user = crum.get_current_user() or request.user
+ user = crum.get_current_user() if request is None else crum.get_current_user() or request.user
return configuration_permission(user, permission)
@@ -58,10 +55,7 @@ def get_user_permissions(user):
@register.filter
def user_has_configuration_permission_without_group(user, codename):
permissions = get_user_permissions(user)
- for permission in permissions:
- if permission.codename == codename:
- return True
- return False
+ return any(permission.codename == codename for permission in permissions)
@cache_for_request
@@ -71,10 +65,7 @@ def get_group_permissions(group):
@register.filter
def group_has_configuration_permission(group, codename):
- for permission in get_group_permissions(group):
- if permission.codename == codename:
- return True
- return False
+ return any(permission.codename == codename for permission in get_group_permissions(group))
@register.simple_tag
diff --git a/dojo/templatetags/display_tags.py b/dojo/templatetags/display_tags.py
index 1bd209792cd..abb3133733f 100755
--- a/dojo/templatetags/display_tags.py
+++ b/dojo/templatetags/display_tags.py
@@ -1,4 +1,5 @@
import base64
+import contextlib
import datetime
import logging
import mimetypes
@@ -176,10 +177,8 @@ def remove_string(string, value):
def percentage(fraction, value):
return_value = ""
if int(value) > 0:
- try:
+ with contextlib.suppress(ValueError):
return_value = "%.1f%%" % ((float(fraction) / float(value)) * 100)
- except ValueError:
- pass
return return_value
@@ -328,8 +327,11 @@ def action_log_entry(value, autoescape=None):
import json
history = json.loads(value)
text = ""
- for k in history.keys():
- text += k.capitalize() + ' changed from "' + \
+ for k in history:
+ if isinstance(history[k], dict):
+ text += k.capitalize() + " operation: " + history[k].get("operation", "unknown") + ": " + str(history[k].get("objects", "unknown"))
+ else:
+ text += k.capitalize() + ' changed from "' + \
history[k][0] + '" to "' + history[k][1] + '"\n'
return text
@@ -709,9 +711,7 @@ def get_severity_count(id, table):
if table == "test":
display_counts.append("Total: " + str(total) + " Findings")
- elif table == "engagement":
- display_counts.append("Total: " + str(total) + " Active Findings")
- elif table == "product":
+ elif table == "engagement" or table == "product":
display_counts.append("Total: " + str(total) + " Active Findings")
return ", ".join([str(item) for item in display_counts])
@@ -818,10 +818,7 @@ def has_vulnerability_url(vulnerability_id):
if not vulnerability_id:
return False
- for key in settings.VULNERABILITY_URLS:
- if vulnerability_id.upper().startswith(key):
- return True
- return False
+ return any(vulnerability_id.upper().startswith(key) for key in settings.VULNERABILITY_URLS)
@register.filter
@@ -831,8 +828,15 @@ def vulnerability_url(vulnerability_id):
for key in settings.VULNERABILITY_URLS:
if vulnerability_id.upper().startswith(key):
+ if key in ["AVD", "KHV", "C-"]:
+ return settings.VULNERABILITY_URLS[key] + str(vulnerability_id.lower())
if "&&" in settings.VULNERABILITY_URLS[key]:
- return settings.VULNERABILITY_URLS[key].split("&&")[0] + str(vulnerability_id) + settings.VULNERABILITY_URLS[key].split("&&")[1]
+ # Process specific keys specially if need
+ if key in ["CAPEC", "CWE"]:
+ vuln_id = str(vulnerability_id).replace(f"{key}-", "")
+ else:
+ vuln_id = str(vulnerability_id)
+ return f'{settings.VULNERABILITY_URLS[key].split("&&")[0]}{vuln_id}{settings.VULNERABILITY_URLS[key].split("&&")[1]}'
return settings.VULNERABILITY_URLS[key] + str(vulnerability_id)
return ""
@@ -995,7 +999,7 @@ def esc(x):
"""
jira_project_no_inheritance = jira_helper.get_jira_project(product_or_engagement, use_inheritance=False)
- inherited = True if not jira_project_no_inheritance else False
+ inherited = bool(not jira_project_no_inheritance)
icon = "fa-bug"
color = ""
diff --git a/dojo/templatetags/event_tags.py b/dojo/templatetags/event_tags.py
index ff1ffe8f068..237845738c1 100755
--- a/dojo/templatetags/event_tags.py
+++ b/dojo/templatetags/event_tags.py
@@ -63,8 +63,7 @@ def is_file(field):
@register.filter
def is_text(field):
- return isinstance(field.field.widget, forms.TextInput) or \
- isinstance(field.field.widget, forms.Textarea)
+ return isinstance(field.field.widget, forms.TextInput | forms.Textarea)
@register.filter
diff --git a/dojo/templatetags/get_config_setting.py b/dojo/templatetags/get_config_setting.py
index ca917968b75..08ab9251dbd 100755
--- a/dojo/templatetags/get_config_setting.py
+++ b/dojo/templatetags/get_config_setting.py
@@ -7,7 +7,5 @@
@register.filter
def get_config_setting(config_setting):
if hasattr(settings, config_setting):
- if getattr(settings, config_setting, None):
- return True
- return False
+ return bool(getattr(settings, config_setting, None))
return False
diff --git a/dojo/templatetags/get_endpoint_status.py b/dojo/templatetags/get_endpoint_status.py
index 42a5bdb8eaa..37ca83d7070 100755
--- a/dojo/templatetags/get_endpoint_status.py
+++ b/dojo/templatetags/get_endpoint_status.py
@@ -8,7 +8,7 @@
@register.filter(name="has_endpoints")
def has_endpoints(finding):
- return True if finding.endpoints.all() else False
+ return bool(finding.endpoints.all())
@register.filter(name="get_vulnerable_endpoints")
diff --git a/dojo/test/views.py b/dojo/test/views.py
index 96d3a58c1ed..8c9f42d586a 100755
--- a/dojo/test/views.py
+++ b/dojo/test/views.py
@@ -4,7 +4,6 @@
import operator
from datetime import datetime
from functools import reduce
-from typing import Tuple
from django.contrib import messages
from django.contrib.admin.utils import NestedObjects
@@ -826,7 +825,7 @@ def get_jira_form(
self,
request: HttpRequest,
test: Test,
- ) -> Tuple[JIRAImportScanForm | None, bool]:
+ ) -> tuple[JIRAImportScanForm | None, bool]:
"""Returns a JiraImportScanForm if jira is enabled"""
jira_form = None
push_all_jira_issues = False
@@ -853,7 +852,7 @@ def handle_request(
self,
request: HttpRequest,
test_id: int,
- ) -> Tuple[HttpRequest, dict]:
+ ) -> tuple[HttpRequest, dict]:
"""
Process the common behaviors between request types, and then return
the request and context dict back to be rendered
@@ -865,10 +864,7 @@ def handle_request(
# by default we keep a trace of the scan_type used to create the test
# if it's not here, we use the "name" of the test type
# this feature exists to provide custom label for tests for some parsers
- if test.scan_type:
- scan_type = test.scan_type
- else:
- scan_type = test.test_type.name
+ scan_type = test.scan_type or test.test_type.name
# Set the product tab
product_tab = Product_Tab(test.engagement.product, title=_("Re-upload a %s") % scan_type, tab="engagements")
product_tab.setEngagement(test.engagement)
diff --git a/dojo/tools/acunetix/parse_acunetix360_json.py b/dojo/tools/acunetix/parse_acunetix360_json.py
index 082bf889a6c..60df512d493 100755
--- a/dojo/tools/acunetix/parse_acunetix360_json.py
+++ b/dojo/tools/acunetix/parse_acunetix360_json.py
@@ -15,7 +15,7 @@ def get_findings(self, filename, test):
dupes = {}
data = json.load(filename)
dupes = {}
- scan_date = parser.parse(data["Generated"])
+ scan_date = parser.parse(data["Generated"], dayfirst=True)
text_maker = html2text.HTML2Text()
text_maker.body_width = 0
for item in data["Vulnerabilities"]:
@@ -51,10 +51,7 @@ def get_findings(self, filename, test):
+ references
)
url = item["Url"]
- if item["Impact"] is not None:
- impact = text_maker.handle(item.get("Impact", ""))
- else:
- impact = None
+ impact = text_maker.handle(item.get("Impact", "")) if item["Impact"] is not None else None
dupe_key = title
request = item["HttpRequest"]["Content"]
if request is None or len(request) <= 0:
@@ -96,7 +93,7 @@ def get_findings(self, filename, test):
finding.unsaved_req_resp = [{"req": request, "resp": response}]
finding.unsaved_endpoints = [Endpoint.from_uri(url)]
if item.get("FirstSeenDate"):
- parseddate = parser.parse(item["FirstSeenDate"])
+ parseddate = parser.parse(item["FirstSeenDate"], dayfirst=True)
finding.date = parseddate
if dupe_key in dupes:
find = dupes[dupe_key]
diff --git a/dojo/tools/acunetix/parse_acunetix_xml.py b/dojo/tools/acunetix/parse_acunetix_xml.py
index eb1e64d16a4..c4ec52a1bd8 100644
--- a/dojo/tools/acunetix/parse_acunetix_xml.py
+++ b/dojo/tools/acunetix/parse_acunetix_xml.py
@@ -24,9 +24,9 @@ def get_findings(self, filename, test):
if ":" not in start_url:
start_url = "//" + start_url
# get report date
- if scan.findtext("StartTime") and "" != scan.findtext("StartTime"):
+ if scan.findtext("StartTime") and scan.findtext("StartTime") != "":
report_date = dateutil.parser.parse(
- scan.findtext("StartTime"),
+ scan.findtext("StartTime"), dayfirst=True,
).date()
for item in scan.findall("ReportItems/ReportItem"):
finding = Finding(
@@ -43,11 +43,11 @@ def get_findings(self, filename, test):
dynamic_finding=False,
nb_occurences=1,
)
- if item.findtext("Impact") and "" != item.findtext("Impact"):
+ if item.findtext("Impact") and item.findtext("Impact") != "":
finding.impact = item.findtext("Impact")
- if item.findtext("Recommendation") and "" != item.findtext(
+ if item.findtext("Recommendation") and item.findtext(
"Recommendation",
- ):
+ ) != "":
finding.mitigation = item.findtext("Recommendation")
if report_date:
finding.date = report_date
@@ -105,7 +105,7 @@ def get_findings(self, filename, test):
port=url.port,
path=item.findtext("Affects"),
)
- if url.scheme is not None and "" != url.scheme:
+ if url.scheme is not None and url.scheme != "":
endpoint.protocol = url.scheme
finding.unsaved_endpoints = [endpoint]
dupe_key = hashlib.sha256(
@@ -171,6 +171,4 @@ def get_false_positive(self, false_p):
:param false_p:
:return:
"""
- if false_p:
- return True
- return False
+ return bool(false_p)
diff --git a/dojo/tools/anchore_grype/parser.py b/dojo/tools/anchore_grype/parser.py
index 94a0ac5971e..cb877a06c23 100755
--- a/dojo/tools/anchore_grype/parser.py
+++ b/dojo/tools/anchore_grype/parser.py
@@ -187,9 +187,7 @@ def get_findings(self, file, test):
return list(dupes.values())
def _convert_severity(self, val):
- if "Unknown" == val:
- return "Info"
- if "Negligible" == val:
+ if val == "Unknown" or val == "Negligible":
return "Info"
return val.title()
diff --git a/dojo/tools/anchorectl_policies/parser.py b/dojo/tools/anchorectl_policies/parser.py
index 818b21d1c24..b7a471c073b 100755
--- a/dojo/tools/anchorectl_policies/parser.py
+++ b/dojo/tools/anchorectl_policies/parser.py
@@ -40,7 +40,7 @@ def get_findings(self, filename, test):
image_name = result["tag"]
trigger_id = result["triggerId"]
repo, tag = image_name.split(":", 2)
- severity = map_gate_action_to_severity(status)
+ severity, active = get_severity(status, description)
vulnerability_id = extract_vulnerability_id(trigger_id)
title = (
policy_id
@@ -54,6 +54,7 @@ def get_findings(self, filename, test):
test=test,
description=description,
severity=severity,
+ active=active,
references=f"Policy ID: {policy_id}\nTrigger ID: {trigger_id}",
file_path=search_filepath(description),
component_name=repo,
@@ -77,14 +78,32 @@ def get_findings(self, filename, test):
return items
-def map_gate_action_to_severity(gate):
+def map_gate_action_to_severity(status):
gate_action_to_severity = {
"stop": "Critical",
"warn": "Medium",
}
- if gate in gate_action_to_severity:
- return gate_action_to_severity[gate]
- return "Low"
+ if status in gate_action_to_severity:
+ return gate_action_to_severity[status], True
+
+ return "Low", True
+
+
+def get_severity(status, description):
+ parsed_severity = description.split()[0]
+ valid_severities = ["LOW", "INFO", "UNKNOWN", "CRITICAL", "MEDIUM"]
+ if parsed_severity in valid_severities:
+ severity = "Info"
+ if parsed_severity == "UNKNOWN":
+ severity = "Info"
+ elif status != "go":
+ severity = parsed_severity.lower().capitalize()
+
+ active = status != "go"
+
+ return severity, active
+
+ return map_gate_action_to_severity(status)
def policy_name(policies, policy_id):
diff --git a/dojo/tools/api_blackduck/parser.py b/dojo/tools/api_blackduck/parser.py
index 5c01062e51a..84ffe2ed56b 100755
--- a/dojo/tools/api_blackduck/parser.py
+++ b/dojo/tools/api_blackduck/parser.py
@@ -36,10 +36,7 @@ def api_scan_configuration_hint(self):
)
def get_findings(self, file, test):
- if file is None:
- data = BlackduckApiImporter().get_findings(test)
- else:
- data = json.load(file)
+ data = BlackduckApiImporter().get_findings(test) if file is None else json.load(file)
findings = []
for entry in data:
vulnerability_id = entry["vulnerabilityWithRemediation"][
diff --git a/dojo/tools/api_bugcrowd/api_client.py b/dojo/tools/api_bugcrowd/api_client.py
index f180d64325f..7e9ac2b91cd 100755
--- a/dojo/tools/api_bugcrowd/api_client.py
+++ b/dojo/tools/api_bugcrowd/api_client.py
@@ -1,6 +1,7 @@
from urllib.parse import urlencode
import requests
+from django.conf import settings
class BugcrowdAPI:
@@ -52,7 +53,10 @@ def get_findings(self, program, target):
next = f"{self.bugcrowd_api_url}/submissions?{params_encoded}"
while next != "":
- response = self.session.get(url=next)
+ response = self.session.get(
+ url=next,
+ timeout=settings.REQUESTS_TIMEOUT,
+ )
response.raise_for_status()
if response.ok:
data = response.json()
@@ -75,12 +79,14 @@ def test_connection(self):
# Request programs
response_programs = self.session.get(
url=f"{self.bugcrowd_api_url}/programs",
+ timeout=settings.REQUESTS_TIMEOUT,
)
response_programs.raise_for_status()
# Request submissions to validate the org token
response_subs = self.session.get(
url=f"{self.bugcrowd_api_url}/submissions",
+ timeout=settings.REQUESTS_TIMEOUT,
)
response_subs.raise_for_status()
if response_programs.ok and response_subs.ok:
@@ -95,6 +101,7 @@ def test_connection(self):
# Request targets to validate the org token
response_targets = self.session.get(
url=f"{self.bugcrowd_api_url}/targets",
+ timeout=settings.REQUESTS_TIMEOUT,
)
response_targets.raise_for_status()
if response_targets.ok:
diff --git a/dojo/tools/api_cobalt/api_client.py b/dojo/tools/api_cobalt/api_client.py
index 21318143e27..acd01635e90 100755
--- a/dojo/tools/api_cobalt/api_client.py
+++ b/dojo/tools/api_cobalt/api_client.py
@@ -1,4 +1,5 @@
import requests
+from django.conf import settings
class CobaltAPI:
@@ -36,6 +37,7 @@ def get_assets(self):
response = self.session.get(
url=f"{self.cobalt_api_url}/assets?limit=1000",
headers=self.get_headers(),
+ timeout=settings.REQUESTS_TIMEOUT,
)
if response.ok:
@@ -56,6 +58,7 @@ def get_findings(self, asset_id):
response = self.session.get(
url=f"{self.cobalt_api_url}/findings?limit=1000&asset={asset_id}",
headers=self.get_headers(),
+ timeout=settings.REQUESTS_TIMEOUT,
)
if response.ok:
@@ -72,12 +75,14 @@ def test_connection(self):
response_orgs = self.session.get(
url=f"{self.cobalt_api_url}/orgs",
headers=self.get_headers(),
+ timeout=settings.REQUESTS_TIMEOUT,
)
# Request assets to validate the org token
response_assets = self.session.get(
url=f"{self.cobalt_api_url}/assets",
headers=self.get_headers(),
+ timeout=settings.REQUESTS_TIMEOUT,
)
if response_orgs.ok and response_assets.ok:
diff --git a/dojo/tools/api_cobalt/parser.py b/dojo/tools/api_cobalt/parser.py
index b6f119b07b2..d1559cc50f3 100755
--- a/dojo/tools/api_cobalt/parser.py
+++ b/dojo/tools/api_cobalt/parser.py
@@ -38,10 +38,7 @@ def api_scan_configuration_hint(self):
)
def get_findings(self, file, test):
- if file is None:
- data = CobaltApiImporter().get_findings(test)
- else:
- data = json.load(file)
+ data = CobaltApiImporter().get_findings(test) if file is None else json.load(file)
findings = []
for entry in data["data"]:
@@ -129,9 +126,7 @@ def include_finding(self, resource):
"wont_fix", # Risk of finding has been accepted
]
- if resource["state"] in allowed_states:
- return True
- return False
+ return resource["state"] in allowed_states
def convert_endpoints(self, affected_targets):
"""Convert Cobalt affected_targets into DefectDojo endpoints"""
diff --git a/dojo/tools/api_edgescan/api_client.py b/dojo/tools/api_edgescan/api_client.py
index df0de92a471..580d753226c 100755
--- a/dojo/tools/api_edgescan/api_client.py
+++ b/dojo/tools/api_edgescan/api_client.py
@@ -2,6 +2,7 @@
from json.decoder import JSONDecodeError
import requests
+from django.conf import settings
class EdgescanAPI:
@@ -42,6 +43,7 @@ def get_findings(self, asset_ids):
url=url,
headers=self.get_headers(),
proxies=self.get_proxies(),
+ timeout=settings.REQUESTS_TIMEOUT,
)
response.raise_for_status()
return response.json()
diff --git a/dojo/tools/api_edgescan/parser.py b/dojo/tools/api_edgescan/parser.py
index 3fe86561911..6326010d6e0 100755
--- a/dojo/tools/api_edgescan/parser.py
+++ b/dojo/tools/api_edgescan/parser.py
@@ -33,10 +33,7 @@ def api_scan_configuration_hint(self):
return "In the field Service key 1, provide the Edgescan asset ID(s). Leaving it blank will import all assets' findings."
def get_findings(self, file, test):
- if file:
- data = json.load(file)
- else:
- data = EdgescanImporter().get_findings(test)
+ data = json.load(file) if file else EdgescanImporter().get_findings(test)
return self.process_vulnerabilities(test, data)
@@ -67,7 +64,7 @@ def make_finding(self, test, vulnerability):
finding.severity = ES_SEVERITIES[vulnerability["severity"]]
finding.description = vulnerability["description"]
finding.mitigation = vulnerability["remediation"]
- finding.active = True if vulnerability["status"] == "open" else False
+ finding.active = vulnerability["status"] == "open"
if vulnerability["asset_tags"]:
finding.tags = vulnerability["asset_tags"].split(",")
finding.unique_id_from_tool = vulnerability["id"]
diff --git a/dojo/tools/api_sonarqube/api_client.py b/dojo/tools/api_sonarqube/api_client.py
index 63d79bc79b4..c7bfd8bb870 100755
--- a/dojo/tools/api_sonarqube/api_client.py
+++ b/dojo/tools/api_sonarqube/api_client.py
@@ -1,4 +1,5 @@
import requests
+from django.conf import settings
from requests.exceptions import JSONDecodeError as RequestsJSONDecodeError
from rest_framework.exceptions import ValidationError
from dojo.utils import prepare_for_view
@@ -75,6 +76,7 @@ def find_project(self, project_name, organization=None, branch=None):
url=f"{self.sonar_api_url}/components/search",
params=parameters,
headers=self.default_headers,
+ timeout=settings.REQUESTS_TIMEOUT,
)
if not response.ok:
@@ -115,14 +117,13 @@ def get_project(self, project_key, organization=None, branch=None):
parameters["organization"] = organization
elif self.org_id:
parameters["organization"] = self.org_id
- try:
- response = self.session.get(
- url=f"{self.sonar_api_url}/components/show",
- params=parameters,
- headers=self.default_headers,
- )
- except Exception as e:
- raise ValidationError(e)
+
+ response = self.session.get(
+ url=f"{self.sonar_api_url}/components/show",
+ params=parameters,
+ headers=self.default_headers,
+ timeout=settings.REQUESTS_TIMEOUT,
+ )
if not response.ok:
msg = (
@@ -175,6 +176,7 @@ def find_issues(
url=f"{self.sonar_api_url}/issues/search",
params=request_filter,
headers=self.default_headers,
+ timeout=settings.REQUESTS_TIMEOUT,
)
if not response.ok:
@@ -217,6 +219,7 @@ def find_hotspots(self, project_key, organization=None, branch=None):
url=f"{self.sonar_api_url}/hotspots/search",
params=request_filter,
headers=self.default_headers,
+ timeout=settings.REQUESTS_TIMEOUT,
)
if not response.ok:
@@ -281,6 +284,7 @@ def get_issue(self, branch, issue_key):
url=f"{self.sonar_api_url}/issues/search",
params=request_filter,
headers=self.default_headers,
+ timeout=settings.REQUESTS_TIMEOUT,
)
if not response.ok:
@@ -321,6 +325,7 @@ def get_rule(self, rule_id, organization=None):
url=f"{self.sonar_api_url}/rules/show",
params=request_filter,
headers=self.default_headers,
+ timeout=settings.REQUESTS_TIMEOUT,
)
if not response.ok:
msg = (
@@ -345,6 +350,7 @@ def get_hotspot_rule(self, rule_id):
url=f"{self.sonar_api_url}/hotspots/show",
params={"hotspot": rule_id},
headers=self.default_headers,
+ timeout=settings.REQUESTS_TIMEOUT,
)
if not response.ok:
msg = (
@@ -388,6 +394,7 @@ def transition_issue(self, issue_key, transition):
url=f"{self.sonar_api_url}/issues/do_transition",
data={"issue": issue_key, "transition": transition},
headers=self.default_headers,
+ timeout=settings.REQUESTS_TIMEOUT,
)
if not response.ok:
@@ -409,6 +416,7 @@ def add_comment(self, issue_key, text):
url=f"{self.sonar_api_url}/issues/add_comment",
data={"issue": issue_key, "text": text},
headers=self.default_headers,
+ timeout=settings.REQUESTS_TIMEOUT,
)
if not response.ok:
msg = (
@@ -428,6 +436,7 @@ def test_connection(self):
url=f"{self.sonar_api_url}/components/search",
params=parameters,
headers=self.default_headers,
+ timeout=settings.REQUESTS_TIMEOUT,
)
if not response.ok:
diff --git a/dojo/tools/api_sonarqube/importer.py b/dojo/tools/api_sonarqube/importer.py
index d6fded782a6..80d9939079b 100755
--- a/dojo/tools/api_sonarqube/importer.py
+++ b/dojo/tools/api_sonarqube/importer.py
@@ -128,7 +128,7 @@ def import_issues(self, test):
organization=organization,
branch=test.branch_tag,
)
- logging.info(
+ logger.info(
f'Found {len(issues)} issues for component {component["key"]}',
)
@@ -142,10 +142,7 @@ def import_issues(self, test):
continue
issue_type = issue["type"]
- if len(issue["message"]) > 511:
- title = issue["message"][0:507] + "..."
- else:
- title = issue["message"]
+ title = issue["message"][0:507] + "..." if len(issue["message"]) > 511 else issue["message"]
component_key = issue["component"]
line = issue.get("line")
rule_id = issue["rule"]
@@ -250,7 +247,7 @@ def import_hotspots(self, test):
organization=organization,
branch=test.branch_tag,
)
- logging.info(
+ logger.info(
f'Found {len(hotspots)} hotspots for project {component["key"]}',
)
sonarUrl = client.sonar_api_url[:-3] # [:-3] removes the /api part of the sonarqube/cloud URL
diff --git a/dojo/tools/api_sonarqube/updater.py b/dojo/tools/api_sonarqube/updater.py
index e96ddcc41c0..a0b31e43d28 100755
--- a/dojo/tools/api_sonarqube/updater.py
+++ b/dojo/tools/api_sonarqube/updater.py
@@ -62,10 +62,7 @@ def get_sonarqube_status_for(finding):
elif finding.risk_accepted:
target_status = "RESOLVED / WONTFIX"
elif finding.active:
- if finding.verified:
- target_status = "CONFIRMED"
- else:
- target_status = "REOPENED"
+ target_status = "CONFIRMED" if finding.verified else "REOPENED"
return target_status
def get_sonarqube_required_transitions_for(
diff --git a/dojo/tools/api_sonarqube/updater_from_source.py b/dojo/tools/api_sonarqube/updater_from_source.py
index 36496d4593b..2b91e62e29d 100755
--- a/dojo/tools/api_sonarqube/updater_from_source.py
+++ b/dojo/tools/api_sonarqube/updater_from_source.py
@@ -67,10 +67,7 @@ def get_sonarqube_status_for(finding):
elif finding.risk_accepted:
target_status = "WONTFIX"
elif finding.active:
- if finding.verified:
- target_status = "CONFIRMED"
- else:
- target_status = "REOPENED"
+ target_status = "CONFIRMED" if finding.verified else "REOPENED"
return target_status
@staticmethod
diff --git a/dojo/tools/appcheck_web_application_scanner/engines/appcheck.py b/dojo/tools/appcheck_web_application_scanner/engines/appcheck.py
index 6d10485e4d1..b34931d0f8f 100644
--- a/dojo/tools/appcheck_web_application_scanner/engines/appcheck.py
+++ b/dojo/tools/appcheck_web_application_scanner/engines/appcheck.py
@@ -1,5 +1,4 @@
import re
-from typing import Union
from dojo.models import Finding
from dojo.tools.appcheck_web_application_scanner.engines.base import BaseEngineParser
@@ -29,7 +28,7 @@ def extract_request_response(self, finding: Finding, value: dict[str, [str]]) ->
value.pop("Messages")
finding.unsaved_request, finding.unsaved_response = (d.strip() for d in rr_details[0])
- def parse_details(self, finding: Finding, value: dict[str, Union[str, dict[str, list[str]]]]) -> None:
+ def parse_details(self, finding: Finding, value: dict[str, str | dict[str, list[str]]]) -> None:
self.extract_request_response(finding, value)
# super's version adds everything else to the description field
return super().parse_details(finding, value)
diff --git a/dojo/tools/appcheck_web_application_scanner/engines/base.py b/dojo/tools/appcheck_web_application_scanner/engines/base.py
index 782c047443a..e07433c2946 100644
--- a/dojo/tools/appcheck_web_application_scanner/engines/base.py
+++ b/dojo/tools/appcheck_web_application_scanner/engines/base.py
@@ -1,6 +1,6 @@
import re
from itertools import starmap
-from typing import Any, Optional, Tuple, Union
+from typing import Any
import cvss.parser
import dateutil.parser
@@ -193,7 +193,7 @@ def __init__(self):
#####
# For parsing the initial finding datetime to a date format pleasing to Finding
#####
- def get_date(self, value: str) -> Optional[str]:
+ def get_date(self, value: str) -> str | None:
try:
return str(dateutil.parser.parse(value).date())
except dateutil.parser.ParserError:
@@ -229,7 +229,7 @@ def parse_status(self, finding: Finding, value: str) -> None:
#####
# For parsing component data
#####
- def parse_cpe(self, cpe_str: str) -> (Optional[str], Optional[str]):
+ def parse_cpe(self, cpe_str: str) -> (str | None, str | None):
if not cpe_str:
return None, None
cpe_obj = CPE(cpe_str)
@@ -257,12 +257,12 @@ def append_description(self, finding: Finding, addendum: dict[str, str]) -> None
def parse_notes(self, finding: Finding, value: str) -> None:
self.append_description(finding, {"Notes": value})
- def extract_details(self, value: Union[str, dict[str, Union[str, dict[str, list[str]]]]]) -> dict[str, str]:
+ def extract_details(self, value: str | dict[str, str | dict[str, list[str]]]) -> dict[str, str]:
if isinstance(value, dict):
return {k: v for k, v in value.items() if k != "_meta"}
return {"Details": str(value)}
- def parse_details(self, finding: Finding, value: dict[str, Union[str, dict[str, list[str]]]]) -> None:
+ def parse_details(self, finding: Finding, value: dict[str, str | dict[str, list[str]]]) -> None:
self.append_description(finding, self.extract_details(value))
#####
@@ -271,7 +271,7 @@ def parse_details(self, finding: Finding, value: dict[str, Union[str, dict[str,
def get_host(self, item: dict[str, Any]) -> str:
return item.get("url") or item.get("host") or item.get("ipv4_address") or None
- def parse_port(self, item: Any) -> Optional[int]:
+ def parse_port(self, item: Any) -> int | None:
try:
int_val = int(item)
if 0 < int_val <= 65535:
@@ -280,10 +280,10 @@ def parse_port(self, item: Any) -> Optional[int]:
pass
return None
- def get_port(self, item: dict[str, Any]) -> Optional[int]:
+ def get_port(self, item: dict[str, Any]) -> int | None:
return self.parse_port(item.get("port"))
- def construct_endpoint(self, host: str, port: Optional[int]) -> Endpoint:
+ def construct_endpoint(self, host: str, port: int | None) -> Endpoint:
endpoint = Endpoint.from_uri(host)
if endpoint.host:
if port:
@@ -306,7 +306,7 @@ def set_endpoints(self, finding: Finding, item: Any) -> None:
#####
# For severity (extracted from various cvss vectors)
#####
- def parse_cvss_vector(self, value: str) -> Optional[str]:
+ def parse_cvss_vector(self, value: str) -> str | None:
# CVSS4 vectors don't parse with the handy-danty parse method :(
try:
if (severity := cvss.CVSS4(value).severity) in Finding.SEVERITIES:
@@ -347,7 +347,7 @@ def get_engine_fields(self) -> dict[str, FieldType]:
**BaseEngineParser._COMMON_FIELDS_MAP,
**self._ENGINE_FIELDS_MAP}
- def get_finding_key(self, finding: Finding) -> Tuple:
+ def get_finding_key(self, finding: Finding) -> tuple:
return (
finding.severity,
finding.title,
@@ -355,7 +355,7 @@ def get_finding_key(self, finding: Finding) -> Tuple:
self.SCANNING_ENGINE,
)
- def parse_finding(self, item: dict[str, Any]) -> Tuple[Finding, Tuple]:
+ def parse_finding(self, item: dict[str, Any]) -> tuple[Finding, tuple]:
finding = Finding()
for field, field_handler in self.get_engine_fields().items():
# Check first whether the field even exists on this item entry; if not, skip it
diff --git a/dojo/tools/appcheck_web_application_scanner/engines/nmap.py b/dojo/tools/appcheck_web_application_scanner/engines/nmap.py
index 9252bdcb53d..3fba10e455d 100644
--- a/dojo/tools/appcheck_web_application_scanner/engines/nmap.py
+++ b/dojo/tools/appcheck_web_application_scanner/engines/nmap.py
@@ -1,4 +1,4 @@
-from typing import Any, Union
+from typing import Any
from dojo.models import Endpoint
from dojo.tools.appcheck_web_application_scanner.engines.base import BaseEngineParser
@@ -18,7 +18,7 @@ class NmapScanningEngineParser(BaseEngineParser):
def is_port_table_entry(self, entry) -> bool:
return len(entry) > 0 and self.parse_port(entry[0])
- def get_ports(self, item) -> Union[list[int], list[None]]:
+ def get_ports(self, item) -> list[int] | list[None]:
meta = item.get("meta")
if not isinstance(meta, dict):
meta = {}
diff --git a/dojo/tools/aqua/parser.py b/dojo/tools/aqua/parser.py
index 076c2d71dc5..a3b80281d0e 100755
--- a/dojo/tools/aqua/parser.py
+++ b/dojo/tools/aqua/parser.py
@@ -20,10 +20,7 @@ def get_findings(self, json_output, test):
def get_items(self, tree, test):
self.items = {}
if isinstance(tree, list): # Aqua Scan Report coming from Azure Devops jobs.
- if tree:
- vulnerabilitytree = tree[0]["results"]["resources"]
- else:
- vulnerabilitytree = []
+ vulnerabilitytree = tree[0]["results"]["resources"] if tree else []
self.vulnerability_tree(vulnerabilitytree, test)
elif "resources" in tree: # Aqua Scan Report not from Azure Devops jobs.
vulnerabilitytree = tree["resources"]
diff --git a/dojo/tools/arachni/parser.py b/dojo/tools/arachni/parser.py
index 3823da0589e..30947c33509 100644
--- a/dojo/tools/arachni/parser.py
+++ b/dojo/tools/arachni/parser.py
@@ -87,9 +87,7 @@ def get_item(self, item_node, report_date):
description = html2text.html2text(description)
remediation = (
- item_node["remedy_guidance"]
- if "remedy_guidance" in item_node
- else "n/a"
+ item_node.get("remedy_guidance", "n/a")
)
if remediation:
remediation = html2text.html2text(remediation)
@@ -105,7 +103,7 @@ def get_item(self, item_node, report_date):
references = html2text.html2text(references)
severity = item_node.get("severity", "Info").capitalize()
- if "Informational" == severity:
+ if severity == "Informational":
severity = "Info"
# Finding and Endpoint objects returned have not been saved to the
diff --git a/dojo/tools/asff/parser.py b/dojo/tools/asff/parser.py
index 49fa51fe1a8..87b2d18d282 100755
--- a/dojo/tools/asff/parser.py
+++ b/dojo/tools/asff/parser.py
@@ -63,10 +63,8 @@ def get_findings(self, file, test):
else:
mitigation = None
references = None
- if item.get("RecordState") and item.get("RecordState") == "ACTIVE":
- active = True
- else:
- active = False
+ active = bool(item.get("RecordState") and item.get("RecordState") == "ACTIVE")
+
# Adding the Resources:0/Id value to the description.
#
# This is needed because every Finding in AWS from Security Hub has an
diff --git a/dojo/tools/aws_inspector2/__init__.py b/dojo/tools/aws_inspector2/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/dojo/tools/aws_inspector2/parser.py b/dojo/tools/aws_inspector2/parser.py
new file mode 100644
index 00000000000..5350044d10d
--- /dev/null
+++ b/dojo/tools/aws_inspector2/parser.py
@@ -0,0 +1,255 @@
+import json
+from datetime import UTC, datetime
+
+from dateutil import parser as date_parser
+
+from dojo.models import Endpoint, Finding
+
+
+class AWSInspector2Parser:
+
+ """Import AWS Inspector2 json."""
+
+ def get_scan_types(self):
+ return ["AWS Inspector2 Scan"]
+
+ def get_label_for_scan_types(self, scan_type):
+ return "AWS Inspector2 Scan"
+
+ def get_description_for_scan_types(self, scan_type):
+ return "AWS Inspector2 report file can be imported in JSON format (aws inspector2 list-findings)."
+
+ def get_findings(self, file, test):
+ tree = json.load(file)
+ raw_findings = tree.get("findings", None)
+ if not isinstance(raw_findings, list):
+ msg = "Incorrect Inspector2 report format"
+ raise TypeError(msg)
+ self.test = test
+ findings = []
+ for raw_finding in raw_findings:
+ finding = self.get_base_finding(raw_finding)
+ # type specific details
+ finding_type = raw_finding.get("type", None)
+ if finding_type == "PACKAGE_VULNERABILITY":
+ finding = self.get_package_vulnerability(finding, raw_finding)
+ elif finding_type == "CODE_VULNERABILITY":
+ finding = self.get_code_vulnerability(finding, raw_finding)
+ elif finding_type == "NETWORK_REACHABILITY":
+ finding = self.get_network_reachability(finding, raw_finding)
+ else:
+ msg = "Incorrect Inspector2 report format"
+ raise TypeError(msg)
+ # process the endpoints
+ finding = self.process_endpoints(finding, raw_finding)
+ findings.append(finding)
+
+ return findings
+
+ def get_severity(self, severity_string):
+ if severity_string == "UNTRIAGED":
+ severity_string = "Info"
+ return severity_string.title()
+
+ def get_base_finding(self, raw_finding: dict) -> Finding:
+ # basic fields
+ finding_id = raw_finding.get("findingArn")
+ title = raw_finding.get("title", "The title could not be identified...")
+ description = ""
+ if (aws_account := raw_finding.get("awsAccountId")) is not None:
+ description += f"**AWS Account**: {aws_account}\n"
+ if finding_id is not None:
+ description += f"**Finding ARN**: {finding_id}\n"
+ if (inspector_score := raw_finding.get("inspectorScore")) is not None:
+ description += f"Inspector score: {inspector_score}\n"
+ if (discovered_at := raw_finding.get("firstObservedAt")) is not None:
+ description += f"Discovered at: {discovered_at}\n"
+ if (last_seen_at := raw_finding.get("lastObservedAt")) is not None:
+ description += f"Last seen: {last_seen_at}\n"
+ if (orig_description := raw_finding.get("description")) is not None:
+ description += f"Original description: \n{orig_description}\n"
+ finding = Finding(
+ title=title,
+ test=self.test,
+ description=description,
+ severity=self.get_severity(raw_finding.get("severity", "Info")),
+ unique_id_from_tool=finding_id,
+ static_finding=True,
+ dynamic_finding=False,
+ )
+ # set mitigation status
+ if raw_finding.get("status", "ACTIVE") == "ACTIVE":
+ mitigated = None
+ is_mitigated = False
+ active = True
+ else:
+ is_mitigated = True
+ active = False
+ if (last_observed := raw_finding.get("lastObservedAt")) is not None:
+ mitigated = date_parser(last_observed)
+ else:
+ mitigated = datetime.now(UTC)
+ finding.active = active
+ finding.is_mitigated = is_mitigated
+ finding.mitigated = mitigated
+ # EPSS
+ finding.epss_score = raw_finding.get("epss", {}).get("score", None)
+
+ return finding
+
+ def get_package_vulnerability(self, finding: Finding, raw_finding: dict) -> Finding:
+ vulnerability_details = raw_finding.get("packageVulnerabilityDetails", {})
+ vulnerability_packages_descriptions = "\n".join(
+ [
+ (
+ f'*Vulnerable package*: {vulnerability_package.get("name", "N/A")}\n'
+ f'\tpackage manager: {vulnerability_package.get("packageManager", "N/A")}\n'
+ f'\tversion: {vulnerability_package.get("version", "N/A")}\n'
+ f'\tfixed version: {vulnerability_package.get("fixedInVersion", "N/A")}\n'
+ f'\tremediation: {vulnerability_package.get("remediation", "N/A")}\n'
+ )
+ for vulnerability_package in vulnerability_details.get("vulnerablePackages", [])
+ ],
+ )
+ if (vulnerability_id := vulnerability_details.get("vulnerabilityId", None)) is not None:
+ finding.unsaved_vulnerability_ids = [vulnerability_id]
+ vulnerability_source = vulnerability_details.get("source")
+ vulnerability_source_url = vulnerability_details.get("sourceUrl")
+ # populate fields
+ if vulnerability_source is not None and vulnerability_source_url is not None:
+ finding.url = vulnerability_source_url
+ finding.description += (
+ "\n**Additional info**\n"
+ f"Vulnerability info from: {vulnerability_source} {vulnerability_source_url}\n"
+ "Affected packages:\n"
+ f"{vulnerability_packages_descriptions}\n"
+ )
+
+ return finding
+
+ def get_code_vulnerability(self, finding: Finding, raw_finding: dict) -> Finding:
+ cwes = raw_finding.get("cwes", [])
+ detector_id = raw_finding.get("detectorId", "N/A")
+ detector_name = raw_finding.get("detectorName", "N/A")
+ file_path_info = raw_finding.get("filePath", {})
+ file_name = file_path_info.get("fileName", "N/A")
+ file_path = file_path_info.get("filePath", "N/A")
+ start_line = file_path_info.get("startLine", "N/A")
+ end_line = file_path_info.get("endLine", "N/A")
+ detector_tags = ", ".join(raw_finding.get("detectorTags", []))
+ reference_urls = ", ".join(raw_finding.get("referenceUrls", []))
+ rule_id = raw_finding.get("ruleId", "N/A")
+ layer_arn = raw_finding.get("sourceLambdaLayerArn", "N/A")
+ string_cwes = ", ".join(cwes)
+ # populate fields
+ finding.cwe = cwes[0] if cwes else None
+ finding.file_path = f"{file_path}{file_name}"
+ finding.sast_source_file_path = f"{file_path}{file_name}"
+ finding.line = start_line
+ finding.sast_source_line = start_line
+ finding.description += (
+ "\n**Additional info**\n"
+ f"CWEs: {string_cwes}\n"
+ f"Vulnerability info from: {detector_id} {detector_name}\n"
+ f"Rule: {rule_id}\n"
+ f"Lines: {start_line} - {end_line}\n"
+ f"Tags: {detector_tags or 'N/A'}\n"
+ f"URLs: {reference_urls or 'N/A'}\n"
+ f"Lambda layer ARN: {layer_arn}\n"
+ )
+
+ return finding
+
+ def get_network_reachability(self, finding: Finding, raw_finding: dict) -> Finding:
+ network_path_info = raw_finding.get("networkPath", {})
+ network_path_steps = network_path_info.get("steps", [])
+ steps_descriptions = "\n".join(
+ [
+ f'steps:\n{step_number}: {step.get("componentId", "N/A")} {step.get("componentType", "N/A")}'
+ for step_number, step in enumerate(network_path_steps)
+ ],
+ )
+ open_port_range_info = raw_finding.get("openPortRange", {})
+ port_range_start = open_port_range_info.get("begin", "N/A")
+ port_range_end = open_port_range_info.get("end", "N/A")
+ protocol = raw_finding.get("protocol", "N/A")
+ finding.description += (
+ "\n**Additional info**\n"
+ f"protocol {protocol}, port range {port_range_start} - {port_range_end}"
+ f"{steps_descriptions}\n"
+ )
+
+ return finding
+
+ def process_endpoints(self, finding: Finding, raw_finding: dict) -> Finding:
+ impact = []
+ endpoints = []
+ for resource_info in raw_finding.get("resources", {}):
+ resource_type = resource_info.get("type", None)
+ resource_id = resource_info.get("id", "N/A")
+ resource_details = resource_info.get("details", {})
+ endpoint_host = f"{resource_type} - {resource_id}"
+ if resource_type == "AWS_EC2_INSTANCE":
+ aws_account = raw_finding.get("awsAccountId")
+ resource_region = resource_info.get("region", "N/A")
+ endpoint_host = resource_id
+ ec2_instance_details = resource_details.get("awsEc2Instance", None)
+ if ec2_instance_details:
+ impact.extend(
+ (
+ f"ARN: {resource_id}",
+ f"Image ID: {ec2_instance_details.get('imageId', 'N/A')}",
+ f"IPv4 address: {ec2_instance_details.get('ipV4Addresses', 'N/A')}",
+ f"Subnet: {ec2_instance_details.get('subnetId', 'N/A')}",
+ f"VPC: {ec2_instance_details.get('vpcId', 'N/A')}",
+ f"Region: {resource_region}",
+ f"AWS Account: {aws_account}",
+ f"Launched at: {ec2_instance_details.get('launchedAt', 'N/A')}",
+ "---",
+ ),
+ )
+ elif resource_type == "AWS_ECR_CONTAINER_IMAGE":
+ image_id = resource_id.split("repository/")[1].replace("sha256:", "").replace("/", "-")
+ endpoint_host = image_id
+ ecr_image_details = resource_details.get("awsEcrContainerImage", None)
+ if ecr_image_details:
+ impact.extend(
+ (
+ f"ARN: {resource_id}",
+ f"Registry: {ecr_image_details.get('registry', 'N/A')}",
+ f"Repository: {ecr_image_details.get('repositoryName', 'N/A')}",
+ f"Hash: {ecr_image_details.get('imageHash', 'N/A')}",
+ f"Author: {ecr_image_details.get('author', 'N/A')}",
+ f"Pushed at: {ecr_image_details.get('pushedAt', 'N/A')}",
+ "---",
+ ),
+ )
+ elif resource_type == "AWS_ECR_REPOSITORY":
+ # no corresponding
+ # key present in
+ # https://docs.aws.amazon.com/inspector/v2/APIReference/API_ResourceDetails.html
+ pass
+ elif resource_type == "AWS_LAMBDA_FUNCTION":
+ lambda_id = resource_id.split("function:")[1].replace(":", "-").replace("/", "-")
+ endpoint_host = lambda_id
+ lambda_details = resource_details.get("awsLambdaFunction", None)
+ if lambda_details:
+ impact.extend(
+ (
+ f"ARN: {resource_id}",
+ f"Name: {lambda_details.get('functionName', 'N/A')}",
+ f"Version: {lambda_details.get('version', 'N/A')}",
+ f"Runtime: {lambda_details.get('runtime', 'N/A')}",
+ f"Hash: {lambda_details.get('codeSha256', 'N/A')}",
+ f"Pushed at: {lambda_details.get('lastModifiedAt', 'N/A')}",
+ ),
+ )
+ else:
+ msg = "Incorrect Inspector2 report format"
+ raise TypeError(msg)
+ endpoints.append(Endpoint(host=endpoint_host))
+ finding.impact = "\n".join(impact)
+ finding.unsaved_endpoints = []
+ finding.unsaved_endpoints.extend(endpoints)
+
+ return finding
diff --git a/dojo/tools/aws_prowler/parser.py b/dojo/tools/aws_prowler/parser.py
index 7093a596012..e24ac155296 100755
--- a/dojo/tools/aws_prowler/parser.py
+++ b/dojo/tools/aws_prowler/parser.py
@@ -65,16 +65,10 @@ def process_csv(self, file, test):
# title = re.sub(r"\[.*\]\s", "", result_extended)
control = re.sub(r"\[.*\]\s", "", title_text)
sev = self.getCriticalityRating(result, level, severity)
- if result == "INFO" or result == "PASS":
- active = False
- else:
- active = True
+ active = not (result == "INFO" or result == "PASS")
# creating description early will help with duplication control
- if not level:
- level = ""
- else:
- level = ", " + level
+ level = "" if not level else ", " + level
description = (
"**Issue:** "
+ str(result_extended)
@@ -160,10 +154,7 @@ def process_json(self, file, test):
sev = self.getCriticalityRating("FAIL", level, severity)
# creating description early will help with duplication control
- if not level:
- level = ""
- else:
- level = ", " + level
+ level = "" if not level else ", " + level
description = (
"**Issue:** "
+ str(result_extended)
@@ -221,19 +212,15 @@ def formatview(self, depth):
# Criticality rating
def getCriticalityRating(self, result, level, severity):
- criticality = "Info"
if result == "INFO" or result == "PASS":
- criticality = "Info"
- elif result == "FAIL":
+ return "Info"
+ if result == "FAIL":
if severity:
# control is failing but marked as Info so we want to mark as
# Low to appear in the Dojo
if severity == "Informational":
return "Low"
return severity
- if level == "Level 1":
- criticality = "Critical"
- else:
- criticality = "High"
+ return "Critical" if level == "Level 1" else "High"
- return criticality
+ return "Info"
diff --git a/dojo/tools/aws_prowler_v3plus/prowler_v4.py b/dojo/tools/aws_prowler_v3plus/prowler_v4.py
index 1b9c155b63a..dd543f27f57 100644
--- a/dojo/tools/aws_prowler_v3plus/prowler_v4.py
+++ b/dojo/tools/aws_prowler_v3plus/prowler_v4.py
@@ -37,7 +37,8 @@ def process_ocsf_json(self, file, test):
documentation = deserialized.get("remediation", {}).get("references", "")
documentation = str(documentation) + "\n" + str(deserialized.get("unmapped", {}).get("related_url", ""))
security_domain = deserialized.get("resources", [{}])[0].get("type", "")
- timestamp = deserialized.get("event_time")
+ # Prowler v4.5.0 changed 'event_time' key in report with 'time_dt'
+ timestamp = deserialized.get("time_dt") or deserialized.get("event_time")
resource_arn = deserialized.get("resources", [{}])[0].get("uid", "")
resource_id = deserialized.get("resources", [{}])[0].get("name", "")
unique_id_from_tool = deserialized.get("finding_info", {}).get("uid", "")
diff --git a/dojo/tools/awssecurityhub/compliance.py b/dojo/tools/awssecurityhub/compliance.py
index 5fea1a8a786..563a4995b99 100644
--- a/dojo/tools/awssecurityhub/compliance.py
+++ b/dojo/tools/awssecurityhub/compliance.py
@@ -1,4 +1,4 @@
-from datetime import datetime
+import datetime
from dojo.models import Finding
@@ -29,13 +29,13 @@ def get_item(self, finding: dict, test):
if finding.get("Compliance", {}).get("Status", "PASSED") == "PASSED":
is_Mitigated = True
active = False
- if finding.get("LastObservedAt", None):
+ if finding.get("LastObservedAt"):
try:
- mitigated = datetime.strptime(finding.get("LastObservedAt"), "%Y-%m-%dT%H:%M:%S.%fZ")
+ mitigated = datetime.datetime.strptime(finding.get("LastObservedAt"), "%Y-%m-%dT%H:%M:%S.%fZ")
except Exception:
- mitigated = datetime.strptime(finding.get("LastObservedAt"), "%Y-%m-%dT%H:%M:%fZ")
+ mitigated = datetime.datetime.strptime(finding.get("LastObservedAt"), "%Y-%m-%dT%H:%M:%fZ")
else:
- mitigated = datetime.utcnow()
+ mitigated = datetime.datetime.now(datetime.UTC)
else:
mitigated = None
is_Mitigated = False
diff --git a/dojo/tools/awssecurityhub/guardduty.py b/dojo/tools/awssecurityhub/guardduty.py
index 40b26649500..9f1cfb63aab 100644
--- a/dojo/tools/awssecurityhub/guardduty.py
+++ b/dojo/tools/awssecurityhub/guardduty.py
@@ -1,4 +1,4 @@
-from datetime import datetime
+import datetime
from dojo.models import Endpoint, Finding
@@ -23,13 +23,13 @@ def get_item(self, finding: dict, test):
mitigated = None
else:
is_Mitigated = True
- if finding.get("LastObservedAt", None):
+ if finding.get("LastObservedAt"):
try:
- mitigated = datetime.strptime(finding.get("LastObservedAt"), "%Y-%m-%dT%H:%M:%S.%fZ")
+ mitigated = datetime.datetime.strptime(finding.get("LastObservedAt"), "%Y-%m-%dT%H:%M:%S.%fZ")
except Exception:
- mitigated = datetime.strptime(finding.get("LastObservedAt"), "%Y-%m-%dT%H:%M:%fZ")
+ mitigated = datetime.datetime.strptime(finding.get("LastObservedAt"), "%Y-%m-%dT%H:%M:%fZ")
else:
- mitigated = datetime.utcnow()
+ mitigated = datetime.datetime.now(datetime.UTC)
description = f"This is a GuardDuty Finding\n{finding.get('Description', '')}" + "\n"
description += f"**AWS Finding ARN:** {finding_id}\n"
if finding.get("SourceUrl"):
diff --git a/dojo/tools/awssecurityhub/inspector.py b/dojo/tools/awssecurityhub/inspector.py
index 61b18be5bf8..5235bf70a05 100644
--- a/dojo/tools/awssecurityhub/inspector.py
+++ b/dojo/tools/awssecurityhub/inspector.py
@@ -1,4 +1,4 @@
-from datetime import datetime
+import datetime
from dojo.models import Endpoint, Finding
@@ -12,10 +12,7 @@ def get_item(self, finding: dict, test):
impact = []
references = []
unsaved_vulnerability_ids = []
- if finding.get("EpssScore") is not None:
- epss_score = finding.get("EpssScore")
- else:
- epss_score = None
+ epss_score = finding.get("EpssScore")
description = f"This is an Inspector Finding\n{finding.get('Description', '')}" + "\n"
description += f"**AWS Finding ARN:** {finding_id}\n"
description += f"**AwsAccountId:** {finding.get('AwsAccountId', '')}\n"
@@ -46,13 +43,13 @@ def get_item(self, finding: dict, test):
else:
is_Mitigated = True
active = False
- if finding.get("LastObservedAt", None):
+ if finding.get("LastObservedAt"):
try:
- mitigated = datetime.strptime(finding.get("LastObservedAt"), "%Y-%m-%dT%H:%M:%S.%fZ")
+ mitigated = datetime.datetime.strptime(finding.get("LastObservedAt"), "%Y-%m-%dT%H:%M:%S.%fZ")
except Exception:
- mitigated = datetime.strptime(finding.get("LastObservedAt"), "%Y-%m-%dT%H:%M:%fZ")
+ mitigated = datetime.datetime.strptime(finding.get("LastObservedAt"), "%Y-%m-%dT%H:%M:%fZ")
else:
- mitigated = datetime.utcnow()
+ mitigated = datetime.datetime.now(datetime.UTC)
title_suffix = ""
hosts = []
for resource in finding.get("Resources", []):
diff --git a/dojo/tools/awssecurityhub/parser.py b/dojo/tools/awssecurityhub/parser.py
index e59afa23ce3..94041a6bc14 100755
--- a/dojo/tools/awssecurityhub/parser.py
+++ b/dojo/tools/awssecurityhub/parser.py
@@ -47,7 +47,7 @@ def get_findings(self, filehandle, test):
def get_items(self, tree: dict, test):
items = {}
- findings = tree.get("Findings", tree.get("findings", None))
+ findings = tree.get("Findings", tree.get("findings"))
if not isinstance(findings, list):
msg = "Incorrect Security Hub report format"
raise TypeError(msg)
diff --git a/dojo/tools/azure_security_center_recommendations/parser.py b/dojo/tools/azure_security_center_recommendations/parser.py
index 9838f65ae58..5fc42a7a193 100755
--- a/dojo/tools/azure_security_center_recommendations/parser.py
+++ b/dojo/tools/azure_security_center_recommendations/parser.py
@@ -35,7 +35,7 @@ def process_csv(self, file, test):
findings = []
for row in reader:
- if "unhealthy" == row.get("state").lower():
+ if row.get("state").lower() == "unhealthy":
subscription_id = row.get("subscriptionId")
subscription_name = row.get("subscriptionName")
resource_group = row.get("resourceGroup")
diff --git a/dojo/tools/bandit/parser.py b/dojo/tools/bandit/parser.py
index 3e4e54fcd8b..6beca950ef9 100755
--- a/dojo/tools/bandit/parser.py
+++ b/dojo/tools/bandit/parser.py
@@ -64,10 +64,10 @@ def get_findings(self, filename, test):
return results
def convert_confidence(self, value):
- if "high" == value.lower():
+ if value.lower() == "high":
return 2
- if "medium" == value.lower():
+ if value.lower() == "medium":
return 3
- if "low" == value.lower():
+ if value.lower() == "low":
return 6
return None
diff --git a/dojo/tools/bearer_cli/parser.py b/dojo/tools/bearer_cli/parser.py
index 7cee6dbf4c6..e49ed553d2f 100644
--- a/dojo/tools/bearer_cli/parser.py
+++ b/dojo/tools/bearer_cli/parser.py
@@ -33,7 +33,7 @@ def get_findings(self, file, test):
finding = Finding(
title=bearerfinding["title"] + " in " + bearerfinding["filename"] + ":" + str(bearerfinding["line_number"]),
test=test,
- description=bearerfinding["description"] + "\n Detected code snippet: \n" + bearerfinding["snippet"],
+ description=bearerfinding["description"] + "\n Detected code snippet: \n" + bearerfinding.get("snippet", bearerfinding.get("code_extract")),
severity=severity,
cwe=bearerfinding["cwe_ids"][0],
static_finding=True,
diff --git a/dojo/tools/blackduck/importer.py b/dojo/tools/blackduck/importer.py
index 83175371705..9d50dc7332b 100755
--- a/dojo/tools/blackduck/importer.py
+++ b/dojo/tools/blackduck/importer.py
@@ -4,8 +4,8 @@
import zipfile
from abc import ABC, abstractmethod
from collections import defaultdict
+from collections.abc import Iterable
from pathlib import Path
-from typing import Iterable
from .model import BlackduckFinding
@@ -76,10 +76,7 @@ def _process_project_findings(
file_entry_dict = dict(file_entry)
path = file_entry_dict.get("Path")
archive_context = file_entry_dict.get("Archive context")
- if archive_context:
- full_path = f"{archive_context}{path[1:]}"
- else:
- full_path = path
+ full_path = f"{archive_context}{path[1:]}" if archive_context else path
# 4000 character limit on this field
total_len = len(full_path)
@@ -125,10 +122,7 @@ def __partition_by_key(self, csv_file):
findings = defaultdict(set)
# Backwards compatibility. Newer versions of Blackduck use Component
# id.
- if "Project id" in records.fieldnames:
- key = "Project id"
- else:
- key = "Component id"
+ key = "Project id" if "Project id" in records.fieldnames else "Component id"
for record in records:
findings[record.get(key)].add(frozenset(record.items()))
return findings
diff --git a/dojo/tools/blackduck_binary_analysis/importer.py b/dojo/tools/blackduck_binary_analysis/importer.py
index 4d381aae058..0ada8cca26b 100644
--- a/dojo/tools/blackduck_binary_analysis/importer.py
+++ b/dojo/tools/blackduck_binary_analysis/importer.py
@@ -1,8 +1,8 @@
import csv
from abc import ABC, abstractmethod
from collections import defaultdict
+from collections.abc import Iterable
from pathlib import Path
-from typing import Iterable
from .model import BlackduckBinaryAnalysisFinding
diff --git a/dojo/tools/bugcrowd/parser.py b/dojo/tools/bugcrowd/parser.py
index a643499976a..7cad12ead9d 100755
--- a/dojo/tools/bugcrowd/parser.py
+++ b/dojo/tools/bugcrowd/parser.py
@@ -249,8 +249,5 @@ def convert_severity(self, sev_num):
def get_endpoint(self, url):
stripped_url = url.strip()
- if "://" in stripped_url: # is the host full uri?
- endpoint = Endpoint.from_uri(stripped_url)
- else:
- endpoint = Endpoint.from_uri("//" + stripped_url)
- return endpoint
+ # is the host full uri?
+ return Endpoint.from_uri(stripped_url) if "://" in stripped_url else Endpoint.from_uri("//" + stripped_url)
diff --git a/dojo/tools/bundler_audit/parser.py b/dojo/tools/bundler_audit/parser.py
index c960bb374c8..1534e170ed7 100755
--- a/dojo/tools/bundler_audit/parser.py
+++ b/dojo/tools/bundler_audit/parser.py
@@ -43,10 +43,7 @@ def get_findings(self, filename, test):
advisory_id = field.replace("GHSA: ", "")
elif field.startswith("Criticality"):
criticality = field.replace("Criticality: ", "")
- if criticality.lower() == "unknown":
- sev = "Medium"
- else:
- sev = criticality
+ sev = "Medium" if criticality.lower() == "unknown" else criticality
elif field.startswith("URL"):
advisory_url = field.replace("URL: ", "")
elif field.startswith("Title"):
diff --git a/dojo/tools/burp/parser.py b/dojo/tools/burp/parser.py
index cd5128cb9c1..f30f0c86091 100644
--- a/dojo/tools/burp/parser.py
+++ b/dojo/tools/burp/parser.py
@@ -226,7 +226,7 @@ def get_item(item_node, test):
references = text_maker.handle(references)
severity = item_node.findall("severity")[0].text
- if "information" == severity.lower():
+ if severity.lower() == "information":
severity = "Info"
scanner_confidence = item_node.findall("confidence")[0].text
diff --git a/dojo/tools/burp_api/parser.py b/dojo/tools/burp_api/parser.py
index be25f824978..86a876870c7 100755
--- a/dojo/tools/burp_api/parser.py
+++ b/dojo/tools/burp_api/parser.py
@@ -36,7 +36,7 @@ def get_findings(self, file, test):
# for each issue found
for issue_event in tree.get("issue_events", []):
if (
- "issue_found" == issue_event.get("type")
+ issue_event.get("type") == "issue_found"
and "issue" in issue_event
):
issue = issue_event.get("issue")
@@ -52,7 +52,7 @@ def get_findings(self, file, test):
)
false_p = False
# manage special case of false positives
- if "false_positive" == issue.get("severity", "undefined"):
+ if issue.get("severity", "undefined") == "false_positive":
false_p = True
finding = Finding(
@@ -160,10 +160,10 @@ def convert_confidence(issue):
},
"""
value = issue.get("confidence", "undefined").lower()
- if "certain" == value:
+ if value == "certain":
return 2
- if "firm" == value:
+ if value == "firm":
return 3
- if "tentative" == value:
+ if value == "tentative":
return 6
return None
diff --git a/dojo/tools/burp_enterprise/parser.py b/dojo/tools/burp_enterprise/parser.py
index aab8e565242..052d8a80f84 100755
--- a/dojo/tools/burp_enterprise/parser.py
+++ b/dojo/tools/burp_enterprise/parser.py
@@ -1,7 +1,7 @@
import logging
import re
-from lxml import etree
+from lxml import etree, html
from dojo.models import Endpoint, Finding
@@ -9,6 +9,16 @@
class BurpEnterpriseParser:
+ vulnerability_list_xpath = (
+ "/html/body/div/div[contains(@class, 'section details')]/div[contains(@class, 'issue-container')]"
+ )
+ table_contents_xpath = "/html/body/div/div[contains(@class, 'section') and .//table[contains(@class, 'issue-table')]]"
+ description_headers = ["issue detail", "issue description"]
+ request_response_headers = ["request", "response"]
+ impact_headers = ["issue background", "issue remediation"]
+ mitigation_headers = ["remediation detail", "remediation background"]
+ references_headers = ["vulnerability classifications", "references"]
+
def get_scan_types(self):
return ["Burp Enterprise Scan"]
@@ -19,230 +29,231 @@ def get_description_for_scan_types(self, scan_type):
return "Import Burp Enterprise Edition findings in HTML format"
def get_findings(self, filename, test):
- parser = etree.HTMLParser()
- tree = etree.parse(filename, parser)
+ tree = html.parse(filename)
if tree:
return self.get_items(tree, test)
return ()
- def get_content(self, container):
+ def _get_endpoints_title_severity_mapping(self, tree: etree.ElementTree) -> dict[str, str]:
+ """
+ Construct a dict that contains mappings of endpoints and severities by a a title key.
+
+ Example: {
+ "finding-title": {
+ "title": "finding-title",
+ "severity: "Medium",
+ "cwe": None,
+ "endpoints: [
+ "http://127.0.0.1/path/A",
+ "http://127.0.0.1/path/B",
+ ],
+ }
+ }
+ """
+ finding_mapping = {}
+ table_contents = tree.xpath(self.table_contents_xpath)
+ for table in table_contents:
+ # There is only one header in this div, so we will get a string back here
+ base_endpoint = table.xpath("h1")[0].text.replace("Issues found on ", "").removesuffix("/")
+ # Iterate over the table of endpoint paths and severities
+ title = None
+ for entry in table.xpath("table[contains(@class, 'issue-table')]/tbody/tr"):
+ # The etree.element with a class of "issue-type-row" is the title of the finding
+ if "issue-type-row" in entry.classes:
+ # The structure of this section is consistent
+ # ... [number-of-instances] ...
+ # ...
+ # Quick check to determine if we need to move to the
+ path = entry.xpath("td")[0].text.strip()
+ severity = entry.xpath("td")[1].text.strip()
+ # Update the finding_mapping
+ finding_mapping[title]["endpoints"].append(f"{base_endpoint}/{path.removeprefix('/')}")
+ finding_mapping[title]["severity"] = severity
+
+ return finding_mapping
+
+ def _get_content(self, container: etree.Element):
+ # quick exit in case container is not found
s = ""
+ if container is None or (isinstance(container, list) and len(list) == 0):
+ return s
+ # Do some extra processing as needed
if (
container.tag == "div"
and container.text is not None
and not container.text.isspace()
and len(container.text) > 0
):
- s += (
+ s += re.sub(r"[ \t]+", " ", (
"".join(container.itertext())
.strip()
.replace("Snip", "\n<-------------- Snip -------------->")
.replace("\t", "")
- )
+ ))
else:
for elem in container.iterchildren():
if elem.text is not None and elem.text.strip() != "":
+ stripped_text = elem.text.strip()
if elem.tag == "a":
- s += (
- "("
- + elem.text
- + ")["
- + elem.attrib["href"]
- + "]"
- + "\n"
- )
+ value = "[" + stripped_text + "](" + elem.attrib["href"] + ")" + "\n"
elif elem.tag == "p":
- s += elem.text + "\n"
+ value = elem.text_content().strip().replace("\n", "")
+ elif elem.tag == "b":
+ value = f"**{stripped_text}**"
elif elem.tag == "li":
- s += "* "
- if elem.text is not None:
- s += elem.text + "\n"
- elif elem.text.isspace():
- s += list(elem.itertext())[0]
+ value = "- "
+ if stripped_text is not None:
+ value += stripped_text + "\n"
+ elif stripped_text.isspace():
+ value = list(elem.itertext())[0]
elif elem.tag == "div" or elem.tag == "span":
- s += elem.text.strip() + "\n"
+ value = elem.text_content().strip().replace("\n", "") + "\n"
else:
continue
+ s += re.sub(r"\s+", " ", value)
else:
- s += self.get_content(elem)
+ s += self._get_content(elem)
return s
- # Get the endpoints and severities associated with each vulnerability
- def pre_allocate_items(self, tree):
- items = []
- endpoint_text = tree.xpath(
- "/html/body/div/div[contains(@class, 'section')]/h1",
- )
- severities = tree.xpath(
- "/html/body/div/div[contains(@class, 'section')]/table[contains(@class, 'issue-table')]/tbody",
- )
- endpoint_text = [
- endpoint
- for endpoint in endpoint_text
- if ("Issues found" in "".join(endpoint.itertext()).strip())
- ]
-
- for index in range(len(severities)):
- url = endpoint_text[index].text[16:]
- sev_table = list(severities[index].iter("tr"))
-
- title = ""
- endpoint = ""
- for item in sev_table:
- item_list = list(item.iter("td"))
- if len(item_list) == 1:
- title_list = item_list[0].text.strip().split(" ")
- title = " ".join(title_list[:-1])
- else:
- endpoint = item_list[0].text.strip()
- severity = item_list[1].text.strip()
- vuln = {}
- vuln["Severity"] = severity
- vuln["Title"] = title
- vuln["Description"] = ""
- vuln["Impact"] = ""
- vuln["Mitigation"] = ""
- vuln["References"] = ""
- vuln["CWE"] = ""
- vuln["Response"] = ""
- vuln["Request"] = ""
- vuln["Endpoint"] = [url + endpoint]
- vuln["URL"] = url
- items.append(vuln)
- return items
-
- def get_items(self, tree, test):
- # Check that there is at least one vulnerability (the vulnerabilities
- # table is absent when no vuln are found)
- vulns = tree.xpath(
- "/html/body/div/div[contains(@class, 'section details')]/div[contains(@class, 'issue-container')]",
- )
- if len(vulns) == 0:
- return []
-
- dict_index = 0
- description = ["Issue detail:", "Issue description"]
- reqrsp = ["Request", "Response"]
- impact = ["Issue background", "Issue remediation"]
- mitigation = ["Remediation detail:", "Remediation background"]
- references = ["Vulnerability classifications", "References"]
- vuln = None
- merge = False
- items = self.pre_allocate_items(tree)
- for issue in vulns:
- elems = list(issue.iterchildren())
- curr_vuln = items[dict_index]
- if vuln is None or (
- curr_vuln["Title"] != vuln["Title"]
- or curr_vuln["URL"] != vuln["URL"]
- ):
- vuln = curr_vuln
- merge = False
- else:
- if curr_vuln["Endpoint"][0] not in vuln["Endpoint"]:
- vuln_list = vuln["Endpoint"]
- vuln_list.append(curr_vuln["Endpoint"][0])
- vuln["Endpoint"] = vuln_list
- merge = True
-
- for index in range(3, len(elems), 2):
- primary, secondary = (
- elems[index].text.strip(),
- elems[index + 1],
- )
- field = self.get_content(secondary)
- webinfo = primary.split(":")[0]
- details = "**" + primary + "**\n" + field + "\n\n"
- # Description
- if primary in description:
- if merge:
- if field != vuln["Description"].split("\n")[1]:
- vuln["Description"] = (
- vuln["Description"] + field + "\n\n"
- )
- else:
- vuln["Description"] = vuln["Description"] + details
- # Impact
- if primary in impact and not merge:
- vuln["Impact"] = vuln["Impact"] + details
- # Mitigation
- if primary in mitigation and not merge:
- vuln["Mitigation"] = vuln["Mitigation"] + details
- # References and CWE
- if primary in references and not merge:
- if len(vuln["CWE"]) < 1 and field.find("CWE") != -1:
- vuln["CWE"] += str(self.get_cwe(field))
- vuln["References"] = vuln["References"] + details
- # Request and Response pairs
- if webinfo in reqrsp:
- if webinfo == "Request":
- vuln["Request"] = vuln["Request"] + field + "SPLITTER"
+ def _format_bulleted_lists(self, finding_details: dict, div_element: etree.ElementTree) -> tuple[str, list[str]]:
+ """Create a mapping of bulleted lists with links into a formatted list, as well as the raw values."""
+ formatted_string = ""
+ content_list = []
+ for a_tag in div_element.xpath("ul/li/a"):
+ content = re.sub(r"\s+", " ", a_tag.text.strip())
+ link = a_tag.attrib["href"]
+ formatted_string += f"- [{content}]({link})\n"
+ content_list.append(content)
+
+ return formatted_string, content_list
+
+ def _set_or_append_content(self, finding_details: dict, header: str, div_element: etree.ElementTree) -> None:
+ """Determine whether we should set or append content in a given place."""
+ header = header.replace(":", "")
+ field = None
+ # description
+ if header.lower() in self.description_headers:
+ field = "description"
+ content = self._get_content(div_element)
+ elif header.lower() in self.impact_headers:
+ field = "impact"
+ content = self._get_content(div_element)
+ elif header.lower() in self.mitigation_headers:
+ field = "mitigation"
+ content = self._get_content(div_element)
+ elif header.lower() in self.references_headers:
+ field = "references"
+ content, data_list = self._format_bulleted_lists(finding_details, div_element)
+ # process the vulnerability_ids if we have them
+ if header.lower() == "vulnerability classifications":
+ for item in data_list:
+ cleaned_item = item.split(":")[0]
+ if (
+ finding_details["cwe"] is None
+ and (cwe_search := re.search("CWE-([0-9]*)", cleaned_item, re.IGNORECASE))
+ ):
+ finding_details["cwe"] = int(cwe_search.group(1))
+ if "vulnerability_ids" not in finding_details:
+ finding_details["vulnerability_ids"] = [cleaned_item]
else:
- vuln["Response"] = (
- vuln["Response"] + field + "SPLITTER"
- )
-
- dict_index += 1
-
- return list(self.create_findings(items, test))
-
- def get_cwe(self, vuln_references):
- # Match only the first CWE!
- vuln_references = vuln_references.split(":")[0]
- cweSearch = re.search("CWE-([0-9]*)", vuln_references, re.IGNORECASE)
- if cweSearch:
- return cweSearch.group(1)
- return 0
-
- def create_findings(self, items, test):
- # Dictonary to hold the aggregated findings with:
- # - key: the concatenated aggregate keys
- # - value: the finding
- dupes = {}
- for details in items:
- if details.get("Description") == "":
- continue
- aggregateKeys = "{}{}{}{}".format(
- details.get("Title"),
- details.get("Description"),
- details.get("CWE"),
- details.get("Endpoint"),
- )
- detail_cwe = None
- if details.get("CWE"):
- detail_cwe = int(details.get("CWE"))
- find = Finding(
- title=details.get("Title"),
- description=details.get("Description"),
+ finding_details["vulnerability_ids"].append(cleaned_item)
+ elif header.lower() in self.request_response_headers:
+ field = "request_response"
+ content = self._get_content(div_element)
+ if header.lower() == "request":
+ if "requests" not in finding_details:
+ finding_details["requests"] = [content]
+ else:
+ finding_details["requests"].append(content)
+ if header.lower() == "response":
+ if "responses" not in finding_details:
+ finding_details["responses"] = [content]
+ else:
+ finding_details["responses"].append(content)
+ return
+
+ else:
+ return
+
+ formatted_content = f"**{header}**:\n{content}\n"
+ if (existing_field := finding_details.get(field)) is not None:
+ if header not in existing_field:
+ finding_details[field] += f"{formatted_content}\n---\n"
+ else:
+ finding_details[field] = f"{formatted_content}\n---\n"
+
+ def _parse_elements_by_h3_element(self, issue: etree.Element, finding_details: dict) -> None:
+ for header_element in issue.xpath("h3"):
+ if (div_element := header_element.getnext()) is not None and div_element.tag == "div":
+ # Determine where to put the content
+ self._set_or_append_content(finding_details, header_element.text.strip(), div_element)
+
+ def get_items(self, tree: etree.ElementTree, test):
+ finding_details = self._get_endpoints_title_severity_mapping(tree)
+ for issue in tree.xpath(self.vulnerability_list_xpath):
+ # Get the title of the current finding
+ title = issue.xpath("h2")[0].text.strip()
+ # Fetch the bodies of the issues and process them
+ self._parse_elements_by_h3_element(issue, finding_details[title])
+ # Accommodate a newer format where request/response pairs in a separate div
+ for request_response_div in issue.xpath("div[contains(@class, 'evidence-container')]"):
+ # Fetch the bodies of the issues and process them
+ self._parse_elements_by_h3_element(request_response_div, finding_details[title])
+ # Merge the requests and response into a single dict
+ requests = finding_details[title].pop("requests", [])
+ responses = finding_details[title].pop("responses", [])
+ finding_details[title]["request_response_pairs"] = [
+ {
+ "request": requests[i] if i < len(requests) else None,
+ "response": responses[i] if i < len(responses) else None,
+ }
+ for i in range(max(len(requests), len(responses)))
+ ]
+
+ return list(self.create_findings(finding_details, test))
+
+ def create_findings(self, findings_dict: dict[str, dict], test):
+ # Pop off a few items to be processes after the finding is saved
+ findings = []
+ for finding_dict in findings_dict.values():
+ endpoints = finding_dict.pop("endpoints", [])
+ request_response_pairs = finding_dict.pop("request_response_pairs", [])
+ vulnerability_ids = finding_dict.pop("vulnerability_ids", [])
+ # Crete the finding from the rest of the dict
+ finding = Finding(
test=test,
- severity=details.get("Severity"),
- mitigation=details.get("Mitigation"),
- references=details.get("References"),
- impact=details.get("Impact"),
- cwe=detail_cwe,
false_p=False,
duplicate=False,
out_of_scope=False,
mitigated=None,
static_finding=False,
dynamic_finding=True,
- nb_occurences=1,
+ **finding_dict,
)
+ # Add the unsaved versions of the other things
+ # Endpoints
+ finding.unsaved_endpoints = [Endpoint.from_uri(endpoint) for endpoint in endpoints]
+ # Request Response Pairs
- if len(details.get("Request")) > 0:
- requests = details.get("Request").split("SPLITTER")[:-1]
- responses = details.get("Response").split("SPLITTER")[:-1]
- unsaved_req_resp = []
- for index in range(len(requests)):
- unsaved_req_resp.append(
- {"req": requests[index], "resp": responses[index]},
- )
- find.unsaved_req_resp = unsaved_req_resp
-
- find.unsaved_endpoints = []
- dupes[aggregateKeys] = find
-
- for url in details.get("Endpoint"):
- find.unsaved_endpoints.append(Endpoint.from_uri(url))
+ finding.unsaved_req_resp = [
+ {"req": request_response.get("request"), "resp": request_response.get("response")}
+ for request_response in request_response_pairs
+ ]
+ # Vulnerability IDs
+ finding.unsaved_vulnerability_ids = vulnerability_ids
+ # Add the finding to the final list
+ findings.append(finding)
- return list(dupes.values())
+ return findings
diff --git a/dojo/tools/cargo_audit/parser.py b/dojo/tools/cargo_audit/parser.py
index d85d2e0d54f..e067214f506 100755
--- a/dojo/tools/cargo_audit/parser.py
+++ b/dojo/tools/cargo_audit/parser.py
@@ -25,12 +25,7 @@ def get_findings(self, filename, test):
advisory = item.get("advisory")
vuln_id = advisory.get("id")
vulnerability_ids = [advisory.get("id")]
- if "categories" in advisory:
- categories = (
- f"**Categories:** {', '.join(advisory['categories'])}"
- )
- else:
- categories = ""
+ categories = f"**Categories:** {', '.join(advisory['categories'])}" if "categories" in advisory else ""
description = (
categories
+ f"\n**Description:** `{advisory.get('description')}`"
@@ -62,10 +57,7 @@ def get_findings(self, filename, test):
package_version = item.get("package").get("version")
title = f"[{package_name} {package_version}] {advisory.get('title')}"
severity = "High"
- if "keywords" in advisory:
- tags = advisory.get("keywords")
- else:
- tags = []
+ tags = advisory.get("keywords") if "keywords" in advisory else []
try:
mitigation = f"**Update {package_name} to** {', '.join(item['versions']['patched'])}"
except KeyError:
diff --git a/dojo/tools/checkmarx/parser.py b/dojo/tools/checkmarx/parser.py
index 0d5607f5095..7cca60b57e8 100644
--- a/dojo/tools/checkmarx/parser.py
+++ b/dojo/tools/checkmarx/parser.py
@@ -140,10 +140,7 @@ def _process_result_file_name_aggregated(
query, result,
)
sinkFilename = lastPathnode.find("FileName").text
- if sinkFilename:
- title = "{} ({})".format(titleStart, sinkFilename.split("/")[-1])
- else:
- title = titleStart
+ title = "{} ({})".format(titleStart, sinkFilename.split("/")[-1]) if sinkFilename else titleStart
false_p = result.get("FalsePositive")
sev = result.get("Severity")
aggregateKeys = f"{cwe}{sev}{sinkFilename}"
@@ -368,7 +365,7 @@ def _parse_date(self, value):
if isinstance(value, str):
return parser.parse(value).date()
if isinstance(value, dict) and isinstance(value.get("seconds"), int):
- return datetime.datetime.utcfromtimestamp(value.get("seconds")).date()
+ return datetime.datetime.fromtimestamp(value.get("seconds"), datetime.UTC).date()
return None
def _get_findings_json(self, file, test):
diff --git a/dojo/tools/checkmarx_one/parser.py b/dojo/tools/checkmarx_one/parser.py
index a48023e5d6f..f1a673c52da 100644
--- a/dojo/tools/checkmarx_one/parser.py
+++ b/dojo/tools/checkmarx_one/parser.py
@@ -1,7 +1,6 @@
import datetime
import json
import re
-from typing import List
from dateutil import parser
from django.conf import settings
@@ -23,7 +22,7 @@ def _parse_date(self, value):
if isinstance(value, str):
return parser.parse(value)
if isinstance(value, dict) and isinstance(value.get("seconds"), int):
- return datetime.datetime.utcfromtimestamp(value.get("seconds"))
+ return datetime.datetime.fromtimestamp(value.get("seconds"), datetime.UTC)
return None
def _parse_cwe(self, cwe):
@@ -40,7 +39,7 @@ def parse_vulnerabilities_from_scan_list(
self,
test: Test,
data: dict,
- ) -> List[Finding]:
+ ) -> list[Finding]:
findings = []
cwe_store = data.get("vulnerabilityDetails", [])
# SAST
@@ -59,7 +58,7 @@ def parse_iac_vulnerabilities(
test: Test,
results: list,
cwe_store: list,
- ) -> List[Finding]:
+ ) -> list[Finding]:
findings = []
for technology in results:
# Set the name aside for use in the title
@@ -109,7 +108,7 @@ def parse_sca_vulnerabilities(
test: Test,
results: list,
cwe_store: list,
- ) -> List[Finding]:
+ ) -> list[Finding]:
# Not implemented yet
return []
@@ -118,7 +117,7 @@ def parse_sast_vulnerabilities(
test: Test,
results: list,
cwe_store: list,
- ) -> List[Finding]:
+ ) -> list[Finding]:
def get_cwe_store_entry(cwe_store: list, cwe: int) -> dict:
# Quick base case
if cwe is None:
@@ -197,7 +196,7 @@ def parse_vulnerabilities(
self,
test: Test,
results: list,
- ) -> List[Finding]:
+ ) -> list[Finding]:
findings = []
for result in results:
id = result.get("identifiers")[0].get("value")
@@ -233,7 +232,7 @@ def parse_results(
self,
test: Test,
results: list,
- ) -> List[Finding]:
+ ) -> list[Finding]:
findings = []
for vulnerability in results:
result_type = vulnerability.get("type")
@@ -263,6 +262,9 @@ def get_results_sast(
description = vulnerability.get("description")
file_path = vulnerability.get("data").get("nodes")[0].get("fileName")
unique_id_from_tool = vulnerability.get("id", vulnerability.get("similarityId"))
+ if description is None:
+ description = vulnerability.get("severity").title() + " " + vulnerability.get("data").get("queryName").replace("_", " ")
+
return Finding(
description=description,
title=description,
@@ -281,6 +283,9 @@ def get_results_kics(
description = vulnerability.get("description")
file_path = vulnerability.get("data").get("filename", vulnerability.get("data").get("fileName"))
unique_id_from_tool = vulnerability.get("id", vulnerability.get("similarityId"))
+ if description is None:
+ description = vulnerability.get("severity").title() + " " + vulnerability.get("data").get("queryName").replace("_", " ")
+
return Finding(
title=description,
description=description,
@@ -299,6 +304,9 @@ def get_results_sca(
) -> Finding:
description = vulnerability.get("description")
unique_id_from_tool = vulnerability.get("id", vulnerability.get("similarityId"))
+ if description is None:
+ description = vulnerability.get("severity").title() + " " + vulnerability.get("data").get("queryName").replace("_", " ")
+
finding = Finding(
title=description,
description=description,
diff --git a/dojo/tools/checkov/parser.py b/dojo/tools/checkov/parser.py
index 95f007e83b3..fe0b513a95d 100755
--- a/dojo/tools/checkov/parser.py
+++ b/dojo/tools/checkov/parser.py
@@ -64,7 +64,7 @@ def get_items(self, tree, test, check_type):
def get_item(vuln, test, check_type):
title = (
- vuln["check_name"] if "check_name" in vuln else "check_name not found"
+ vuln.get("check_name", "check_name not found")
)
description = f"Check Type: {check_type}\n"
vuln_id = ""
@@ -74,7 +74,7 @@ def get_item(vuln, test, check_type):
if "check_name" in vuln:
description += f"{vuln['check_name']}\n"
- file_path = vuln["file_path"] if "file_path" in vuln else None
+ file_path = vuln.get("file_path", None)
source_line = None
if "file_line_range" in vuln:
lines = vuln["file_line_range"]
@@ -94,8 +94,8 @@ def get_item(vuln, test, check_type):
mitigation = ""
- references = vuln["guideline"] if "guideline" in vuln else ""
- finding = Finding(
+ references = vuln.get("guideline", "")
+ return Finding(
title=title,
test=test,
description=description,
diff --git a/dojo/tools/clair/clairklar_parser.py b/dojo/tools/clair/clairklar_parser.py
index bc168fbabab..3934599bf6a 100644
--- a/dojo/tools/clair/clairklar_parser.py
+++ b/dojo/tools/clair/clairklar_parser.py
@@ -45,9 +45,7 @@ def get_items_clairklar(self, tree_severity, test):
def get_item_clairklar(self, item_node, test):
if item_node["Severity"] == "Negligible":
severity = "Info"
- elif item_node["Severity"] == "Unknown":
- severity = "Critical"
- elif item_node["Severity"] == "Defcon1":
+ elif item_node["Severity"] == "Unknown" or item_node["Severity"] == "Defcon1":
severity = "Critical"
else:
severity = item_node["Severity"]
diff --git a/dojo/tools/codechecker/parser.py b/dojo/tools/codechecker/parser.py
index 5e96c75be35..7bdccf5b36e 100755
--- a/dojo/tools/codechecker/parser.py
+++ b/dojo/tools/codechecker/parser.py
@@ -56,13 +56,13 @@ def get_item(vuln):
description += "{}\n".format(vuln["message"])
location = vuln["file"]
- file_path = location["path"] if "path" in location else None
+ file_path = location.get("path", None)
if file_path:
description += f"File path: {file_path}\n"
- line = vuln["line"] if "line" in vuln else None
- column = vuln["column"] if "column" in vuln else None
+ line = vuln.get("line", None)
+ column = vuln.get("column", None)
if line is not None and column is not None:
description += f"Location in file: line {line}, column {column}\n"
diff --git a/dojo/tools/contrast/parser.py b/dojo/tools/contrast/parser.py
index 9367bdcf6dd..6409c0eea3d 100755
--- a/dojo/tools/contrast/parser.py
+++ b/dojo/tools/contrast/parser.py
@@ -41,9 +41,7 @@ def get_findings(self, filename, test):
severity = row.get("Severity")
if severity == "Note":
severity = "Info"
- date_raw = datetime.datetime.utcfromtimestamp(
- int(row.get("First Seen")) / 1000,
- )
+ date_raw = datetime.datetime.fromtimestamp(int(row.get("First Seen")) / 1000, datetime.UTC)
finding = Finding(
title=title.split(" from")[0],
date=date_raw,
@@ -60,7 +58,7 @@ def get_findings(self, filename, test):
finding.unsaved_endpoints = []
if row.get("Request URI"):
endpoint = Endpoint(
- host="0.0.0.0",
+ host="0.0.0.0", # noqa: S104
path=row.get("Request URI"),
protocol=row.get("Request Protocol"),
)
diff --git a/dojo/tools/coverity_api/parser.py b/dojo/tools/coverity_api/parser.py
index 912a514c856..fdd6332b2fa 100755
--- a/dojo/tools/coverity_api/parser.py
+++ b/dojo/tools/coverity_api/parser.py
@@ -27,7 +27,7 @@ def get_findings(self, file, test):
items = []
for issue in tree["viewContentsV1"]["rows"]:
# get only security findings
- if "Security" != issue.get("displayIssueKind"):
+ if issue.get("displayIssueKind") != "Security":
continue
description_formated = "\n".join(
@@ -66,17 +66,17 @@ def get_findings(self, file, test):
else:
finding.nb_occurences = 1
- if "New" == issue.get("status"):
+ if issue.get("status") == "New":
finding.active = True
finding.verified = False
- elif "Triaged" == issue.get("status"):
+ elif issue.get("status") == "Triaged":
finding.active = True
finding.verified = True
- elif "Fixed" == issue.get("status"):
+ elif issue.get("status") == "Fixed":
finding.active = False
finding.verified = True
else:
- if "False Positive" == issue.get("classification"):
+ if issue.get("classification") == "False Positive":
finding.false_p = True
if "lastTriaged" in issue:
ds = issue["lastTriaged"][0:10]
@@ -92,13 +92,13 @@ def get_findings(self, file, test):
def convert_displayImpact(self, val):
if val is None:
return "Info"
- if "Audit" == val:
+ if val == "Audit":
return "Info"
- if "Low" == val:
+ if val == "Low":
return "Low"
- if "Medium" == val:
+ if val == "Medium":
return "Medium"
- if "High" == val:
+ if val == "High":
return "High"
msg = f"Unknown value for Coverity displayImpact {val}"
raise ValueError(msg)
@@ -106,17 +106,17 @@ def convert_displayImpact(self, val):
def convert_severity(self, val):
if val is None:
return "Info"
- if "Unspecified" == val:
+ if val == "Unspecified":
return "Info"
- if "Severe" == val:
+ if val == "Severe":
return "Critical"
- if "Major" == val:
+ if val == "Major":
return "High"
- if "Minor" == val:
+ if val == "Minor":
return "Medium"
- if "New Value" == val:
+ if val == "New Value":
return "Info"
- if "Various" == val:
+ if val == "Various":
return "Info"
msg = f"Unknown value for Coverity severity {val}"
raise ValueError(msg)
diff --git a/dojo/tools/crashtest_security/parser.py b/dojo/tools/crashtest_security/parser.py
index 0d3110bcc17..deedb916b81 100644
--- a/dojo/tools/crashtest_security/parser.py
+++ b/dojo/tools/crashtest_security/parser.py
@@ -185,10 +185,7 @@ def get_items(self, tree, test):
title = re.sub(r" \([0-9]*\)$", "", title)
# Attache CVEs
- if "CVE" in title:
- vulnerability_id = re.findall(r"CVE-\d{4}-\d{4,10}", title)[0]
- else:
- vulnerability_id = None
+ vulnerability_id = re.findall("CVE-\\d{4}-\\d{4,10}", title)[0] if "CVE" in title else None
description = failure.get("message")
severity = failure.get("type").capitalize()
diff --git a/dojo/tools/crunch42/parser.py b/dojo/tools/crunch42/parser.py
index d4d19ff35e4..d83e8eb24e2 100644
--- a/dojo/tools/crunch42/parser.py
+++ b/dojo/tools/crunch42/parser.py
@@ -57,7 +57,7 @@ def get_items(self, tree, test):
def get_item(self, issue, title, test):
fingerprint = issue["fingerprint"]
pointer = issue["pointer"]
- message = issue["specificDescription"] if "specificDescription" in issue else title
+ message = issue.get("specificDescription", title)
score = issue["score"]
criticality = issue["criticality"]
if criticality == 1:
diff --git a/dojo/tools/cyclonedx/helpers.py b/dojo/tools/cyclonedx/helpers.py
index 8e2bd29d24a..1bc11399f05 100644
--- a/dojo/tools/cyclonedx/helpers.py
+++ b/dojo/tools/cyclonedx/helpers.py
@@ -7,7 +7,7 @@
class Cyclonedxhelper:
def _get_cvssv3(self, raw_vector):
- if raw_vector is None or "" == raw_vector:
+ if raw_vector is None or raw_vector == "":
return None
if not raw_vector.startswith("CVSS:3"):
raw_vector = "CVSS:3.1/" + raw_vector
@@ -34,6 +34,6 @@ def fix_severity(self, severity):
severity = severity.capitalize()
if severity is None:
severity = "Medium"
- elif "Unknown" == severity or "None" == severity:
+ elif severity == "Unknown" or severity == "None":
severity = "Info"
return severity
diff --git a/dojo/tools/cyclonedx/json_parser.py b/dojo/tools/cyclonedx/json_parser.py
index 6a329cfdfa7..64bd02b5dd7 100644
--- a/dojo/tools/cyclonedx/json_parser.py
+++ b/dojo/tools/cyclonedx/json_parser.py
@@ -115,13 +115,13 @@ def _get_findings_json(self, file, test):
state = analysis.get("state")
if state:
if (
- "resolved" == state
- or "resolved_with_pedigree" == state
- or "not_affected" == state
+ state == "resolved"
+ or state == "resolved_with_pedigree"
+ or state == "not_affected"
):
finding.is_mitigated = True
finding.active = False
- elif "false_positive" == state:
+ elif state == "false_positive":
finding.false_p = True
finding.active = False
if not finding.active:
diff --git a/dojo/tools/cyclonedx/xml_parser.py b/dojo/tools/cyclonedx/xml_parser.py
index 320e0ed34e6..70682c0c6a8 100644
--- a/dojo/tools/cyclonedx/xml_parser.py
+++ b/dojo/tools/cyclonedx/xml_parser.py
@@ -141,7 +141,7 @@ def manage_vulnerability_legacy(
for rating in vulnerability.findall(
"v:ratings/v:rating", namespaces=ns,
):
- if "CVSSv3" == rating.findtext("v:method", namespaces=ns):
+ if rating.findtext("v:method", namespaces=ns) == "CVSSv3":
raw_vector = rating.findtext("v:vector", namespaces=ns)
severity = rating.findtext("v:severity", namespaces=ns)
cvssv3 = Cyclonedxhelper()._get_cvssv3(raw_vector)
@@ -253,7 +253,7 @@ def _manage_vulnerability_xml(
"b:ratings/b:rating", namespaces=ns,
):
method = rating.findtext("b:method", namespaces=ns)
- if "CVSSv3" == method or "CVSSv31" == method:
+ if method == "CVSSv3" or method == "CVSSv31":
raw_vector = rating.findtext("b:vector", namespaces=ns)
severity = rating.findtext("b:severity", namespaces=ns)
cvssv3 = Cyclonedxhelper()._get_cvssv3(raw_vector)
@@ -280,13 +280,13 @@ def _manage_vulnerability_xml(
state = analysis[0].findtext("b:state", namespaces=ns)
if state:
if (
- "resolved" == state
- or "resolved_with_pedigree" == state
- or "not_affected" == state
+ state == "resolved"
+ or state == "resolved_with_pedigree"
+ or state == "not_affected"
):
finding.is_mitigated = True
finding.active = False
- elif "false_positive" == state:
+ elif state == "false_positive":
finding.false_p = True
finding.active = False
if not finding.active:
diff --git a/dojo/tools/deepfence_threatmapper/compliance.py b/dojo/tools/deepfence_threatmapper/compliance.py
index f948a18c929..3e0ebb9172c 100644
--- a/dojo/tools/deepfence_threatmapper/compliance.py
+++ b/dojo/tools/deepfence_threatmapper/compliance.py
@@ -42,9 +42,7 @@ def get_findings(self, row, headers, test):
)
def compliance_severity(self, input):
- if input == "pass":
- output = "Info"
- elif input == "info":
+ if input == "pass" or input == "info":
output = "Info"
elif input == "warn":
output = "Medium"
diff --git a/dojo/tools/dependency_check/parser.py b/dojo/tools/dependency_check/parser.py
index 1d4a167429d..8f87042b63a 100755
--- a/dojo/tools/dependency_check/parser.py
+++ b/dojo/tools/dependency_check/parser.py
@@ -1,7 +1,7 @@
+import datetime
import hashlib
import logging
import re
-from datetime import datetime
import dateutil
from cpe import CPE
@@ -302,7 +302,7 @@ def get_finding_from_vulnerability(
mitigation
+ f"Update {component_name}:{component_version} to at least the version recommended in the description"
)
- mitigated = datetime.utcnow()
+ mitigated = datetime.datetime.now(datetime.UTC)
is_Mitigated = True
active = False
tags.append("suppressed")
diff --git a/dojo/tools/dependency_track/parser.py b/dojo/tools/dependency_track/parser.py
index cb4029c8b1e..483e05e87c8 100755
--- a/dojo/tools/dependency_track/parser.py
+++ b/dojo/tools/dependency_track/parser.py
@@ -138,10 +138,7 @@ def _convert_dependency_track_finding_to_dojo_finding(self, dependency_track_fin
component_version = dependency_track_finding["component"]["version"]
else:
component_version = None
- if component_version is not None:
- version_description = component_version
- else:
- version_description = ""
+ version_description = component_version if component_version is not None else ""
title = f"{component_name}:{version_description} affected by: {vuln_id} ({source})"
@@ -212,18 +209,12 @@ def _convert_dependency_track_finding_to_dojo_finding(self, dependency_track_fin
# Use the analysis state from Dependency Track to determine if the finding has already been marked as a false positive upstream
analysis = dependency_track_finding.get("analysis")
- is_false_positive = True if analysis is not None and analysis.get("state") == "FALSE_POSITIVE" else False
+ is_false_positive = bool(analysis is not None and analysis.get("state") == "FALSE_POSITIVE")
# Get the EPSS details
- if "epssPercentile" in dependency_track_finding["vulnerability"]:
- epss_percentile = dependency_track_finding["vulnerability"]["epssPercentile"]
- else:
- epss_percentile = None
+ epss_percentile = dependency_track_finding["vulnerability"].get("epssPercentile", None)
- if "epssScore" in dependency_track_finding["vulnerability"]:
- epss_score = dependency_track_finding["vulnerability"]["epssScore"]
- else:
- epss_score = None
+ epss_score = dependency_track_finding["vulnerability"].get("epssScore", None)
# Build and return Finding model
finding = Finding(
diff --git a/dojo/tools/dockle/parser.py b/dojo/tools/dockle/parser.py
index a34a7af0cbc..22af5452a5b 100755
--- a/dojo/tools/dockle/parser.py
+++ b/dojo/tools/dockle/parser.py
@@ -33,10 +33,7 @@ def get_findings(self, filename, test):
title = item["title"]
if dockle_severity == "IGNORE":
continue
- if dockle_severity in self.SEVERITY:
- severity = self.SEVERITY[dockle_severity]
- else:
- severity = "Medium"
+ severity = self.SEVERITY.get(dockle_severity, "Medium")
description = sorted(item.get("alerts", []))
description = "\n".join(description)
dupe_key = hashlib.sha256(
diff --git a/dojo/tools/drheader/parser.py b/dojo/tools/drheader/parser.py
index bf8435f63ab..7fa515b4855 100755
--- a/dojo/tools/drheader/parser.py
+++ b/dojo/tools/drheader/parser.py
@@ -15,10 +15,7 @@ def get_description_for_scan_types(self, scan_type):
def return_finding(self, test, finding, url=None):
title = "Header : " + finding["rule"]
- if url is not None:
- message = finding["message"] + "\nURL : " + url
- else:
- message = finding["message"]
+ message = finding["message"] + "\nURL : " + url if url is not None else finding["message"]
if finding.get("value") is not None:
message += "\nObserved values: " + finding["value"]
if finding.get("expected") is not None:
diff --git a/dojo/tools/dsop/parser.py b/dojo/tools/dsop/parser.py
index 0d01e5b8d8d..bf729cb006c 100755
--- a/dojo/tools/dsop/parser.py
+++ b/dojo/tools/dsop/parser.py
@@ -43,10 +43,7 @@ def __parse_disa(self, test, items, sheet):
continue
title = row[headers["title"]]
unique_id = row[headers["ruleid"]]
- if row[headers["severity"]] == "unknown":
- severity = "Info"
- else:
- severity = row[headers["severity"]].title()
+ severity = "Info" if row[headers["severity"]] == "unknown" else row[headers["severity"]].title()
references = row[headers["refs"]]
description = row[headers["desc"]]
impact = row[headers["rationale"]]
diff --git a/dojo/tools/eslint/parser.py b/dojo/tools/eslint/parser.py
index 329e2fac751..613545e214b 100755
--- a/dojo/tools/eslint/parser.py
+++ b/dojo/tools/eslint/parser.py
@@ -35,10 +35,7 @@ def get_findings(self, filename, test):
continue
for message in item["messages"]:
- if message["message"] is None:
- title = "Finding Not defined"
- else:
- title = str(message["message"])
+ title = "Finding Not defined" if message["message"] is None else str(message["message"])
if message["ruleId"] is not None:
title = title + " Test ID: " + str(message["ruleId"])
diff --git a/dojo/tools/factory.py b/dojo/tools/factory.py
index 03ddec4e574..04930321c50 100644
--- a/dojo/tools/factory.py
+++ b/dojo/tools/factory.py
@@ -117,7 +117,7 @@ def requires_tool_type(scan_type):
package_dir = str(Path(__file__).resolve().parent)
for module_name in os.listdir(package_dir):
# check if it's dir
- if os.path.isdir(os.path.join(package_dir, module_name)):
+ if Path(os.path.join(package_dir, module_name)).is_dir():
try:
# check if it's a Python module
if find_spec(f"dojo.tools.{module_name}.parser"):
diff --git a/dojo/tools/generic/json_parser.py b/dojo/tools/generic/json_parser.py
index 296209f3d23..e1d86eaaa6d 100644
--- a/dojo/tools/generic/json_parser.py
+++ b/dojo/tools/generic/json_parser.py
@@ -1,4 +1,8 @@
-from dojo.models import Endpoint, Finding
+import base64
+
+from django.core.files.base import ContentFile
+
+from dojo.models import Endpoint, FileUpload, Finding
from dojo.tools.parser_test import ParserTest
@@ -41,6 +45,8 @@ def _get_test_json(self, data):
"date",
"cwe",
"cve",
+ "epss_score",
+ "epss_percentile",
"cvssv3",
"cvssv3_score",
"mitigation",
@@ -103,6 +109,11 @@ def _get_test_json(self, data):
endpoint = Endpoint(**endpoint_item)
finding.unsaved_endpoints.append(endpoint)
if unsaved_files:
+ for unsaved_file in unsaved_files:
+ data = base64.b64decode(unsaved_file.get("data"))
+ title = unsaved_file.get("title", "")
+ FileUpload(title=title, file=ContentFile(data)).clean()
+
finding.unsaved_files = unsaved_files
if finding.cve:
finding.unsaved_vulnerability_ids = [finding.cve]
diff --git a/dojo/tools/github_vulnerability/parser.py b/dojo/tools/github_vulnerability/parser.py
index c0ad99ac9a4..e6680cfbad1 100755
--- a/dojo/tools/github_vulnerability/parser.py
+++ b/dojo/tools/github_vulnerability/parser.py
@@ -63,7 +63,7 @@ def get_findings(self, filename, test):
if "createdAt" in alert:
finding.date = dateutil.parser.parse(alert["createdAt"])
if "state" in alert and (
- "FIXED" == alert["state"] or "DISMISSED" == alert["state"]
+ alert["state"] == "FIXED" or alert["state"] == "DISMISSED"
):
finding.active = False
finding.is_mitigated = True
@@ -136,10 +136,7 @@ def get_findings(self, filename, test):
for vuln in data:
url = vuln["url"]
html_url = vuln["html_url"]
- if vuln["state"] == "open":
- active = True
- else:
- active = False
+ active = vuln["state"] == "open"
ruleid = vuln["rule"]["id"]
ruleseverity = vuln["rule"]["severity"]
ruledescription = vuln["rule"]["description"]
diff --git a/dojo/tools/gitlab_container_scan/parser.py b/dojo/tools/gitlab_container_scan/parser.py
index 612a6a56184..048261fcc69 100755
--- a/dojo/tools/gitlab_container_scan/parser.py
+++ b/dojo/tools/gitlab_container_scan/parser.py
@@ -23,7 +23,7 @@ def get_description_for_scan_types(self, scan_type):
return "GitLab Container Scan report file can be imported in JSON format (option --json)."
def _get_dependency_version(self, dependency):
- return dependency["version"] if "version" in dependency else ""
+ return dependency.get("version", "")
def _get_dependency_name(self, dependency):
if "package" in dependency and "name" in dependency["package"]:
diff --git a/dojo/tools/gitlab_dast/parser.py b/dojo/tools/gitlab_dast/parser.py
index 5d5d5a04bd3..1903533a50a 100755
--- a/dojo/tools/gitlab_dast/parser.py
+++ b/dojo/tools/gitlab_dast/parser.py
@@ -57,7 +57,7 @@ def get_confidence_numeric(self, confidence):
"Unknown": 8, # Tentative
"Ignore": 10, # Tentative
}
- return switcher.get(confidence, None)
+ return switcher.get(confidence)
# iterating through properties of each vulnerability
def get_item(self, vuln, test, scanner):
@@ -96,7 +96,7 @@ def get_item(self, vuln, test, scanner):
# title
finding.title = (
- vuln["name"] if "name" in vuln else finding.unique_id_from_tool
+ vuln.get("name", finding.unique_id_from_tool)
)
# cwe
for identifier in vuln["identifiers"]:
diff --git a/dojo/tools/gitlab_dep_scan/parser.py b/dojo/tools/gitlab_dep_scan/parser.py
index cc365c8acba..d2999002f79 100755
--- a/dojo/tools/gitlab_dep_scan/parser.py
+++ b/dojo/tools/gitlab_dep_scan/parser.py
@@ -46,12 +46,9 @@ def get_items(self, tree, test):
return list(items.values())
def get_item(self, vuln, test, scan):
- if "id" in vuln:
- unique_id_from_tool = vuln["id"]
- else:
- # If the new unique id is not provided, fall back to deprecated
- # "cve" fingerprint (old version)
- unique_id_from_tool = vuln["cve"]
+ # If the new unique id is not provided, fall back to deprecated
+ # "cve" fingerprint (old version)
+ unique_id_from_tool = vuln["id"] if "id" in vuln else vuln["cve"]
title = ""
if "name" in vuln:
@@ -74,21 +71,17 @@ def get_item(self, vuln, test, scan):
description += f"{vuln['description']}\n"
location = vuln["location"]
- file_path = location["file"] if "file" in location else None
+ file_path = location.get("file", None)
component_name = None
component_version = None
if "dependency" in location:
component_version = (
- location["dependency"]["version"]
- if "version" in location["dependency"]
- else None
+ location["dependency"].get("version", None)
)
if "package" in location["dependency"]:
component_name = (
- location["dependency"]["package"]["name"]
- if "name" in location["dependency"]["package"]
- else None
+ location["dependency"]["package"].get("name", None)
)
severity = vuln["severity"]
diff --git a/dojo/tools/gitlab_sast/parser.py b/dojo/tools/gitlab_sast/parser.py
index ebe5071ce6e..1e8aa3fa00f 100755
--- a/dojo/tools/gitlab_sast/parser.py
+++ b/dojo/tools/gitlab_sast/parser.py
@@ -70,7 +70,7 @@ def get_confidence_numeric(self, argument):
"Low": 6, # Tentative
"Experimental": 7, # Tentative
}
- return switcher.get(argument, None)
+ return switcher.get(argument)
def get_item(self, vuln, scanner):
unique_id_from_tool = vuln["id"] if "id" in vuln else vuln["cve"]
@@ -92,9 +92,9 @@ def get_item(self, vuln, scanner):
description += f"{vuln['description']}\n"
location = vuln["location"]
- file_path = location["file"] if "file" in location else None
+ file_path = location.get("file", None)
- line = location["start_line"] if "start_line" in location else None
+ line = location.get("start_line", None)
sast_object = None
sast_source_file_path = None
@@ -121,7 +121,7 @@ def get_item(self, vuln, scanner):
severity = "Info"
scanner_confidence = self.get_confidence_numeric(vuln.get("confidence", "Unkown"))
- mitigation = vuln["solution"] if "solution" in vuln else ""
+ mitigation = vuln.get("solution", "")
cwe = None
vulnerability_id = None
references = ""
diff --git a/dojo/tools/gitleaks/parser.py b/dojo/tools/gitleaks/parser.py
index 592c20c9044..1914b9e3fef 100755
--- a/dojo/tools/gitleaks/parser.py
+++ b/dojo/tools/gitleaks/parser.py
@@ -104,10 +104,7 @@ def get_finding_legacy(self, issue, test, dupes):
def get_finding_current(self, issue, test, dupes):
reason = issue.get("Description")
line = issue.get("StartLine")
- if line:
- line = int(line)
- else:
- line = 0
+ line = int(line) if line else 0
match = issue.get("Match")
secret = issue.get("Secret")
file_path = issue.get("File")
diff --git a/dojo/tools/gosec/parser.py b/dojo/tools/gosec/parser.py
index cbcf3b4507d..20ccbcae062 100755
--- a/dojo/tools/gosec/parser.py
+++ b/dojo/tools/gosec/parser.py
@@ -58,10 +58,7 @@ def get_findings(self, filename, test):
if "-" in line:
# if this is a range, only point to the beginning.
line = line.split("-", 1)[0]
- if line.isdigit():
- line = int(line)
- else:
- line = None
+ line = int(line) if line.isdigit() else None
dupe_key = title + item["file"] + str(line)
diff --git a/dojo/tools/govulncheck/parser.py b/dojo/tools/govulncheck/parser.py
index 0c5bb4191b4..f8764cca319 100644
--- a/dojo/tools/govulncheck/parser.py
+++ b/dojo/tools/govulncheck/parser.py
@@ -41,7 +41,7 @@ def get_finding_trace_info(self, data, osv_id):
# Browse the findings to look for matching OSV-id. If the OSV-id is matching, extract traces.
trace_info_strs = []
for elem in data:
- if "finding" in elem.keys():
+ if "finding" in elem:
finding = elem["finding"]
if finding.get("osv") == osv_id:
trace_info = finding.get("trace", [])
@@ -59,12 +59,12 @@ def get_finding_trace_info(self, data, osv_id):
def get_affected_version(self, data, osv_id):
# Browse the findings to look for matching OSV-id. If the OSV-id is matching, extract the first affected version.
for elem in data:
- if "finding" in elem.keys():
+ if "finding" in elem:
finding = elem["finding"]
if finding.get("osv") == osv_id:
trace_info = finding.get("trace", [])
for trace in trace_info:
- if "version" in trace.keys():
+ if "version" in trace:
return trace.get("version")
return ""
@@ -127,7 +127,7 @@ def get_findings(self, scan_file, test):
elif isinstance(data, list):
# Parsing for new govulncheck output format
for elem in data:
- if "osv" in elem.keys():
+ if "osv" in elem:
cve = elem["osv"]["aliases"][0]
osv_data = elem["osv"]
affected_package = osv_data["affected"][0]["package"]
@@ -179,10 +179,7 @@ def get_findings(self, scan_file, test):
affected_version = self.get_affected_version(data, osv_data["id"])
- if "severity" in elem["osv"].keys():
- severity = elem["osv"]["severity"]
- else:
- severity = SEVERITY
+ severity = elem["osv"].get("severity", SEVERITY)
d = {
"cve": cve,
diff --git a/dojo/tools/h1/parser.py b/dojo/tools/h1/parser.py
index a106f07d5d6..62072f5eb27 100755
--- a/dojo/tools/h1/parser.py
+++ b/dojo/tools/h1/parser.py
@@ -56,10 +56,7 @@ def get_vulnerability_disclosure_json_findings(self, tree, test):
references += f"[{ref_link}]({ref_link})"
# Set active state of the Dojo finding
- if content["attributes"]["state"] in ["triaged", "new"]:
- active = True
- else:
- active = False
+ active = content["attributes"]["state"] in ["triaged", "new"]
# Set CWE of the Dojo finding
try:
diff --git a/dojo/tools/harbor_vulnerability/parser.py b/dojo/tools/harbor_vulnerability/parser.py
index 315d108a2cb..8072357700c 100755
--- a/dojo/tools/harbor_vulnerability/parser.py
+++ b/dojo/tools/harbor_vulnerability/parser.py
@@ -1,3 +1,4 @@
+import contextlib
import json
from dojo.models import Finding
@@ -26,15 +27,12 @@ def get_findings(self, filename, test):
# When doing dictionary, we can detect duplications
dupes = {}
- try:
- vulnerability = data["vulnerabilities"] # json output of https://pypi.org/project/harborapi/
- except (KeyError):
- pass
+ # json output of https://pypi.org/project/harborapi/
+ with contextlib.suppress(KeyError):
+ vulnerability = data["vulnerabilities"]
# To be compatible with update in version
- try:
+ with contextlib.suppress(KeyError, StopIteration, TypeError):
vulnerability = data[next(iter(data.keys()))]["vulnerabilities"]
- except (KeyError, StopIteration, TypeError):
- pass
# Early exit if empty
if "vulnerability" not in locals() or vulnerability is None:
@@ -53,10 +51,7 @@ def get_findings(self, filename, test):
title = f"{id} - {package_name} ({package_version})"
severity = transpose_severity(severity)
- if fix_version:
- mitigation = f"Upgrade {package_name} to version {fix_version}"
- else:
- mitigation = None
+ mitigation = f"Upgrade {package_name} to version {fix_version}" if fix_version else None
if links:
references = ""
@@ -65,15 +60,9 @@ def get_findings(self, filename, test):
else:
references = None
- if cwe_ids and cwe_ids[0] != "":
- cwe = cwe_ids[0].strip("CWE-")
- else:
- cwe = None
+ cwe = cwe_ids[0].strip("CWE-") if cwe_ids and cwe_ids[0] != "" else None
- if id and id.startswith("CVE"):
- vulnerability_id = id
- else:
- vulnerability_id = None
+ vulnerability_id = id if id and id.startswith("CVE") else None
dupe_key = title
diff --git a/dojo/tools/hcl_appscan/parser.py b/dojo/tools/hcl_appscan/parser.py
index f1ea80ec6a7..268e041a80a 100644
--- a/dojo/tools/hcl_appscan/parser.py
+++ b/dojo/tools/hcl_appscan/parser.py
@@ -42,10 +42,7 @@ def get_findings(self, file, test):
match item.tag:
case "severity":
output = self.xmltreehelper(item)
- if output is None:
- severity = "Info"
- else:
- severity = output.strip(" ").capitalize()
+ severity = "Info" if output is None else output.strip(" ").capitalize()
case "cwe":
cwe = int(self.xmltreehelper(item))
case "remediation":
diff --git a/dojo/tools/immuniweb/parser.py b/dojo/tools/immuniweb/parser.py
index 53242fcd2f4..88261692460 100755
--- a/dojo/tools/immuniweb/parser.py
+++ b/dojo/tools/immuniweb/parser.py
@@ -41,10 +41,7 @@ def get_findings(self, file, test):
cwe = "".join(
i for i in vulnerability.find("CWE-ID").text if i.isdigit()
)
- if cwe:
- cwe = cwe
- else:
- cwe = None
+ cwe = cwe or None
vulnerability_id = vulnerability.find("CVE-ID").text
steps_to_reproduce = vulnerability.find("PoC").text
# just to make sure severity is in the recognised sentence casing
diff --git a/dojo/tools/intsights/parser.py b/dojo/tools/intsights/parser.py
index 3e6219a4662..19883f7982f 100755
--- a/dojo/tools/intsights/parser.py
+++ b/dojo/tools/intsights/parser.py
@@ -23,9 +23,11 @@ def get_description_for_scan_types(self, scan_type):
def _build_finding_description(self, alert: dict) -> str:
"""
Builds an IntSights Finding description from various pieces of information.
+
Args:
alert: The parsed alert dictionary
Returns: A markdown formatted description
+
"""
return "\n".join(
[
@@ -56,7 +58,7 @@ def get_findings(self, file, test):
uniq_alert = Finding(
title=alert["title"],
test=test,
- active=False if alert["status"] == "Closed" else True,
+ active=alert["status"] != "Closed",
verified=True,
description=self._build_finding_description(alert),
severity=alert["severity"],
diff --git a/dojo/tools/jfrog_xray_api_summary_artifact/parser.py b/dojo/tools/jfrog_xray_api_summary_artifact/parser.py
index 5261b802f23..5d4301d3ab7 100755
--- a/dojo/tools/jfrog_xray_api_summary_artifact/parser.py
+++ b/dojo/tools/jfrog_xray_api_summary_artifact/parser.py
@@ -1,3 +1,4 @@
+import contextlib
import hashlib
import json
import re
@@ -65,10 +66,7 @@ def get_item(
impact_path = ImpactPath("", "", "")
if "severity" in vulnerability:
- if vulnerability["severity"] == "Unknown":
- severity = "Informational"
- else:
- severity = vulnerability["severity"].title()
+ severity = "Informational" if vulnerability["severity"] == "Unknown" else vulnerability["severity"].title()
else:
severity = "Informational"
@@ -81,12 +79,10 @@ def get_item(
cwe = decode_cwe_number(cves[0].get("cwe", [])[0])
if "cvss_v3" in cves[0]:
cvss_v3 = cves[0]["cvss_v3"]
- try:
+ # Note: Xray sometimes takes over malformed cvss scores like `5.9` that can not be parsed.
+ # Without the try-except block here the whole import of all findings would fail.
+ with contextlib.suppress(CVSS3RHScoreDoesNotMatch, CVSS3RHMalformedError):
cvssv3 = CVSS3.from_rh_vector(cvss_v3).clean_vector()
- except (CVSS3RHScoreDoesNotMatch, CVSS3RHMalformedError):
- # Note: Xray sometimes takes over malformed cvss scores like `5.9` that can not be parsed.
- # Without the try-except block here the whole import of all findings would fail.
- pass
impact_paths = vulnerability.get("impact_path", [])
if len(impact_paths) > 0:
diff --git a/dojo/tools/jfrog_xray_on_demand_binary_scan/parser.py b/dojo/tools/jfrog_xray_on_demand_binary_scan/parser.py
index a467ed5278a..56867e08e7a 100644
--- a/dojo/tools/jfrog_xray_on_demand_binary_scan/parser.py
+++ b/dojo/tools/jfrog_xray_on_demand_binary_scan/parser.py
@@ -52,10 +52,7 @@ def get_component_name_version(name):
def get_severity(vulnerability):
if "severity" in vulnerability:
- if vulnerability["severity"] == "Unknown":
- severity = "Info"
- else:
- severity = vulnerability["severity"].title()
+ severity = "Info" if vulnerability["severity"] == "Unknown" else vulnerability["severity"].title()
else:
severity = "Info"
return severity
@@ -146,8 +143,7 @@ def get_vuln_id_from_tool(vulnerability):
def clean_title(title):
- if title.startswith("Issue summary: "):
- title = title[len("Issue summary: "):]
+ title = title.removeprefix("Issue summary: ")
if "\n" in title:
title = title[:title.index("\n")]
return title
diff --git a/dojo/tools/jfrog_xray_unified/parser.py b/dojo/tools/jfrog_xray_unified/parser.py
index a278664b1e0..e8a41c5d89c 100755
--- a/dojo/tools/jfrog_xray_unified/parser.py
+++ b/dojo/tools/jfrog_xray_unified/parser.py
@@ -54,10 +54,7 @@ def get_item(vulnerability, test):
# Following the CVSS Scoring per https://nvd.nist.gov/vuln-metrics/cvss
if "severity" in vulnerability:
- if vulnerability["severity"] == "Unknown":
- severity = "Info"
- else:
- severity = vulnerability["severity"].title()
+ severity = "Info" if vulnerability["severity"] == "Unknown" else vulnerability["severity"].title()
# TODO: Needs UNKNOWN new status in the model.
else:
severity = "Info"
diff --git a/dojo/tools/jfrogxray/parser.py b/dojo/tools/jfrogxray/parser.py
index c4531c29b04..54962478d94 100755
--- a/dojo/tools/jfrogxray/parser.py
+++ b/dojo/tools/jfrogxray/parser.py
@@ -66,10 +66,7 @@ def decode_cwe_number(value):
def get_item(vulnerability, test):
# Following the CVSS Scoring per https://nvd.nist.gov/vuln-metrics/cvss
if "severity" in vulnerability:
- if vulnerability["severity"] == "Unknown":
- severity = "Info"
- else:
- severity = vulnerability["severity"].title()
+ severity = "Info" if vulnerability["severity"] == "Unknown" else vulnerability["severity"].title()
# TODO: Needs UNKNOWN new status in the model.
else:
severity = "Info"
diff --git a/dojo/tools/kics/parser.py b/dojo/tools/kics/parser.py
index 5eb30227b5a..878999ee70a 100755
--- a/dojo/tools/kics/parser.py
+++ b/dojo/tools/kics/parser.py
@@ -31,10 +31,7 @@ def get_findings(self, filename, test):
for query in data["queries"]:
name = query.get("query_name")
query_url = query.get("query_url")
- if query.get("severity") in self.SEVERITY:
- severity = self.SEVERITY[query.get("severity")]
- else:
- severity = "Medium"
+ severity = self.SEVERITY.get(query.get("severity"), "Medium")
platform = query.get("platform")
category = query.get("category")
for item in query.get("files"):
@@ -53,8 +50,7 @@ def get_findings(self, filename, test):
description += f"**Issue type:** {issue_type}\n"
if actual_value:
description += f"**Actual value:** {actual_value}\n"
- if description.endswith("\n"):
- description = description[:-1]
+ description = description.removesuffix("\n")
dupe_key = hashlib.sha256(
(
diff --git a/dojo/tools/kiuwan/parser.py b/dojo/tools/kiuwan/parser.py
index 5d91e5a315e..34601b05aae 100755
--- a/dojo/tools/kiuwan/parser.py
+++ b/dojo/tools/kiuwan/parser.py
@@ -1,3 +1,4 @@
+import contextlib
import csv
import hashlib
import io
@@ -62,7 +63,7 @@ def get_findings(self, filename, test):
+ row["Software characteristic"]
+ "\n\n"
+ "**Vulnerability type** : "
- + (row["Vulnerability type"] if "Vulnerability type" in row else "")
+ + (row.get("Vulnerability type", ""))
+ "\n\n"
+ "**CWE Scope** : "
+ row["CWE Scope"]
@@ -104,10 +105,8 @@ def get_findings(self, filename, test):
finding.mitigation = "Not provided!"
finding.severity = findingdict["severity"]
finding.static_finding = True
- try:
+ with contextlib.suppress(Exception):
finding.cwe = int(row["CWE"])
- except Exception:
- pass
if finding is not None:
if finding.title is None:
diff --git a/dojo/tools/kubehunter/parser.py b/dojo/tools/kubehunter/parser.py
index cc382f0c11a..c87cb61f7e1 100644
--- a/dojo/tools/kubehunter/parser.py
+++ b/dojo/tools/kubehunter/parser.py
@@ -39,10 +39,7 @@ def get_findings(self, file, test):
# Finding severity
severity = item.get("severity", "info")
allowed_severity = ["info", "low", "medium", "high", "critical"]
- if severity.lower() in allowed_severity:
- severity = severity.capitalize()
- else:
- severity = "Info"
+ severity = severity.capitalize() if severity.lower() in allowed_severity else "Info"
# Finding mitigation and reference
avd_reference = item.get("avd_reference")
diff --git a/dojo/tools/kubescape/parser.py b/dojo/tools/kubescape/parser.py
index c371f477901..daa6635870a 100644
--- a/dojo/tools/kubescape/parser.py
+++ b/dojo/tools/kubescape/parser.py
@@ -59,65 +59,62 @@ def get_findings(self, filename, test):
controls = results[0].get("controls", [])
for control in controls:
- # This condition is true if the result doesn't contain the status for each control (old format)
- retrocompatibility_condition = "status" not in control or "status" not in control["status"]
- if retrocompatibility_condition or control["status"]["status"] == "failed":
- control_name = control["name"]
- if resource_type and resource_name and control_name:
- title = f"{control_name} - {resource_type} {resource_name}"
- else:
- title = f"{control_name} - {resourceid}"
- controlID = control["controlID"]
-
- # Find control details
- controlSummary = self.find_control_summary_by_id(data, controlID)
- if controlSummary is None:
- severity = "Info"
- mitigation = ""
- else:
- severity = self.severity_mapper(controlSummary.get("scoreFactor", 0))
- # Define mitigation if available
- if "mitigation" in controlSummary:
- mitigation = controlSummary["mitigation"]
+ for rule in control["rules"]:
+ if rule["status"] == "passed":
+ continue
+ # This condition is true if the result doesn't contain the status for each control (old format)
+ retrocompatibility_condition = "status" not in control or "status" not in control["status"]
+ if retrocompatibility_condition or control["status"]["status"] == "failed":
+ control_name = control["name"]
+ if resource_type and resource_name and control_name:
+ title = f"{control_name} - {resource_type} {resource_name}"
else:
- mitigation = ""
+ title = f"{control_name} - {resourceid}"
+ controlID = control["controlID"]
- armoLink = f"https://hub.armosec.io/docs/{controlID.lower()}"
- description = "**Summary:** " + f"The ressource '{resourceid}' has failed the control '{control_name}'." + "\n"
- if controlSummary is not None and "description" in controlSummary:
- description += "**Description:** " + controlSummary["description"] + "\n"
-
- # Define category if available
- if controlSummary is not None and "category" in controlSummary and "subCategory" in controlSummary["category"]:
- category_name = controlSummary["category"]["name"]
- category_subname = controlSummary["category"]["subCategory"]["name"]
- category = f"{category_name} > {category_subname}"
- description += "**Category:** " + category + "\n"
- elif controlSummary is not None and "category" in controlSummary and "name" in controlSummary["category"]:
- category = controlSummary["category"]["name"]
- description += "**Category:** " + category + "\n"
-
- description += "View control details here: " + self.__hyperlink(armoLink)
-
- steps_to_reproduce = "The following rules have failed :" + "\n"
- steps_to_reproduce += "\t**Rules:** " + str(json.dumps(control["rules"], indent=4)) + "\n"
-
- steps_to_reproduce += "Resource object may contain evidence:" + "\n"
- steps_to_reproduce += "\t**Resource object:** " + str(json.dumps(resource["object"], indent=4))
-
- references = armoLink
-
- find = Finding(
- title=textwrap.shorten(title, 150),
- test=test,
- description=description,
- mitigation=mitigation,
- steps_to_reproduce=steps_to_reproduce,
- references=references,
- severity=severity,
- component_name=resourceid,
- static_finding=True,
- dynamic_finding=False,
- )
- findings.append(find)
+ # Find control details
+ controlSummary = self.find_control_summary_by_id(data, controlID)
+ if controlSummary is None:
+ severity = "Info"
+ mitigation = ""
+ else:
+ severity = self.severity_mapper(controlSummary.get("scoreFactor", 0))
+ # Define mitigation if available
+ mitigation = controlSummary.get("mitigation", "")
+
+ description = "**Summary:** " + f"The ressource '{resourceid}' has failed the control '{control_name}'." + "\n"
+ if controlSummary is not None and "description" in controlSummary:
+ description += "**Description:** " + controlSummary["description"] + "\n"
+
+ # Define category if available
+ if controlSummary is not None and "category" in controlSummary and "subCategory" in controlSummary["category"]:
+ category_name = controlSummary["category"]["name"]
+ category_subname = controlSummary["category"]["subCategory"]["name"]
+ category = f"{category_name} > {category_subname}"
+ description += "**Category:** " + category + "\n"
+ elif controlSummary is not None and "category" in controlSummary and "name" in controlSummary["category"]:
+ category = controlSummary["category"]["name"]
+ description += "**Category:** " + category + "\n"
+
+ steps_to_reproduce = "The following rules have failed :" + "\n"
+ steps_to_reproduce += "\t**Rules:** " + str(json.dumps(control["rules"], indent=4)) + "\n"
+ steps_to_reproduce += "Resource object may contain evidence:" + "\n"
+ steps_to_reproduce += "\t**Resource object:** " + str(json.dumps(resource["object"], indent=4))
+
+ find = Finding(
+ title=textwrap.shorten(title, 150),
+ test=test,
+ description=description,
+ mitigation=mitigation,
+ steps_to_reproduce=steps_to_reproduce,
+ references=f"https://hub.armosec.io/docs/{controlID.lower()}",
+ severity=severity,
+ component_name=resourceid,
+ static_finding=True,
+ dynamic_finding=False,
+ )
+ if controlID is not None:
+ find.unsaved_vulnerability_ids = []
+ find.unsaved_vulnerability_ids.append(controlID)
+ findings.append(find)
return findings
diff --git a/dojo/tools/mend/parser.py b/dojo/tools/mend/parser.py
index 75ed871a6a1..d397f3490e9 100755
--- a/dojo/tools/mend/parser.py
+++ b/dojo/tools/mend/parser.py
@@ -4,7 +4,7 @@
from dojo.models import Finding
-__author__ = "dr3dd589"
+__author__ = "dr3dd589 + testaccount90009 aka SH"
logger = logging.getLogger(__name__)
@@ -35,7 +35,55 @@ def _build_common_output(node, lib_name=None):
cve = None
component_name = None
component_version = None
- if "library" in node:
+ impact = None
+ description = "No Description Available"
+ cvss3_score = None
+ mitigation = "N/A"
+ if "component" in node:
+ description = (
+ "**Vulnerability Description**: "
+ + node["vulnerability"].get("description", "No Description Available")
+ + "\n\n"
+ + "**Component Name**: "
+ + node["component"].get("name", "")
+ + "\n"
+ + "**Component Type**: "
+ + node["component"].get("componentType", "")
+ + "\n"
+ + "**Root Library**: "
+ + str(node["component"].get("rootLibrary", ""))
+ + "\n"
+ + "**Library Type**: "
+ + node["component"].get("libraryType", "")
+ + "\n"
+ + "**Location Found**: "
+ + node["component"].get("path", "")
+ + "\n"
+ + "**Direct or Transitive Dependency**: "
+ + node["component"].get("dependencyType", "")
+ + "\n"
+ )
+ lib_name = node["component"].get("name")
+ component_name = node["component"].get("artifactId")
+ component_version = node["component"].get("version")
+ impact = node["component"].get("dependencyType")
+ cvss3_score = node["vulnerability"].get("score", None)
+ if "topFix" in node:
+ try:
+ topfix_node = node.get("topFix")
+ mitigation = (
+ "**Resolution**: "
+ + topfix_node.get("date", "")
+ + "\n"
+ + topfix_node.get("message", "")
+ + "\n"
+ + topfix_node.get("fixResolution", "")
+ + "\n"
+ )
+ except Exception:
+ logger.exception("Error handling topFix node.")
+
+ elif "library" in node:
node.get("project")
description = (
"**Description** : "
@@ -57,39 +105,48 @@ def _build_common_output(node, lib_name=None):
lib_name = node["library"].get("filename")
component_name = node["library"].get("artifactId")
component_version = node["library"].get("version")
+ cvss3_score = node.get("cvss3_score", None)
+ if "topFix" in node:
+ try:
+ topfix_node = node.get("topFix")
+ mitigation = "**Resolution** ({}): {}\n".format(
+ topfix_node.get("date"),
+ topfix_node.get("fixResolution"),
+ )
+ except Exception:
+ logger.exception("Error handling topFix node.")
else:
- description = node.get("description")
+ description = node.get("description", "Unknown")
cve = node.get("name")
- if cve is None:
- title = "CVE-None | " + lib_name
- else:
- title = cve + " | " + lib_name
+ title = "CVE-None | " + lib_name if cve is None else cve + " | " + lib_name
# cvss2 by default in CLI, but cvss3 in UI. Adapting to have
# homogeneous behavior.
if "cvss3_severity" in node:
cvss_sev = node.get("cvss3_severity")
+ elif "vulnerability" in node:
+ cvss_sev = node["vulnerability"].get("severity")
else:
cvss_sev = node.get("severity")
severity = cvss_sev.lower().capitalize()
- cvss3_score = node.get("cvss3_score", None)
cvss3_vector = node.get("scoreMetadataVector", None)
severity_justification = "CVSS v3 score: {} ({})".format(
cvss3_score if cvss3_score is not None else "N/A", cvss3_vector if cvss3_vector is not None else "N/A",
)
cwe = 1035 # default OWASP a9 until the report actually has them
- mitigation = "N/A"
- if "topFix" in node:
- try:
- topfix_node = node.get("topFix")
- mitigation = "**Resolution** ({}): {}\n".format(
- topfix_node.get("date"),
- topfix_node.get("fixResolution"),
- )
- except Exception:
- logger.exception("Error handling topFix node.")
+ # comment out the below for now - working on adding this into the above conditional statements since format can be slightly different
+ # mitigation = "N/A"
+ # if "topFix" in node:
+ # try:
+ # topfix_node = node.get("topFix")
+ # mitigation = "**Resolution** ({}): {}\n".format(
+ # topfix_node.get("date"),
+ # topfix_node.get("fixResolution"),
+ # )
+ # except Exception:
+ # logger.exception("Error handling topFix node.")
filepaths = []
if "sourceFiles" in node:
@@ -102,6 +159,21 @@ def _build_common_output(node, lib_name=None):
"Error handling local paths for vulnerability.",
)
+ locations = []
+ if "locations" in node:
+ try:
+ locations_node = node.get("locations", [])
+ for location in locations_node:
+ path = location.get("path")
+ if path is not None:
+ locations.append(path)
+ except Exception:
+ logger.exception(
+ "Error handling local paths for vulnerability.",
+ )
+
+ filepaths = locations or filepaths
+
new_finding = Finding(
title=title,
test=test,
@@ -116,6 +188,7 @@ def _build_common_output(node, lib_name=None):
dynamic_finding=True,
cvssv3=cvss3_vector,
cvssv3_score=float(cvss3_score) if cvss3_score is not None else None,
+ impact=impact,
)
if cve:
new_finding.unsaved_vulnerability_ids = [cve]
@@ -146,8 +219,29 @@ def _build_common_output(node, lib_name=None):
for node in tree_node:
findings.append(_build_common_output(node))
+ elif "components" in content:
+ # likely a Mend Platform or 3.0 API SCA output - "library" is replaced as "component"
+ tree_components = content.get("components")
+ for comp_node in tree_components:
+ # get component info here, before going into vulns
+ if (
+ "response" in comp_node
+ and len(comp_node.get("response")) > 0
+ ):
+ for vuln in comp_node.get("response"):
+ findings.append(
+ _build_common_output(vuln, comp_node.get("name")),
+ )
+
+ elif "response" in content:
+ # New schema: handle response array
+ tree_node = content["response"]
+ if tree_node:
+ for node in tree_node:
+ findings.append(_build_common_output(node))
+
def create_finding_key(f: Finding) -> str:
- """Hashes the finding's description and title to retrieve a key for deduplication."""
+ # """Hashes the finding's description and title to retrieve a key for deduplication."""
return hashlib.md5(
f.description.encode("utf-8")
+ f.title.encode("utf-8"),
diff --git a/dojo/tools/meterian/parser.py b/dojo/tools/meterian/parser.py
index cb5f0193be5..333120d379a 100755
--- a/dojo/tools/meterian/parser.py
+++ b/dojo/tools/meterian/parser.py
@@ -73,7 +73,7 @@ def do_get_findings(self, single_security_report, scan_date, test):
)
if "cve" in advisory:
- if "N/A" != advisory["cve"]:
+ if advisory["cve"] != "N/A":
finding.unsaved_vulnerability_ids = [advisory["cve"]]
if "cwe" in advisory:
diff --git a/dojo/tools/microfocus_webinspect/parser.py b/dojo/tools/microfocus_webinspect/parser.py
index 77faf3f843b..bf4475580d0 100755
--- a/dojo/tools/microfocus_webinspect/parser.py
+++ b/dojo/tools/microfocus_webinspect/parser.py
@@ -59,7 +59,7 @@ def get_findings(self, file, test):
for content in classifications.findall("Classification"):
# detect CWE number
# TODO: support more than one CWE number
- if "kind" in content.attrib and "CWE" == content.attrib["kind"]:
+ if "kind" in content.attrib and content.attrib["kind"] == "CWE":
cwe = MicrofocusWebinspectParser.get_cwe(content.attrib["identifier"])
description += "\n\n" + content.text + "\n"
diff --git a/dojo/tools/mobsf/parser.py b/dojo/tools/mobsf/parser.py
index 7ba73a9dcd0..8cbc98cc54d 100755
--- a/dojo/tools/mobsf/parser.py
+++ b/dojo/tools/mobsf/parser.py
@@ -207,7 +207,7 @@ def get_findings(self, filename, test):
if isinstance(data["binary_analysis"], list):
for details in data["binary_analysis"]:
for binary_analysis_type in details:
- if "name" != binary_analysis_type:
+ if binary_analysis_type != "name":
mobsf_item = {
"category": "Binary Analysis",
"title": details[binary_analysis_type]["description"].split(".")[0],
@@ -377,7 +377,7 @@ def getSeverityForPermission(self, status):
signature => Info (it's positive so... Info)
signatureOrSystem => Info (it's positive so... Info)
"""
- if "dangerous" == status:
+ if status == "dangerous":
return "High"
return "Info"
diff --git a/dojo/tools/mobsf_scorecard/__init__.py b/dojo/tools/mobsf_scorecard/__init__.py
new file mode 100644
index 00000000000..2e4bd62f2fd
--- /dev/null
+++ b/dojo/tools/mobsf_scorecard/__init__.py
@@ -0,0 +1 @@
+__author__ = "Dmitrii Mariushkin"
diff --git a/dojo/tools/mobsf_scorecard/parser.py b/dojo/tools/mobsf_scorecard/parser.py
new file mode 100644
index 00000000000..55ace089e5e
--- /dev/null
+++ b/dojo/tools/mobsf_scorecard/parser.py
@@ -0,0 +1,106 @@
+import json
+from datetime import datetime
+
+from dateutil import parser as date_parser
+
+from dojo.models import Finding
+
+
+class MobSFScorecardParser:
+
+ def get_scan_types(self):
+ return ["MobSF Scorecard Scan"]
+
+ def get_label_for_scan_types(self, scan_type):
+ return "MobSF Scorecard Scan"
+
+ def get_description_for_scan_types(self, scan_type):
+ return "Export a JSON file using the API, api/v1/report_json."
+
+ def get_findings(self, filename, test):
+
+ tree = filename.read()
+
+ try:
+ data = json.loads(str(tree, "utf-8"))
+ except:
+ data = json.loads(tree)
+
+ if "timestamp" in data:
+ try:
+ find_date = date_parser.parse(data["timestamp"])
+ except date_parser.ParserError:
+ find_date = datetime.now()
+ else:
+ find_date = datetime.now()
+
+ appsec_fields_for_test_desc = [
+ "file_name",
+ "hash",
+ "security_score",
+ "app_name",
+ "version_name",
+ ]
+
+ main_fields_for_test_desc = [
+ "app_type",
+ "package_name",
+ "bundle_id",
+ "sdk_name",
+ "platform",
+ ]
+
+ test_description = ""
+
+ for field in appsec_fields_for_test_desc:
+
+ field_value = str(data.get("appsec", {}).get(field, ""))
+
+ if field_value:
+ test_description = f"{test_description} **{field}:** {field_value}\n"
+
+ for field in main_fields_for_test_desc:
+
+ field_value = str(data.get(field, ""))
+
+ if field_value:
+ test_description = f"{test_description} **{field}:** {field_value}\n"
+
+ test.description = test_description
+
+ finding_severities = {
+ "high": "High",
+ "warning": "Medium",
+ "info": "Info",
+ "secure": "Info",
+ "hotspot": "Low",
+ }
+
+ dd_findings = {}
+
+ for finding_severity in finding_severities:
+ if finding_severity in data.get("appsec", {}):
+ for mobsf_finding in data["appsec"][finding_severity]:
+
+ section = str(mobsf_finding.get("section", ""))
+ title = str(mobsf_finding.get("title", ""))
+ description = str(mobsf_finding.get("description", ""))
+
+ unique_key = f"{finding_severity}-{section}-{title}-{description}"
+
+ finding = Finding(
+ title=title,
+ cwe=919, # Weaknesses in Mobile Applications
+ test=test,
+ description=f"**Category:** {section}\n\n{description}",
+ severity=finding_severities[finding_severity],
+ references=None,
+ date=find_date,
+ static_finding=True,
+ dynamic_finding=False,
+ nb_occurences=1,
+ )
+
+ dd_findings[unique_key] = finding
+
+ return list(dd_findings.values())
diff --git a/dojo/tools/mobsfscan/parser.py b/dojo/tools/mobsfscan/parser.py
index 83c69a58947..49995720acb 100755
--- a/dojo/tools/mobsfscan/parser.py
+++ b/dojo/tools/mobsfscan/parser.py
@@ -46,34 +46,45 @@ def get_findings(self, filename, test):
],
)
references = metadata.get("reference")
- if metadata.get("severity") in self.SEVERITY:
- severity = self.SEVERITY[metadata.get("severity")]
- else:
- severity = "Info"
-
- finding = Finding(
- title=f"{key}",
- test=test,
- severity=severity,
- nb_occurences=1,
- cwe=cwe,
- description=description,
- references=references,
- )
+ severity = self.SEVERITY.get(metadata.get("severity"), "Info")
+
+ files = []
+
if item.get("files"):
for file in item.get("files"):
- file_path = file.get("file_path")
- line = file.get("match_lines")[0]
+ file_path = file.get("file_path", "")
+ line = file.get("match_lines", [0])[0]
+ snippet = file.get("match_string", "")
+
+ files.append((file_path, line, snippet))
+ else:
+ files.append(("", 0, ""))
+
+ for file_path, line, snippet in files:
+
+ finding = Finding(
+ title=f"{key}",
+ test=test,
+ severity=severity,
+ nb_occurences=1,
+ cwe=cwe,
+ description=description,
+ references=references,
+ )
+
+ if file_path:
finding.file_path = file_path
finding.line = line
+ finding.description = f"{description}\n**Snippet:** `{snippet}`"
- dupe_key = hashlib.sha256(
- (key + str(cwe) + masvs + owasp_mobile).encode("utf-8"),
- ).hexdigest()
+ dupe_key = hashlib.sha256(
+ (key + str(cwe) + masvs + owasp_mobile + file_path).encode("utf-8"),
+ ).hexdigest()
+
+ if dupe_key in dupes:
+ finding = dupes[dupe_key]
+ finding.nb_occurences += 1
+ else:
+ dupes[dupe_key] = finding
- if dupe_key in dupes:
- finding = dupes[dupe_key]
- finding.nb_occurences += 1
- else:
- dupes[dupe_key] = finding
return list(dupes.values())
diff --git a/dojo/tools/mozilla_observatory/parser.py b/dojo/tools/mozilla_observatory/parser.py
index 6ef0a89e0c4..2df42778734 100755
--- a/dojo/tools/mozilla_observatory/parser.py
+++ b/dojo/tools/mozilla_observatory/parser.py
@@ -27,10 +27,7 @@ def get_description_for_scan_types(self, scan_type):
def get_findings(self, file, test):
data = json.load(file)
# format from the CLI
- if "tests" in data:
- nodes = data["tests"]
- else:
- nodes = data
+ nodes = data.get("tests", data)
findings = []
for key in nodes:
diff --git a/dojo/tools/ms_defender/parser.py b/dojo/tools/ms_defender/parser.py
index ad909168c26..55a5d95ef47 100644
--- a/dojo/tools/ms_defender/parser.py
+++ b/dojo/tools/ms_defender/parser.py
@@ -37,9 +37,9 @@ def get_findings(self, file, test):
vulnerabilityfiles = []
machinefiles = []
for content in list(zipdata):
- if "vulnerabilities/" in content and "vulnerabilities/" != content:
+ if "vulnerabilities/" in content and content != "vulnerabilities/":
vulnerabilityfiles.append(content)
- if "machines/" in content and "machines/" != content:
+ if "machines/" in content and content != "machines/":
machinefiles.append(content)
vulnerabilities = []
machines = {}
@@ -131,7 +131,7 @@ def process_zip(self, vulnerability, machine):
self.findings.append(finding)
finding.unsaved_endpoints = []
if machine["computerDnsName"] is not None:
- finding.unsaved_endpoints.append(Endpoint(host=str(machine["computerDnsName"])))
+ finding.unsaved_endpoints.append(Endpoint(host=str(machine["computerDnsName"]).replace(" ", "").replace("(", "_").replace(")", "_")))
if machine["lastIpAddress"] is not None:
finding.unsaved_endpoints.append(Endpoint(host=str(machine["lastIpAddress"])))
if machine["lastExternalIpAddress"] is not None:
diff --git a/dojo/tools/neuvector_compliance/parser.py b/dojo/tools/neuvector_compliance/parser.py
index b3bd18bf6cf..d9e0b21dacd 100755
--- a/dojo/tools/neuvector_compliance/parser.py
+++ b/dojo/tools/neuvector_compliance/parser.py
@@ -36,10 +36,7 @@ def get_items(tree, test):
# /v1/host/{id}/compliance or similar. thus, we need to support items in a
# bit different leafs.
testsTree = None
- if "report" in tree:
- testsTree = tree.get("report").get("checks", [])
- else:
- testsTree = tree.get("items", [])
+ testsTree = tree.get("report").get("checks", []) if "report" in tree else tree.get("items", [])
for node in testsTree:
item = get_item(node, test)
@@ -121,11 +118,7 @@ def convert_severity(severity):
return "Medium"
if severity.lower() == "info":
return "Low"
- if severity.lower() == "pass":
- return "Info"
- if severity.lower() == "note":
- return "Info"
- if severity.lower() == "error":
+ if severity.lower() in ["pass", "note", "error"]:
return "Info"
return severity.title()
diff --git a/dojo/tools/nikto/json_parser.py b/dojo/tools/nikto/json_parser.py
index 4a4c24cc530..fa33cf384f3 100644
--- a/dojo/tools/nikto/json_parser.py
+++ b/dojo/tools/nikto/json_parser.py
@@ -30,7 +30,7 @@ def process_json(self, file, test):
references=vulnerability.get("references"),
)
# manage if we have an ID from OSVDB
- if "OSVDB" in vulnerability and "0" != vulnerability.get("OSVDB"):
+ if "OSVDB" in vulnerability and vulnerability.get("OSVDB") != "0":
finding.unique_id_from_tool = "OSVDB-" + vulnerability.get(
"OSVDB",
)
diff --git a/dojo/tools/nikto/xml_parser.py b/dojo/tools/nikto/xml_parser.py
index bb831b7c3cf..8a356ee361d 100644
--- a/dojo/tools/nikto/xml_parser.py
+++ b/dojo/tools/nikto/xml_parser.py
@@ -35,10 +35,7 @@ def process_scandetail(self, scan, test, dupes):
sentences = re.split(
r"(? 0:
- titleText = sentences[0][:900]
- else:
- titleText = description[:900]
+ titleText = sentences[0][:900] if len(sentences) > 0 else description[:900]
# Description
description = "\n".join(
[
@@ -49,7 +46,7 @@ def process_scandetail(self, scan, test, dupes):
)
# Manage severity the same way with JSON
severity = "Info" # Nikto doesn't assign severity, default to Info
- if item.get("osvdbid") is not None and "0" != item.get("osvdbid"):
+ if item.get("osvdbid") is not None and item.get("osvdbid") != "0":
severity = "Medium"
finding = Finding(
title=titleText,
diff --git a/dojo/tools/nmap/parser.py b/dojo/tools/nmap/parser.py
index 06af0ef0df0..27e505cfa12 100644
--- a/dojo/tools/nmap/parser.py
+++ b/dojo/tools/nmap/parser.py
@@ -1,3 +1,4 @@
+import contextlib
import datetime
from cpe import CPE
@@ -25,12 +26,10 @@ def get_findings(self, file, test):
raise ValueError(msg)
report_date = None
- try:
+ with contextlib.suppress(ValueError):
report_date = datetime.datetime.fromtimestamp(
int(root.attrib["start"]),
)
- except ValueError:
- pass
for host in root.findall("host"):
host_info = "### Host\n\n"
@@ -74,7 +73,7 @@ def get_findings(self, file, test):
endpoint.port = int(port_element.attrib["portid"])
# filter on open ports
- if "open" != port_element.find("state").attrib.get("state"):
+ if port_element.find("state").attrib.get("state") != "open":
continue
title = f"Open port: {endpoint.port}/{endpoint.protocol}"
description = host_info
@@ -200,7 +199,7 @@ def manage_vulner_script(
# manage if CVE is in metadata
if (
"type" in vuln_attributes
- and "cve" == vuln_attributes["type"]
+ and vuln_attributes["type"] == "cve"
):
finding.unsaved_vulnerability_ids = [vuln_attributes["id"]]
diff --git a/dojo/tools/npm_audit/parser.py b/dojo/tools/npm_audit/parser.py
index f5143f72af3..6296477a971 100755
--- a/dojo/tools/npm_audit/parser.py
+++ b/dojo/tools/npm_audit/parser.py
@@ -86,9 +86,7 @@ def get_item(item_node, test):
for npm_finding in item_node["findings"]:
# use first version as component_version
component_version = (
- npm_finding["version"]
- if not component_version
- else component_version
+ component_version or npm_finding["version"]
)
paths += (
"\n - "
diff --git a/dojo/tools/npm_audit_7_plus/parser.py b/dojo/tools/npm_audit_7_plus/parser.py
index 68e973af92d..479e3eb2179 100644
--- a/dojo/tools/npm_audit_7_plus/parser.py
+++ b/dojo/tools/npm_audit_7_plus/parser.py
@@ -122,10 +122,7 @@ def get_item(item_node, tree, test):
elif item_node["via"] and isinstance(item_node["via"][0], dict):
title = item_node["via"][0]["title"]
component_name = item_node["nodes"][0]
- if len(item_node["via"][0]["cwe"]) > 0:
- cwe = item_node["via"][0]["cwe"][0]
- else:
- cwe = None
+ cwe = item_node["via"][0]["cwe"][0] if len(item_node["via"][0]["cwe"]) > 0 else None
references.append(item_node["via"][0]["url"])
unique_id_from_tool = str(item_node["via"][0]["source"])
cvssv3 = item_node["via"][0]["cvss"]["vectorString"]
diff --git a/dojo/tools/nuclei/parser.py b/dojo/tools/nuclei/parser.py
index 1945c8c299f..28add5237e2 100755
--- a/dojo/tools/nuclei/parser.py
+++ b/dojo/tools/nuclei/parser.py
@@ -60,10 +60,7 @@ def get_findings(self, filename, test):
if item_type is None:
item_type = ""
matched = item.get("matched", item.get("matched-at", ""))
- if "://" in matched:
- endpoint = Endpoint.from_uri(matched)
- else:
- endpoint = Endpoint.from_uri("//" + matched)
+ endpoint = Endpoint.from_uri(matched) if "://" in matched else Endpoint.from_uri("//" + matched)
finding = Finding(
title=f"{name}",
@@ -101,12 +98,16 @@ def get_findings(self, filename, test):
cve_ids = classification["cve-id"]
finding.unsaved_vulnerability_ids = [x.upper() for x in cve_ids]
if (
- "cwe-id" in classification
- and classification["cwe-id"]
- and len(classification["cwe-id"]) > 0
+ classification.get("cwe-id")
):
cwe = classification["cwe-id"][0]
- finding.cwe = int(cwe[4:])
+ try:
+ finding.cwe = int(cwe[4:])
+ except ValueError:
+ """
+ ignore CWE if non-int
+ several older templates such as https://github.com/projectdiscovery/nuclei-templates/blob/6636c0d2dd540645cc3472822beb4b3819ff8322/http/cves/2004/CVE-2004-0519.yaml#L21
+ """
if classification.get("cvss-metrics"):
cvss_objects = cvss_parser.parse_cvss_from_text(
classification["cvss-metrics"],
diff --git a/dojo/tools/openscap/parser.py b/dojo/tools/openscap/parser.py
index 186243526b8..0795abf6ce2 100755
--- a/dojo/tools/openscap/parser.py
+++ b/dojo/tools/openscap/parser.py
@@ -108,10 +108,7 @@ def get_findings(self, file, test):
validate_ipv46_address(ip)
endpoint = Endpoint(host=ip)
except ValidationError:
- if "://" in ip:
- endpoint = Endpoint.from_uri(ip)
- else:
- endpoint = Endpoint.from_uri("//" + ip)
+ endpoint = Endpoint.from_uri(ip) if "://" in ip else Endpoint.from_uri("//" + ip)
finding.unsaved_endpoints.append(endpoint)
dupe_key = hashlib.sha256(
diff --git a/dojo/tools/ort/parser.py b/dojo/tools/ort/parser.py
index 85f04f09e2a..d40bd13653c 100755
--- a/dojo/tools/ort/parser.py
+++ b/dojo/tools/ort/parser.py
@@ -128,10 +128,7 @@ def get_rule_violation_model(
for id in project_ids:
project_names.append(get_name_id_for_package(packages, id))
package = find_package_by_id(packages, rule_violation_unresolved["pkg"])
- if "license" in rule_violation_unresolved:
- license_tmp = rule_violation_unresolved["license"]
- else:
- license_tmp = "unset"
+ license_tmp = rule_violation_unresolved.get("license", "unset")
if "license_source" not in rule_violation_unresolved:
rule_violation_unresolved["license_source"] = "unset"
license_id = find_license_id(licenses, license_tmp)
diff --git a/dojo/tools/osv_scanner/parser.py b/dojo/tools/osv_scanner/parser.py
index f91ec10f7d9..b79b4e6c5a2 100644
--- a/dojo/tools/osv_scanner/parser.py
+++ b/dojo/tools/osv_scanner/parser.py
@@ -15,14 +15,7 @@ def get_description_for_scan_types(self, scan_type):
return "OSV scan output can be imported in JSON format (option --format json)."
def classify_severity(self, input):
- if input != "":
- if input == "MODERATE":
- severity = "Medium"
- else:
- severity = input.lower().capitalize()
- else:
- severity = "Low"
- return severity
+ return ("Medium" if input == "MODERATE" else input.lower().capitalize()) if input != "" else "Low"
def get_findings(self, file, test):
try:
diff --git a/dojo/tools/pip_audit/parser.py b/dojo/tools/pip_audit/parser.py
index 13173c5b6a8..f26d739cc29 100755
--- a/dojo/tools/pip_audit/parser.py
+++ b/dojo/tools/pip_audit/parser.py
@@ -27,16 +27,8 @@ def requires_file(self, scan_type):
def get_findings(self, scan_file, test):
"""Return the collection of Findings ingested."""
data = json.load(scan_file)
- findings = None
# this parser can handle two distinct formats see sample scan files
- if "dependencies" in data:
- # new format of report
- findings = get_file_findings(data, test)
- else:
- # legacy format of report
- findings = get_legacy_findings(data, test)
-
- return findings
+ return get_file_findings(data, test) if "dependencies" in data else get_legacy_findings(data, test)
def get_file_findings(data, test):
diff --git a/dojo/tools/ptart/__init__.py b/dojo/tools/ptart/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/dojo/tools/ptart/assessment_parser.py b/dojo/tools/ptart/assessment_parser.py
new file mode 100644
index 00000000000..02387a7d65d
--- /dev/null
+++ b/dojo/tools/ptart/assessment_parser.py
@@ -0,0 +1,62 @@
+import dojo.tools.ptart.ptart_parser_tools as ptart_tools
+from dojo.models import Finding
+
+
+class PTARTAssessmentParser:
+ def __init__(self):
+ self.cvss_type = None
+
+ def get_test_data(self, tree):
+ # Check that the report is valid, If we have no assessments, then
+ # return an empty list
+ if "assessments" not in tree:
+ return []
+
+ self.cvss_type = tree.get("cvss_type", None)
+ assessments = tree["assessments"]
+ return [finding for assessment in assessments
+ for finding in self.parse_assessment(assessment)]
+
+ def parse_assessment(self, assessment):
+ hits = assessment.get("hits", [])
+ return [self.get_finding(assessment, hit) for hit in hits]
+
+ def get_finding(self, assessment, hit):
+ effort = ptart_tools.parse_ptart_fix_effort(hit.get("fix_complexity"))
+ finding = Finding(
+ title=ptart_tools.parse_title_from_hit(hit),
+ severity=ptart_tools.parse_ptart_severity(hit.get("severity")),
+ effort_for_fixing=effort,
+ component_name=assessment.get("title", "Unknown Component"),
+ date=ptart_tools.parse_date_added_from_hit(hit),
+ )
+
+ # Don't add fields if they are blank
+ if hit["body"]:
+ finding.description = hit.get("body")
+
+ if hit["remediation"]:
+ finding.mitigation = hit.get("remediation")
+
+ if hit["id"]:
+ finding.unique_id_from_tool = hit.get("id")
+ finding.vuln_id_from_tool = hit.get("id")
+ finding.cve = hit.get("id")
+
+ # Clean up and parse the CVSS vector
+ cvss_vector = ptart_tools.parse_cvss_vector(hit, self.cvss_type)
+ if cvss_vector:
+ finding.cvssv3 = cvss_vector
+
+ if "labels" in hit:
+ finding.unsaved_tags = hit["labels"]
+
+ finding.unsaved_endpoints = ptart_tools.parse_endpoints_from_hit(hit)
+
+ # Add screenshots to files, and add other attachments as well.
+ finding.unsaved_files = ptart_tools.parse_screenshots_from_hit(hit)
+ finding.unsaved_files.extend(ptart_tools.parse_attachment_from_hit(hit))
+
+ finding.references = ptart_tools.parse_references_from_hit(hit)
+
+ return finding
diff --git a/dojo/tools/ptart/parser.py b/dojo/tools/ptart/parser.py
new file mode 100644
index 00000000000..c52ebf4fb49
--- /dev/null
+++ b/dojo/tools/ptart/parser.py
@@ -0,0 +1,77 @@
+import json
+
+import dojo.tools.ptart.ptart_parser_tools as ptart_tools
+from dojo.tools.parser_test import ParserTest
+from dojo.tools.ptart.assessment_parser import PTARTAssessmentParser
+from dojo.tools.ptart.retest_parser import PTARTRetestParser
+
+
+class PTARTParser:
+
+ """
+ Imports JSON reports from the PTART reporting tool
+ (https://github.com/certmichelin/PTART)
+ """
+
+ def get_scan_types(self):
+ return ["PTART Report"]
+
+ def get_label_for_scan_types(self, scan_type):
+ return "PTART Report"
+
+ def get_description_for_scan_types(self, scan_type):
+ return "Import a PTART report file in JSON format."
+
+ def get_tests(self, scan_type, scan):
+ data = json.load(scan)
+
+ test = ParserTest(
+ name="Pen Test Report",
+ type="Pen Test",
+ version="",
+ )
+
+ # We set both to the same value for now, setting just the name doesn't
+ # seem to display when imported. This may cause issues with the UI in
+ # the future, but there's not much (read no) documentation on this.
+ if "name" in data:
+ test.name = data["name"] + " Report"
+ test.type = data["name"] + " Report"
+
+ # Generate a description from the various fields in the report data
+ description = ptart_tools.generate_test_description_from_report(data)
+
+ # Check that the fields are filled, otherwise don't set the description
+ if description:
+ test.description = description
+
+ # Setting the dates doesn't seem to want to work in reality :(
+ # Perhaps in a future version of DefectDojo?
+ if "start_date" in data:
+ test.target_start = ptart_tools.parse_date(
+ data["start_date"], "%Y-%m-%d",
+ )
+
+ if "end_date" in data:
+ test.target_end = ptart_tools.parse_date(
+ data["end_date"], "%Y-%m-%d",
+ )
+
+ findings = self.get_items(data)
+ test.findings = findings
+ return [test]
+
+ def get_findings(self, file, test):
+ data = json.load(file)
+ return self.get_items(data)
+
+ def get_items(self, data):
+ # We have several main sections in the report json: Assessments and
+ # Retest Campaigns. I haven't been able to create multiple tests for
+ # each section, so we'll just merge them for now.
+ findings = PTARTAssessmentParser().get_test_data(data)
+ findings.extend(PTARTRetestParser().get_test_data(data))
+ return findings
+
+ def requires_file(self, scan_type):
+ return True
diff --git a/dojo/tools/ptart/ptart_parser_tools.py b/dojo/tools/ptart/ptart_parser_tools.py
new file mode 100644
index 00000000000..be5f0f2559b
--- /dev/null
+++ b/dojo/tools/ptart/ptart_parser_tools.py
@@ -0,0 +1,187 @@
+import pathlib
+from datetime import datetime
+
+import cvss
+
+from dojo.models import Endpoint
+
+ATTACHMENT_ERROR = "Attachment data not found"
+SCREENSHOT_ERROR = "Screenshot data not found"
+
+
+def parse_ptart_severity(severity):
+ severity_mapping = {
+ 1: "Critical",
+ 2: "High",
+ 3: "Medium",
+ 4: "Low",
+ }
+ return severity_mapping.get(severity, "Info") # Default severity
+
+
+def parse_ptart_fix_effort(effort):
+ effort_mapping = {
+ 1: "High",
+ 2: "Medium",
+ 3: "Low",
+ }
+ return effort_mapping.get(effort)
+
+
+def parse_title_from_hit(hit):
+ hit_title = hit.get("title", None)
+ hit_id = hit.get("id", None)
+
+ return f"{hit_id}: {hit_title}" \
+ if hit_title and hit_id \
+ else (hit_title or hit_id or "Unknown Hit")
+
+
+def parse_date_added_from_hit(hit):
+ PTART_DATETIME_FORMAT = "%Y-%m-%dT%H:%M:%S.%f"
+ date_added = hit.get("added", None)
+ return parse_date(date_added, PTART_DATETIME_FORMAT)
+
+
+def parse_date(date, format):
+ try:
+ return datetime.strptime(date, format) if date else datetime.now()
+ except ValueError:
+ return datetime.now()
+
+
+def parse_cvss_vector(hit, cvss_type):
+ cvss_vector = hit.get("cvss_vector", None)
+ # Defect Dojo Only supports CVSS v3 for now.
+ if cvss_vector:
+ # Similar application once CVSS v4 is supported
+ if cvss_type == 3:
+ try:
+ c = cvss.CVSS3(cvss_vector)
+ return c.clean_vector()
+ except cvss.CVSS3Error:
+ return None
+ return None
+
+
+def parse_retest_status(status):
+ fix_status_mapping = {
+ "F": "Fixed",
+ "NF": "Not Fixed",
+ "PF": "Partially Fixed",
+ "NA": "Not Applicable",
+ "NT": "Not Tested",
+ }
+ return fix_status_mapping.get(status)
+
+
+def parse_screenshots_from_hit(hit):
+ if "screenshots" not in hit:
+ return []
+ screenshots = [parse_screenshot_data(screenshot)
+ for screenshot in hit["screenshots"]]
+ return [ss for ss in screenshots if ss is not None]
+
+
+def parse_screenshot_data(screenshot):
+ try:
+ title = get_screenshot_title(screenshot)
+ data = get_screenshot_data(screenshot)
+ return {
+ "title": title,
+ "data": data,
+ }
+ except ValueError:
+ return None
+
+
+def get_screenshot_title(screenshot):
+ caption = screenshot.get("caption", "screenshot")
+ if not caption:
+ caption = "screenshot"
+ return f"{caption}{get_file_suffix_from_screenshot(screenshot)}"
+
+
+def get_screenshot_data(screenshot):
+ if ("screenshot" not in screenshot
+ or "data" not in screenshot["screenshot"]
+ or not screenshot["screenshot"]["data"]):
+ raise ValueError(SCREENSHOT_ERROR)
+ return screenshot["screenshot"]["data"]
+
+
+def get_file_suffix_from_screenshot(screenshot):
+ return pathlib.Path(screenshot["screenshot"]["filename"]).suffix \
+ if ("screenshot" in screenshot
+ and "filename" in screenshot["screenshot"]) \
+ else ""
+
+
+def parse_attachment_from_hit(hit):
+ if "attachments" not in hit:
+ return []
+ files = [parse_attachment_data(attachment)
+ for attachment in hit["attachments"]]
+ return [f for f in files if f is not None]
+
+
+def parse_attachment_data(attachment):
+ try:
+ title = get_attachement_title(attachment)
+ data = get_attachment_data(attachment)
+ return {
+ "title": title,
+ "data": data,
+ }
+ except ValueError:
+ # No data in attachment, let's not import this file.
+ return None
+
+
+def get_attachment_data(attachment):
+ if "data" not in attachment or not attachment["data"]:
+ raise ValueError(ATTACHMENT_ERROR)
+ return attachment["data"]
+
+
+def get_attachement_title(attachment):
+ title = attachment.get("title", "attachment")
+ if not title:
+ title = "attachment"
+ return title
+
+
+def parse_endpoints_from_hit(hit):
+ if "asset" not in hit or not hit["asset"]:
+ return []
+ endpoint = Endpoint.from_uri(hit["asset"])
+ return [endpoint]
+
+
+def generate_test_description_from_report(data):
+ keys = ["executive_summary", "engagement_overview", "conclusion"]
+ clauses = [clause for clause in [data.get(key) for key in keys] if clause]
+ description = "\n\n".join(clauses)
+ return description or None
+
+
+def parse_references_from_hit(hit):
+ if "references" not in hit:
+ return None
+
+ references = hit.get("references", [])
+ all_refs = [get_transformed_reference(ref) for ref in references]
+ clean_refs = [tref for tref in all_refs if tref]
+ if not clean_refs:
+ return None
+ return "\n".join(clean_refs)
+
+
+def get_transformed_reference(reference):
+ title = reference.get("name", "Reference")
+ url = reference.get("url", None)
+ if not url:
+ if not title:
+ return url
+ return None
+ return f"{title}: {url}"
diff --git a/dojo/tools/ptart/retest_parser.py b/dojo/tools/ptart/retest_parser.py
new file mode 100644
index 00000000000..812a458344a
--- /dev/null
+++ b/dojo/tools/ptart/retest_parser.py
@@ -0,0 +1,102 @@
+import dojo.tools.ptart.ptart_parser_tools as ptart_tools
+from dojo.models import Finding
+
+
+def generate_retest_hit_title(hit, original_hit):
+ # Fake a title for the retest hit with the fix status if available
+ title = original_hit.get("title", "")
+ hit_id = hit.get("id", None)
+ if "status" in hit:
+ title = f"{title} ({ptart_tools.parse_retest_status(hit['status'])})"
+ fake_retest_hit = {
+ "title": title,
+ "id": hit_id,
+ }
+ return ptart_tools.parse_title_from_hit(fake_retest_hit)
+
+
+class PTARTRetestParser:
+ def __init__(self):
+ self.cvss_type = None
+
+ def get_test_data(self, tree):
+ if "retests" in tree:
+ self.cvss_type = tree.get("cvss_type", None)
+ retests = tree["retests"]
+ else:
+ return []
+
+ return [finding for retest in retests
+ for finding in self.parse_retest(retest)]
+
+ def parse_retest(self, retest):
+ hits = retest.get("hits", [])
+ # Get all the potential findings, valid or not.
+ all_findings = [self.get_finding(retest, hit) for hit in hits]
+ # We want to make sure we include only valid findings for a retest.
+ return [finding for finding in all_findings if finding is not None]
+
+ def get_finding(self, retest, hit):
+
+ # The negatives are a bit confusing, but we want to skip hits that
+ # don't have an original hit. Hit is invalid in a retest if not linked
+ # to an original.
+ if "original_hit" not in hit or not hit["original_hit"]:
+ return None
+
+ # Get the original hit from the retest
+ original_hit = hit["original_hit"]
+
+ # Set the Finding title to the original hit title with the retest
+ # status if available. We don't really have any other places to set
+ # this field.
+ finding_title = generate_retest_hit_title(hit, original_hit)
+
+ # As the retest hit doesn't have a date added, use the start of the
+ # retest campaign as something that's close enough.
+ finding = Finding(
+ title=finding_title,
+ severity=ptart_tools.parse_ptart_severity(
+ original_hit.get("severity"),
+ ),
+ effort_for_fixing=ptart_tools.parse_ptart_fix_effort(
+ original_hit.get("fix_complexity"),
+ ),
+ component_name=f"Retest: {retest.get('name', 'Retest')}",
+ date=ptart_tools.parse_date(
+ retest.get("start_date"),
+ "%Y-%m-%d",
+ ),
+ )
+
+ # Don't add the fields if they are blank.
+ if hit["body"]:
+ finding.description = hit.get("body")
+
+ if original_hit["remediation"]:
+ finding.mitigation = original_hit.get("remediation")
+
+ if hit["id"]:
+ finding.unique_id_from_tool = hit.get("id")
+ finding.vuln_id_from_tool = original_hit.get("id")
+ finding.cve = original_hit.get("id")
+
+ cvss_vector = ptart_tools.parse_cvss_vector(
+ original_hit,
+ self.cvss_type,
+ )
+ if cvss_vector:
+ finding.cvssv3 = cvss_vector
+
+ if "labels" in original_hit:
+ finding.unsaved_tags = original_hit["labels"]
+
+ finding.unsaved_endpoints = ptart_tools.parse_endpoints_from_hit(
+ original_hit,
+ )
+
+ # We only have screenshots in a retest. Refer to the original hit for
+ # the attachments.
+ finding.unsaved_files = ptart_tools.parse_screenshots_from_hit(hit)
+
+ return finding
diff --git a/dojo/tools/qualys/csv_parser.py b/dojo/tools/qualys/csv_parser.py
index 46e49eaedbc..450d74f6103 100755
--- a/dojo/tools/qualys/csv_parser.py
+++ b/dojo/tools/qualys/csv_parser.py
@@ -33,6 +33,7 @@ def parse_csv(csv_file) -> [Finding]:
def get_report_findings(csv_reader) -> [dict]:
"""
Filters out the unneeded information at the beginning of the Qualys CSV report.
+
Args:
csv_reader:
@@ -42,9 +43,7 @@ def get_report_findings(csv_reader) -> [dict]:
report_findings = []
for row in csv_reader:
- if row.get("Title") and row["Title"] != "Title":
- report_findings.append(row)
- elif row.get("VULN TITLE"):
+ if (row.get("Title") and row["Title"] != "Title") or row.get("VULN TITLE"):
report_findings.append(row)
return report_findings
@@ -55,11 +54,13 @@ def _extract_cvss_vectors(cvss_base, cvss_temporal):
This is done because the raw values come with additional characters that cannot be parsed with the cvss library.
Example: 6.7 (AV:L/AC:L/PR:H/UI:N/S:U/C:H/I:H/A:H)
+
Args:
cvss_base:
cvss_temporal:
Returns:
A CVSS3 Vector including both Base and Temporal if available
+
"""
vector_pattern = r"^\d{1,2}.\d \((.*)\)"
cvss_vector = "CVSS:3.0/"
diff --git a/dojo/tools/qualys/parser.py b/dojo/tools/qualys/parser.py
index 1fa189b211d..c8e87793e02 100755
--- a/dojo/tools/qualys/parser.py
+++ b/dojo/tools/qualys/parser.py
@@ -129,10 +129,7 @@ def parse_finding(host, tree):
issue_row["fqdn"] = host.findtext("DNS")
# Create Endpoint
- if issue_row["fqdn"]:
- ep = Endpoint(host=issue_row["fqdn"])
- else:
- ep = Endpoint(host=issue_row["ip_address"])
+ ep = Endpoint(host=issue_row["fqdn"]) if issue_row["fqdn"] else Endpoint(host=issue_row["ip_address"])
# OS NAME
issue_row["os"] = host.findtext("OPERATING_SYSTEM")
diff --git a/dojo/tools/qualys_infrascan_webgui/parser.py b/dojo/tools/qualys_infrascan_webgui/parser.py
index 2d26eeafc06..047d48ff2bf 100755
--- a/dojo/tools/qualys_infrascan_webgui/parser.py
+++ b/dojo/tools/qualys_infrascan_webgui/parser.py
@@ -31,10 +31,7 @@ def issue_r(raw_row, vuln, scan_date):
_port = raw_row.get("port")
# Create Endpoint
- if issue_row["fqdn"]:
- ep = Endpoint(host=issue_row["fqdn"])
- else:
- ep = Endpoint(host=issue_row["ip_address"])
+ ep = Endpoint(host=issue_row["fqdn"]) if issue_row["fqdn"] else Endpoint(host=issue_row["ip_address"])
# OS NAME
issue_row["os"] = raw_row.findtext("OS")
@@ -112,15 +109,15 @@ def issue_r(raw_row, vuln, scan_date):
def qualys_convert_severity(raw_val):
val = str(raw_val).strip()
- if "1" == val:
+ if val == "1":
return "Info"
- if "2" == val:
+ if val == "2":
return "Low"
- if "3" == val:
+ if val == "3":
return "Medium"
- if "4" == val:
+ if val == "4":
return "High"
- if "5" == val:
+ if val == "5":
return "Critical"
return "Info"
diff --git a/dojo/tools/qualys_webapp/parser.py b/dojo/tools/qualys_webapp/parser.py
index 5a5cbac3b83..825d55b531a 100755
--- a/dojo/tools/qualys_webapp/parser.py
+++ b/dojo/tools/qualys_webapp/parser.py
@@ -200,10 +200,7 @@ def get_unique_vulnerabilities(
if access_path is not None:
urls += [url.text for url in access_path.iter("URL")]
payloads = vuln.find("PAYLOADS")
- if payloads is not None:
- req_resps = get_request_response(payloads)
- else:
- req_resps = [[], []]
+ req_resps = get_request_response(payloads) if payloads is not None else [[], []]
if is_info:
raw_finding_date = vuln.findtext("LAST_TIME_DETECTED")
@@ -267,10 +264,7 @@ def get_vulnerabilities(
if access_path is not None:
urls += [url.text for url in access_path.iter("URL")]
payloads = vuln.find("PAYLOADS")
- if payloads is not None:
- req_resps = get_request_response(payloads)
- else:
- req_resps = [[], []]
+ req_resps = get_request_response(payloads) if payloads is not None else [[], []]
if is_info:
raw_finding_date = vuln.findtext("LAST_TIME_DETECTED")
@@ -292,7 +286,7 @@ def get_vulnerabilities(
else:
finding_date = None
- finding = findings.get(qid, None)
+ finding = findings.get(qid)
findings[qid] = attach_extras(
urls, req_resps[0], req_resps[1], finding, finding_date, qid, test,
)
diff --git a/dojo/tools/risk_recon/api.py b/dojo/tools/risk_recon/api.py
index 898db341ec7..e57e2b1d5c9 100755
--- a/dojo/tools/risk_recon/api.py
+++ b/dojo/tools/risk_recon/api.py
@@ -1,4 +1,5 @@
import requests
+from django.conf import settings
class RiskReconAPI:
@@ -33,6 +34,7 @@ def map_toes(self):
response = self.session.get(
url=f"{self.url}/toes",
headers={"accept": "application/json", "Authorization": self.key},
+ timeout=settings.REQUESTS_TIMEOUT,
)
if response.ok:
@@ -49,7 +51,7 @@ def map_toes(self):
toe_id = item.get("toe_id", None)
name = item.get("toe_short_name", None)
if not comps or name in name_list:
- filters = comps.get(name, None)
+ filters = comps.get(name)
self.toe_map[toe_id] = filters or self.data
else:
msg = f"Unable to query Target of Evaluations due to {response.status_code} - {response.content}"
@@ -60,7 +62,7 @@ def filter_finding(self, finding):
if not filters:
return False
- for filter_item in filters.keys():
+ for filter_item in filters:
filter_list = filters.get(filter_item, None)
if filter_list and finding[filter_item] not in filter_list:
return True
@@ -68,13 +70,14 @@ def filter_finding(self, finding):
return False
def get_findings(self):
- for toe in self.toe_map.keys():
+ for toe in self.toe_map:
response = self.session.get(
url=f"{self.url}/findings/{toe}",
headers={
"accept": "application/json",
"Authorization": self.key,
},
+ timeout=settings.REQUESTS_TIMEOUT,
)
if response.ok:
diff --git a/dojo/tools/risk_recon/parser.py b/dojo/tools/risk_recon/parser.py
index 4ddcf64e16c..24b4661021d 100755
--- a/dojo/tools/risk_recon/parser.py
+++ b/dojo/tools/risk_recon/parser.py
@@ -83,7 +83,7 @@ def _get_findings_internal(self, findings, test):
date = dateutil.parser.parse(item.get("first_seen"))
sev = item.get("severity", "").capitalize()
- sev = "Info" if not sev else sev
+ sev = sev or "Info"
tags = (
item.get("security_domain")[:20]
diff --git a/dojo/tools/sarif/parser.py b/dojo/tools/sarif/parser.py
index dff337e2e95..8ed83922905 100755
--- a/dojo/tools/sarif/parser.py
+++ b/dojo/tools/sarif/parser.py
@@ -61,9 +61,9 @@ def __get_items_from_run(self, run):
# get the timestamp of the run if possible
run_date = self.__get_last_invocation_date(run)
for result in run.get("results", []):
- item = get_item(result, rules, artifacts, run_date)
- if item is not None:
- items.append(item)
+ result_items = get_items_from_result(result, rules, artifacts, run_date)
+ if result_items:
+ items.extend(result_items)
return items
def __get_last_invocation_date(self, data):
@@ -189,34 +189,35 @@ def get_title(result, rule):
return textwrap.shorten(title, 150)
-def get_snippet(result):
+def get_snippet(location):
+
snippet = None
- if "locations" in result:
- location = result["locations"][0]
- if "physicalLocation" in location:
- if "region" in location["physicalLocation"]:
- if "snippet" in location["physicalLocation"]["region"]:
- if (
- "text"
- in location["physicalLocation"]["region"]["snippet"]
- ):
- snippet = location["physicalLocation"]["region"][
- "snippet"
- ]["text"]
- if (
- snippet is None
- and "contextRegion" in location["physicalLocation"]
- ):
- if "snippet" in location["physicalLocation"]["contextRegion"]:
- if (
- "text"
- in location["physicalLocation"]["contextRegion"][
- "snippet"
- ]
- ):
- snippet = location["physicalLocation"][
- "contextRegion"
- ]["snippet"]["text"]
+
+ if location and "physicalLocation" in location:
+ if "region" in location["physicalLocation"]:
+ if "snippet" in location["physicalLocation"]["region"]:
+ if (
+ "text"
+ in location["physicalLocation"]["region"]["snippet"]
+ ):
+ snippet = location["physicalLocation"]["region"][
+ "snippet"
+ ]["text"]
+ if (
+ snippet is None
+ and "contextRegion" in location["physicalLocation"]
+ ):
+ if "snippet" in location["physicalLocation"]["contextRegion"]:
+ if (
+ "text"
+ in location["physicalLocation"]["contextRegion"][
+ "snippet"
+ ]
+ ):
+ snippet = location["physicalLocation"][
+ "contextRegion"
+ ]["snippet"]["text"]
+
return snippet
@@ -264,7 +265,7 @@ def get_codeFlowsDescription(codeFlows):
return description
-def get_description(result, rule):
+def get_description(result, rule, location):
description = ""
message = ""
if "message" in result:
@@ -272,8 +273,8 @@ def get_description(result, rule):
result["message"], rule,
)
description += f"**Result message:** {message}\n"
- if get_snippet(result) is not None:
- description += f"**Snippet:**\n```\n{get_snippet(result)}\n```\n"
+ if get_snippet(location) is not None:
+ description += f"**Snippet:**\n```\n{get_snippet(location)}\n```\n"
if rule is not None:
if "name" in rule:
description += f"**{_('Rule name')}:** {rule.get('name')}\n"
@@ -297,10 +298,7 @@ def get_description(result, rule):
if len(result.get("codeFlows", [])) > 0:
description += get_codeFlowsDescription(result["codeFlows"])
- if description.endswith("\n"):
- description = description[:-1]
-
- return description
+ return description.removesuffix("\n")
def get_references(rule):
@@ -345,16 +343,16 @@ def get_severity(result, rule):
if "defaultConfiguration" in rule:
severity = rule["defaultConfiguration"].get("level")
- if "note" == severity:
+ if severity == "note":
return "Info"
- if "warning" == severity:
+ if severity == "warning":
return "Medium"
- if "error" == severity:
+ if severity == "error":
return "High"
return "Medium"
-def get_item(result, rules, artifacts, run_date):
+def get_items_from_result(result, rules, artifacts, run_date):
# see
# https://docs.oasis-open.org/sarif/sarif/v2.1.0/csprd01/sarif-v2.1.0-csprd01.html
# / 3.27.9
@@ -369,102 +367,119 @@ def get_item(result, rules, artifacts, run_date):
if result.get("suppressions"):
suppressed = True
- # if there is a location get it
- file_path = None
- line = None
+ # if there is a location get all files into files list
+
+ files = []
+
if "locations" in result:
- location = result["locations"][0]
- if "physicalLocation" in location:
- file_path = location["physicalLocation"]["artifactLocation"]["uri"]
-
- # 'region' attribute is optionnal
- if "region" in location["physicalLocation"]:
- # https://docs.oasis-open.org/sarif/sarif/v2.0/csprd02/sarif-v2.0-csprd02.html / 3.30.1
- # need to check whether it is byteOffset
- if "byteOffset" in location["physicalLocation"]["region"]:
- pass
- else:
- line = location["physicalLocation"]["region"]["startLine"]
-
- # test rule link
- rule = rules.get(result.get("ruleId"))
-
- finding = Finding(
- title=get_title(result, rule),
- severity=get_severity(result, rule),
- description=get_description(result, rule),
- static_finding=True, # by definition
- dynamic_finding=False, # by definition
- false_p=suppressed,
- active=not suppressed,
- file_path=file_path,
- line=line,
- references=get_references(rule),
- )
-
- if "ruleId" in result:
- finding.vuln_id_from_tool = result["ruleId"]
- # for now we only support when the id of the rule is a CVE
- if cve_try(result["ruleId"]):
- finding.unsaved_vulnerability_ids = [cve_try(result["ruleId"])]
- elif rule is not None and "name" in rule:
- finding.unsaved_vulnerability_ids = [rule["name"]]
- # some time the rule id is here but the tool doesn't define it
- if rule is not None:
- cwes_extracted = get_rule_cwes(rule)
- if len(cwes_extracted) > 0:
- finding.cwe = cwes_extracted[-1]
-
- # Some tools such as GitHub or Grype return the severity in properties
- # instead
- if "properties" in rule and "security-severity" in rule["properties"]:
- try:
- cvss = float(rule["properties"]["security-severity"])
- severity = cvss_to_severity(cvss)
- finding.cvssv3_score = cvss
- finding.severity = severity
- except ValueError:
- if rule["properties"]["security-severity"].lower().capitalize() in ["Info", "Low", "Medium", "High", "Critical"]:
- finding.severity = rule["properties"]["security-severity"].lower().capitalize()
- else:
- finding.severity = "Info"
-
- # manage the case that some tools produce CWE as properties of the result
- cwes_properties_extracted = get_result_cwes_properties(result)
- if len(cwes_properties_extracted) > 0:
- finding.cwe = cwes_properties_extracted[-1]
-
- # manage fixes provided in the report
- if "fixes" in result:
- finding.mitigation = "\n".join(
- [fix.get("description", {}).get("text") for fix in result["fixes"]],
- )
+ for location in result["locations"]:
+
+ file_path = None
+ line = None
+
+ if "physicalLocation" in location:
+ file_path = location["physicalLocation"]["artifactLocation"]["uri"]
+
+ # 'region' attribute is optionnal
+ if "region" in location["physicalLocation"]:
+ # https://docs.oasis-open.org/sarif/sarif/v2.0/csprd02/sarif-v2.0-csprd02.html / 3.30.1
+ # need to check whether it is byteOffset
+ if "byteOffset" in location["physicalLocation"]["region"]:
+ pass
+ else:
+ line = location["physicalLocation"]["region"]["startLine"]
+
+ files.append((file_path, line, location))
+
+ if not files:
+ files.append((None, None, None))
+
+ result_items = []
- if run_date:
- finding.date = run_date
-
- # manage tags provided in the report and rule and remove duplicated
- tags = list(set(get_properties_tags(rule) + get_properties_tags(result)))
- tags = [s.removeprefix('external/cwe/') for s in tags]
- finding.unsaved_tags = tags
-
- # manage fingerprints
- # fingerprinting in SARIF is more complete than in current implementation
- # SARIF standard make it possible to have multiple version in the same report
- # for now we just take the first one and keep the format to be able to
- # compare it
- if result.get("fingerprints"):
- hashes = get_fingerprints_hashes(result["fingerprints"])
- first_item = next(iter(hashes.items()))
- finding.unique_id_from_tool = first_item[1]["value"]
- elif result.get("partialFingerprints"):
- # for this one we keep an order to have id that could be compared
- hashes = get_fingerprints_hashes(result["partialFingerprints"])
- sorted_hashes = sorted(hashes.keys())
- finding.unique_id_from_tool = "|".join(
- [f'{key}:{hashes[key]["value"]}' for key in sorted_hashes],
+ for file_path, line, location in files:
+
+ # test rule link
+ rule = rules.get(result.get("ruleId"))
+
+ finding = Finding(
+ title=get_title(result, rule),
+ severity=get_severity(result, rule),
+ description=get_description(result, rule, location),
+ static_finding=True, # by definition
+ dynamic_finding=False, # by definition
+ false_p=suppressed,
+ active=not suppressed,
+ file_path=file_path,
+ line=line,
+ references=get_references(rule),
)
- return finding
+
+ if "ruleId" in result:
+ finding.vuln_id_from_tool = result["ruleId"]
+ # for now we only support when the id of the rule is a CVE
+ if cve_try(result["ruleId"]):
+ finding.unsaved_vulnerability_ids = [cve_try(result["ruleId"])]
+ elif rule is not None and "name" in rule:
+ finding.unsaved_vulnerability_ids = [rule["name"]]
+ # some time the rule id is here but the tool doesn't define it
+ if rule is not None:
+ cwes_extracted = get_rule_cwes(rule)
+ if len(cwes_extracted) > 0:
+ finding.cwe = cwes_extracted[-1]
+
+ # Some tools such as GitHub or Grype return the severity in properties
+ # instead
+ if "properties" in rule and "security-severity" in rule["properties"]:
+ try:
+ cvss = float(rule["properties"]["security-severity"])
+ severity = cvss_to_severity(cvss)
+ finding.cvssv3_score = cvss
+ finding.severity = severity
+ except ValueError:
+ if rule["properties"]["security-severity"].lower().capitalize() in ["Info", "Low", "Medium", "High", "Critical"]:
+ finding.severity = rule["properties"]["security-severity"].lower().capitalize()
+ else:
+ finding.severity = "Info"
+
+ # manage the case that some tools produce CWE as properties of the result
+ cwes_properties_extracted = get_result_cwes_properties(result)
+ if len(cwes_properties_extracted) > 0:
+ finding.cwe = cwes_properties_extracted[-1]
+
+ # manage fixes provided in the report
+ if "fixes" in result:
+ finding.mitigation = "\n".join(
+ [fix.get("description", {}).get("text") for fix in result["fixes"]],
+ )
+
+ if run_date:
+ finding.date = run_date
+
+ # manage tags provided in the report and rule and remove duplicated
+ tags = list(set(get_properties_tags(rule) + get_properties_tags(result)))
+ tags = [s.removeprefix("external/cwe/") for s in tags]
+ finding.tags = tags
+
+ # manage fingerprints
+ # fingerprinting in SARIF is more complete than in current implementation
+ # SARIF standard make it possible to have multiple version in the same report
+ # for now we just take the first one and keep the format to be able to
+ # compare it
+ if result.get("fingerprints"):
+ hashes = get_fingerprints_hashes(result["fingerprints"])
+ first_item = next(iter(hashes.items()))
+ finding.unique_id_from_tool = first_item[1]["value"]
+ elif result.get("partialFingerprints"):
+ # for this one we keep an order to have id that could be compared
+ hashes = get_fingerprints_hashes(result["partialFingerprints"])
+ sorted_hashes = sorted(hashes.keys())
+ finding.unique_id_from_tool = "|".join(
+ [f'{key}:{hashes[key]["value"]}' for key in sorted_hashes],
+ )
+
+ result_items.append(finding)
+
+ return result_items
def get_fingerprints_hashes(values):
diff --git a/dojo/tools/semgrep/parser.py b/dojo/tools/semgrep/parser.py
index 883fcc4f31a..39f72f8b431 100755
--- a/dojo/tools/semgrep/parser.py
+++ b/dojo/tools/semgrep/parser.py
@@ -137,15 +137,8 @@ def convert_severity(self, val):
return "Medium"
if upper_value in ["ERROR", "HIGH"]:
return "High"
- if upper_value == "LOW":
+ if upper_value in ["LOW", "INFO"]:
return "Low"
- if upper_value == "INFO":
- if "WARNING" == val.upper():
- return "Medium"
- if "ERROR" == val.upper() or "HIGH" == val.upper():
- return "High"
- if "INFO" == val.upper():
- return "Info"
msg = f"Unknown value for severity: {val}"
raise ValueError(msg)
diff --git a/dojo/tools/sonarqube/sonarqube_restapi_zip.py b/dojo/tools/sonarqube/sonarqube_restapi_zip.py
index 3ad7ba0a9cf..338c5316e68 100644
--- a/dojo/tools/sonarqube/sonarqube_restapi_zip.py
+++ b/dojo/tools/sonarqube/sonarqube_restapi_zip.py
@@ -6,7 +6,7 @@
class SonarQubeRESTAPIZIP:
def get_items(self, files, test, mode):
total_findings_per_file = []
- for dictkey in files.keys():
+ for dictkey in files:
if dictkey.endswith(".json"):
json_content = json.loads(files[dictkey].decode("ascii"))
total_findings_per_file += SonarQubeRESTAPIJSON().get_json_items(json_content, test, mode)
diff --git a/dojo/tools/spotbugs/parser.py b/dojo/tools/spotbugs/parser.py
index b63c1aa1980..01556a4fb0e 100755
--- a/dojo/tools/spotbugs/parser.py
+++ b/dojo/tools/spotbugs/parser.py
@@ -86,10 +86,7 @@ def get_findings(self, filename, test):
desc += message + "\n"
shortmessage_extract = bug.find("ShortMessage")
- if shortmessage_extract is not None:
- title = shortmessage_extract.text
- else:
- title = bug.get("type")
+ title = shortmessage_extract.text if shortmessage_extract is not None else bug.get("type")
severity = SEVERITY[bug.get("priority")]
description = desc
diff --git a/dojo/tools/sslscan/parser.py b/dojo/tools/sslscan/parser.py
index 9ac284c1267..86d289b1d92 100755
--- a/dojo/tools/sslscan/parser.py
+++ b/dojo/tools/sslscan/parser.py
@@ -88,9 +88,6 @@ def get_findings(self, file, test):
dupes[dupe_key] = finding
if host:
- if "://" in host:
- endpoint = Endpoint.from_uri(host)
- else:
- endpoint = Endpoint(host=host, port=port)
+ endpoint = Endpoint.from_uri(host) if "://" in host else Endpoint(host=host, port=port)
finding.unsaved_endpoints.append(endpoint)
return list(dupes.values())
diff --git a/dojo/tools/tenable/csv_format.py b/dojo/tools/tenable/csv_format.py
index 8b8a53d8734..5eea3762c58 100644
--- a/dojo/tools/tenable/csv_format.py
+++ b/dojo/tools/tenable/csv_format.py
@@ -15,7 +15,7 @@
class TenableCSVParser:
def _validated_severity(self, severity):
- if severity not in Finding.SEVERITIES.keys():
+ if severity not in Finding.SEVERITIES:
severity = "Info"
return severity
@@ -103,6 +103,9 @@ def get_findings(self, filename: str, test: Test):
mitigation = str(row.get("Solution", row.get("definition.solution", row.get("Steps to Remediate", "N/A"))))
impact = row.get("Description", row.get("definition.description", "N/A"))
references = row.get("See Also", row.get("definition.see_also", "N/A"))
+ references += "\nTenable Plugin ID: " + row.get("Plugin", "N/A")
+ references += "\nPlugin Publication Date: " + row.get("Plugin Publication Date", "N/A")
+ references += "\nPlugin Modification Date: " + row.get("Plugin Modification Date", "N/A")
# Determine if the current row has already been processed
dupe_key = (
severity
@@ -190,10 +193,7 @@ def get_findings(self, filename: str, test: Test):
if isinstance(port, str) and port in ["", "0"]:
port = None
# Update the endpoints
- if "://" in host:
- endpoint = Endpoint.from_uri(host)
- else:
- endpoint = Endpoint(protocol=protocol, host=host, port=port)
+ endpoint = Endpoint.from_uri(host) if "://" in host else Endpoint(protocol=protocol, host=host, port=port)
# Add the list to be processed later
find.unsaved_endpoints.append(endpoint)
diff --git a/dojo/tools/tenable/xml_format.py b/dojo/tools/tenable/xml_format.py
index 7094e82d626..ae63151ec5a 100644
--- a/dojo/tools/tenable/xml_format.py
+++ b/dojo/tools/tenable/xml_format.py
@@ -23,7 +23,7 @@ def get_text_severity(self, severity_id):
elif severity_id == 1:
severity = "Low"
# Ensure the severity is a valid choice. Fall back to info otherwise
- if severity not in Finding.SEVERITIES.keys():
+ if severity not in Finding.SEVERITIES:
severity = "Info"
return severity
@@ -51,7 +51,7 @@ def safely_get_element_text(self, element):
return None
if isinstance(element_text, str):
return element_text if len(element_text) > 0 else None
- if isinstance(element_text, (int, float)):
+ if isinstance(element_text, int | float):
return element_text or None
return None
diff --git a/dojo/tools/terrascan/parser.py b/dojo/tools/terrascan/parser.py
index ec17ab73a77..e9f7e762002 100755
--- a/dojo/tools/terrascan/parser.py
+++ b/dojo/tools/terrascan/parser.py
@@ -35,10 +35,7 @@ def get_findings(self, filename, test):
for item in data.get("results").get("violations"):
rule_name = item.get("rule_name")
description = item.get("description")
- if item.get("severity") in self.SEVERITY:
- severity = self.SEVERITY[item.get("severity")]
- else:
- severity = "Info"
+ severity = self.SEVERITY.get(item.get("severity"), "Info")
rule_id = item.get("rule_id")
category = item.get("category")
resource_name = item.get("resource_name")
diff --git a/dojo/tools/tfsec/parser.py b/dojo/tools/tfsec/parser.py
index 0dd105c1514..b86861b6edb 100755
--- a/dojo/tools/tfsec/parser.py
+++ b/dojo/tools/tfsec/parser.py
@@ -50,14 +50,8 @@ def get_findings(self, filename, test):
)
impact = item.get("impact")
resolution = item.get("resolution")
- if item.get("links", None) is not None:
- references = "\n".join(item.get("links"))
- else:
- references = item.get("link", None)
- if item.get("severity").upper() in self.SEVERITY:
- severity = self.SEVERITY[item.get("severity").upper()]
- else:
- severity = "Low"
+ references = "\n".join(item.get("links")) if item.get("links", None) is not None else item.get("link", None)
+ severity = self.SEVERITY.get(item.get("severity").upper(), "Low")
dupe_key = hashlib.sha256(
(
diff --git a/dojo/tools/threagile/parser.py b/dojo/tools/threagile/parser.py
index 6d0754f617a..0a8908ec5a6 100644
--- a/dojo/tools/threagile/parser.py
+++ b/dojo/tools/threagile/parser.py
@@ -79,7 +79,7 @@ def get_items(self, tree, test):
findings = []
for item in tree:
for field in self.REQUIRED_FIELDS:
- if field not in item.keys():
+ if field not in item:
msg = f"Invalid ThreAgile risks file, missing field {field}"
raise ValueError(msg)
severity = item.get("severity", "info").capitalize()
diff --git a/dojo/tools/trivy/parser.py b/dojo/tools/trivy/parser.py
index 2e79c2b7e23..464eadf83d4 100755
--- a/dojo/tools/trivy/parser.py
+++ b/dojo/tools/trivy/parser.py
@@ -34,7 +34,7 @@
SECRET_DESCRIPTION_TEMPLATE = """{title}
**Category:** {category}
**Match:** {match}
-"""
+""" # noqa: S105
LICENSE_DESCRIPTION_TEMPLATE = """{title}
**Category:** {category}
@@ -194,10 +194,7 @@ def get_result_items(self, test, results, service_name=None, artifact_name=""):
package_version = vuln.get("InstalledVersion", "")
references = "\n".join(vuln.get("References", []))
mitigation = vuln.get("FixedVersion", "")
- if len(vuln.get("CweIDs", [])) > 0:
- cwe = int(vuln["CweIDs"][0].split("-")[1])
- else:
- cwe = 0
+ cwe = int(vuln["CweIDs"][0].split("-")[1]) if len(vuln.get("CweIDs", [])) > 0 else 0
type = target_data.get("Type", "")
title = f"{vuln_id} {package_name} {package_version}"
description = DESCRIPTION_TEMPLATE.format(
diff --git a/dojo/tools/trivy_operator/checks_handler.py b/dojo/tools/trivy_operator/checks_handler.py
index e6a1ccd8bb6..66e4199cfb7 100644
--- a/dojo/tools/trivy_operator/checks_handler.py
+++ b/dojo/tools/trivy_operator/checks_handler.py
@@ -1,4 +1,5 @@
from dojo.models import Finding
+from dojo.tools.trivy_operator.uniform_vulnid import UniformTrivyVulnID
TRIVY_SEVERITIES = {
"CRITICAL": "Critical",
@@ -10,8 +11,15 @@
class TrivyChecksHandler:
- def handle_checks(self, service, checks, test):
+ def handle_checks(self, labels, checks, test):
findings = []
+ resource_namespace = labels.get("trivy-operator.resource.namespace", "")
+ resource_kind = labels.get("trivy-operator.resource.kind", "")
+ resource_name = labels.get("trivy-operator.resource.name", "")
+ container_name = labels.get("trivy-operator.container.name", "")
+ service = f"{resource_namespace}/{resource_kind}/{resource_name}"
+ if container_name != "":
+ service = f"{service}/{container_name}"
for check in checks:
check_title = check.get("title")
check_severity = TRIVY_SEVERITIES[check.get("severity")]
@@ -23,6 +31,10 @@ def handle_checks(self, service, checks, test):
+ check_id.lower()
)
check_description = check.get("description", "")
+ check_description += "\n**container.name:** " + container_name
+ check_description += "\n**resource.kind:** " + resource_kind
+ check_description += "\n**resource.name:** " + resource_name
+ check_description += "\n**resource.namespace:** " + resource_namespace
title = f"{check_id} - {check_title}"
finding = Finding(
test=test,
@@ -34,7 +46,9 @@ def handle_checks(self, service, checks, test):
dynamic_finding=False,
service=service,
)
+ if resource_namespace != "":
+ finding.tags = resource_namespace
if check_id:
- finding.unsaved_vulnerability_ids = [check_id]
+ finding.unsaved_vulnerability_ids = [UniformTrivyVulnID().return_uniformed_vulnid(check_id)]
findings.append(finding)
return findings
diff --git a/dojo/tools/trivy_operator/clustercompliance_handler.py b/dojo/tools/trivy_operator/clustercompliance_handler.py
new file mode 100644
index 00000000000..5f568725494
--- /dev/null
+++ b/dojo/tools/trivy_operator/clustercompliance_handler.py
@@ -0,0 +1,45 @@
+from dojo.models import Finding
+
+TRIVY_SEVERITIES = {
+ "CRITICAL": "Critical",
+ "HIGH": "High",
+ "MEDIUM": "Medium",
+ "LOW": "Low",
+ "UNKNOWN": "Info",
+}
+
+
+class TrivyClusterComplianceHandler:
+ def handle_clustercompliance(self, controls, clustercompliance, test):
+ findings = []
+ for result in clustercompliance.get("controlCheck"):
+ if int(result.get("totalFail", 0)) > 0:
+ description = ""
+ result_id = result.get("id", "")
+ vulnerabilityids = []
+ for control in controls:
+ if control.get("id") == result_id:
+ vulnids = control.get("checks", [])
+ for vulnid in vulnids:
+ vulnerabilityids.append(vulnid.get("id"))
+ description += "**description:** " + control.get("description") + "\n"
+ result_name = result.get("name", "")
+ result_severity = result.get("severity", "")
+ result_totalfail = str(result.get("totalFail", ""))
+ severity = TRIVY_SEVERITIES[result_severity]
+ description += "**id:** " + result_id + "\n"
+ description += "**name:** " + result_name + "\n"
+ description += "**totalfail:** " + result_totalfail + "\n"
+ title = "TrivyClusterCompliance " + result_id + " totalFail: " + result_totalfail
+ finding = Finding(
+ test=test,
+ title=title,
+ description=description,
+ severity=severity,
+ static_finding=False,
+ dynamic_finding=True,
+ )
+ if vulnerabilityids != []:
+ finding.unsaved_vulnerability_ids = vulnerabilityids
+ findings.append(finding)
+ return findings
diff --git a/dojo/tools/trivy_operator/compliance_handler.py b/dojo/tools/trivy_operator/compliance_handler.py
index 9e27c56ddf2..62a63929e26 100644
--- a/dojo/tools/trivy_operator/compliance_handler.py
+++ b/dojo/tools/trivy_operator/compliance_handler.py
@@ -1,4 +1,5 @@
from dojo.models import Finding
+from dojo.tools.trivy_operator.uniform_vulnid import UniformTrivyVulnID
TRIVY_SEVERITIES = {
"CRITICAL": "Critical",
@@ -54,6 +55,6 @@ def handle_compliance(self, benchmarkreport, test):
dynamic_finding=True,
)
if check_checkID:
- finding.unsaved_vulnerability_ids = [check_checkID]
+ finding.unsaved_vulnerability_ids = [UniformTrivyVulnID().return_uniformed_vulnid(check_checkID)]
findings.append(finding)
return findings
diff --git a/dojo/tools/trivy_operator/parser.py b/dojo/tools/trivy_operator/parser.py
index 138cee17624..6ba1be3f158 100755
--- a/dojo/tools/trivy_operator/parser.py
+++ b/dojo/tools/trivy_operator/parser.py
@@ -3,6 +3,7 @@
import json
from dojo.tools.trivy_operator.checks_handler import TrivyChecksHandler
+from dojo.tools.trivy_operator.clustercompliance_handler import TrivyClusterComplianceHandler
from dojo.tools.trivy_operator.compliance_handler import TrivyComplianceHandler
from dojo.tools.trivy_operator.secrets_handler import TrivySecretsHandler
from dojo.tools.trivy_operator.vulnerability_handler import TrivyVulnerabilityHandler
@@ -20,12 +21,25 @@ def get_description_for_scan_types(self, scan_type):
def get_findings(self, scan_file, test):
scan_data = scan_file.read()
-
try:
data = json.loads(str(scan_data, "utf-8"))
except Exception:
data = json.loads(scan_data)
+ findings = []
+ if type(data) is list:
+ for listitems in data:
+ findings += self.output_findings(listitems, test)
+ elif type(data) is dict and bool(set(data.keys()) & {"clustercompliancereports.aquasecurity.github.io", "clusterconfigauditreports.aquasecurity.github.io", "clusterinfraassessmentreports.aquasecurity.github.io", "clusterrbacassessmentreports.aquasecurity.github.io", "configauditreports.aquasecurity.github.io", "exposedsecretreports.aquasecurity.github.io", "infraassessmentreports.aquasecurity.github.io", "rbacassessmentreports.aquasecurity.github.io", "vulnerabilityreports.aquasecurity.github.io"}):
+ for datakey in list(data.keys()):
+ if datakey not in ["clustersbomreports.aquasecurity.github.io", "sbomreports.aquasecurity.github.io"]:
+ for listitems in (data[datakey]):
+ findings += self.output_findings(listitems, test)
+ else:
+ findings += self.output_findings(data, test)
+ return findings
+ def output_findings(self, data, test):
+ findings = []
if data is None:
return []
metadata = data.get("metadata", None)
@@ -35,29 +49,23 @@ def get_findings(self, scan_file, test):
if labels is None:
return []
report = data.get("report", None)
- benchmark = data.get("status", None)
- if benchmark is not None:
- benchmarkreport = benchmark.get("detailReport", None)
- findings = []
if report is not None:
- resource_namespace = labels.get(
- "trivy-operator.resource.namespace", "",
- )
- resource_kind = labels.get("trivy-operator.resource.kind", "")
- resource_name = labels.get("trivy-operator.resource.name", "")
- container_name = labels.get("trivy-operator.container.name", "")
- service = f"{resource_namespace}/{resource_kind}/{resource_name}"
- if container_name != "":
- service = f"{service}/{container_name}"
vulnerabilities = report.get("vulnerabilities", None)
if vulnerabilities is not None:
- findings += TrivyVulnerabilityHandler().handle_vulns(service, vulnerabilities, test)
+ findings += TrivyVulnerabilityHandler().handle_vulns(labels, vulnerabilities, test)
checks = report.get("checks", None)
if checks is not None:
- findings += TrivyChecksHandler().handle_checks(service, checks, test)
+ findings += TrivyChecksHandler().handle_checks(labels, checks, test)
secrets = report.get("secrets", None)
if secrets is not None:
- findings += TrivySecretsHandler().handle_secrets(service, secrets, test)
- elif benchmarkreport is not None:
- findings += TrivyComplianceHandler().handle_compliance(benchmarkreport, test)
+ findings += TrivySecretsHandler().handle_secrets(labels, secrets, test)
+ status = data.get("status", None)
+ if status is not None:
+ benchmarkreport = status.get("detailReport", None)
+ if benchmarkreport is not None:
+ findings += TrivyComplianceHandler().handle_compliance(benchmarkreport, test)
+ clustercompliance = status.get("summaryReport", None)
+ if clustercompliance is not None:
+ if int(status.get("summary").get("failCount", 0)) > 0:
+ findings += TrivyClusterComplianceHandler().handle_clustercompliance(controls=data.get("spec").get("compliance").get("controls"), clustercompliance=clustercompliance, test=test)
return findings
diff --git a/dojo/tools/trivy_operator/secrets_handler.py b/dojo/tools/trivy_operator/secrets_handler.py
index c5e767a1bc5..0f082dd072d 100644
--- a/dojo/tools/trivy_operator/secrets_handler.py
+++ b/dojo/tools/trivy_operator/secrets_handler.py
@@ -11,12 +11,19 @@
SECRET_DESCRIPTION_TEMPLATE = """{title}
**Category:** {category}
**Match:** {match}
-"""
+""" # noqa: S105
class TrivySecretsHandler:
- def handle_secrets(self, service, secrets, test):
+ def handle_secrets(self, labels, secrets, test):
findings = []
+ resource_namespace = labels.get("trivy-operator.resource.namespace", "")
+ resource_kind = labels.get("trivy-operator.resource.kind", "")
+ resource_name = labels.get("trivy-operator.resource.name", "")
+ container_name = labels.get("trivy-operator.container.name", "")
+ service = f"{resource_namespace}/{resource_kind}/{resource_name}"
+ if container_name != "":
+ service = f"{service}/{container_name}"
for secret in secrets:
secret_title = secret.get("title")
secret_category = secret.get("category")
@@ -31,7 +38,11 @@ def handle_secrets(self, service, secrets, test):
category=secret_category,
match=secret_match,
)
-
+ secret_description += "\n**container.name:** " + container_name
+ secret_description += "\n**resource.kind:** " + resource_kind
+ secret_description += "\n**resource.name:** " + resource_name
+ secret_description += "\n**resource.namespace:** " + resource_namespace
+ secret_description += "\n**ruleID:** " + secret_rule_id
finding = Finding(
test=test,
title=title,
@@ -43,7 +54,7 @@ def handle_secrets(self, service, secrets, test):
dynamic_finding=False,
service=service,
)
- if secret_rule_id:
- finding.unsaved_vulnerability_ids = [secret_rule_id]
+ if resource_namespace != "":
+ finding.tags = resource_namespace
findings.append(finding)
return findings
diff --git a/dojo/tools/trivy_operator/uniform_vulnid.py b/dojo/tools/trivy_operator/uniform_vulnid.py
new file mode 100644
index 00000000000..b3aae5055e4
--- /dev/null
+++ b/dojo/tools/trivy_operator/uniform_vulnid.py
@@ -0,0 +1,20 @@
+import re
+
+
+class UniformTrivyVulnID:
+ def return_uniformed_vulnid(self, vulnid):
+ if vulnid is None:
+ return vulnid
+ if "cve" in vulnid.lower():
+ return vulnid
+ if "khv" in vulnid.lower():
+ temp = re.compile("([a-zA-Z-_]+)([0-9]+)")
+ number = str(temp.match(vulnid).groups()[1]).zfill(3)
+ avd_category = str(temp.match(vulnid.lower()).groups()[0])
+ return avd_category.upper() + number
+ if "ksv" in vulnid.lower() or "kcv" in vulnid.lower():
+ temp = re.compile("([a-zA-Z-_]+)([0-9]+)")
+ number = str(temp.match(vulnid).groups()[1]).zfill(4)
+ avd_category = str(temp.match(vulnid.lower().replace("_", "").replace("-", "")).groups()[0].replace("avd", ""))
+ return "AVD-" + avd_category.upper() + "-" + number
+ return vulnid
diff --git a/dojo/tools/trivy_operator/vulnerability_handler.py b/dojo/tools/trivy_operator/vulnerability_handler.py
index 13be3e55a41..54a951cdc3f 100644
--- a/dojo/tools/trivy_operator/vulnerability_handler.py
+++ b/dojo/tools/trivy_operator/vulnerability_handler.py
@@ -1,4 +1,5 @@
from dojo.models import Finding
+from dojo.tools.trivy_operator.uniform_vulnid import UniformTrivyVulnID
DESCRIPTION_TEMPLATE = """{title}
**Fixed version:** {fixed_version}
@@ -14,8 +15,15 @@
class TrivyVulnerabilityHandler:
- def handle_vulns(self, service, vulnerabilities, test):
+ def handle_vulns(self, labels, vulnerabilities, test):
findings = []
+ resource_namespace = labels.get("trivy-operator.resource.namespace", "")
+ resource_kind = labels.get("trivy-operator.resource.kind", "")
+ resource_name = labels.get("trivy-operator.resource.name", "")
+ container_name = labels.get("trivy-operator.container.name", "")
+ service = f"{resource_namespace}/{resource_kind}/{resource_name}"
+ if container_name != "":
+ service = f"{service}/{container_name}"
for vulnerability in vulnerabilities:
vuln_id = vulnerability.get("vulnerabilityID", "0")
severity = TRIVY_SEVERITIES[vulnerability.get("severity")]
@@ -24,8 +32,7 @@ def handle_vulns(self, service, vulnerabilities, test):
package_name = vulnerability.get("resource")
package_version = vulnerability.get("installedVersion")
cvssv3_score = vulnerability.get("score")
-
- finding_tags = []
+ finding_tags = [resource_namespace]
target_target = None
target_class = None
package_path = None
@@ -57,7 +64,10 @@ def handle_vulns(self, service, vulnerabilities, test):
description = DESCRIPTION_TEMPLATE.format(
title=vulnerability.get("title"), fixed_version=mitigation,
)
-
+ description += "\n**container.name:** " + container_name
+ description += "\n**resource.kind:** " + resource_kind
+ description += "\n**resource.name:** " + resource_name
+ description += "\n**resource.namespace:** " + resource_namespace
title = f"{vuln_id} {package_name} {package_version}"
finding = Finding(
test=test,
@@ -73,9 +83,9 @@ def handle_vulns(self, service, vulnerabilities, test):
dynamic_finding=False,
service=service,
file_path=file_path,
- tags=finding_tags,
+ tags=[tag for tag in finding_tags if tag != ""],
)
if vuln_id:
- finding.unsaved_vulnerability_ids = [vuln_id]
+ finding.unsaved_vulnerability_ids = [UniformTrivyVulnID().return_uniformed_vulnid(vuln_id)]
findings.append(finding)
return findings
diff --git a/dojo/tools/trufflehog3/parser.py b/dojo/tools/trufflehog3/parser.py
index c4879bc4ccb..fa013cce35e 100755
--- a/dojo/tools/trufflehog3/parser.py
+++ b/dojo/tools/trufflehog3/parser.py
@@ -101,10 +101,7 @@ def get_finding_current(self, json_data, test, dupes):
severity = severity.capitalize()
file = json_data.get("path")
line = json_data.get("line")
- if line:
- line = int(line)
- else:
- line = 0
+ line = int(line) if line else 0
secret = json_data.get("secret")
context = json_data.get("context")
json_data.get("id")
diff --git a/dojo/tools/trustwave/parser.py b/dojo/tools/trustwave/parser.py
index 4e0d1562ccd..71517715f1b 100755
--- a/dojo/tools/trustwave/parser.py
+++ b/dojo/tools/trustwave/parser.py
@@ -41,11 +41,9 @@ def get_findings(self, filename, test):
if host is None or host == "":
host = row.get("IP")
finding.unsaved_endpoints = [Endpoint(host=host)]
- if row.get("Port") is not None and not "" == row.get("Port"):
+ if row.get("Port") is not None and row.get("Port") != "":
finding.unsaved_endpoints[0].port = int(row["Port"])
- if row.get("Protocol") is not None and not "" == row.get(
- "Protocol",
- ):
+ if row.get("Protocol") is not None and row.get("Protocol") != "":
finding.unsaved_endpoints[0].protocol = row["Protocol"]
finding.title = row["Vulnerability Name"]
finding.description = row["Description"]
@@ -53,10 +51,7 @@ def get_findings(self, filename, test):
finding.mitigation = row.get("Remediation")
# manage severity
- if row["Severity"] in severity_mapping:
- finding.severity = severity_mapping[row["Severity"]]
- else:
- finding.severity = "Low"
+ finding.severity = severity_mapping.get(row["Severity"], "Low")
finding.unsaved_vulnerability_ids = [row.get("CVE")]
dupes_key = hashlib.sha256(
diff --git a/dojo/tools/twistlock/parser.py b/dojo/tools/twistlock/parser.py
index 3e2cdeeeb25..bc021964e10 100755
--- a/dojo/tools/twistlock/parser.py
+++ b/dojo/tools/twistlock/parser.py
@@ -230,24 +230,16 @@ def get_item(vulnerability, test):
else "Info"
)
vector = (
- vulnerability["vector"]
- if "vector" in vulnerability
- else "CVSS vector not provided. "
+ vulnerability.get("vector", "CVSS vector not provided. ")
)
status = (
- vulnerability["status"]
- if "status" in vulnerability
- else "There seems to be no fix yet. Please check description field."
+ vulnerability.get("status", "There seems to be no fix yet. Please check description field.")
)
cvss = (
- vulnerability["cvss"]
- if "cvss" in vulnerability
- else "No CVSS score yet."
+ vulnerability.get("cvss", "No CVSS score yet.")
)
riskFactors = (
- vulnerability["riskFactors"]
- if "riskFactors" in vulnerability
- else "No risk factors."
+ vulnerability.get("riskFactors", "No risk factors.")
)
# create the finding object
@@ -291,19 +283,9 @@ def convert_severity(severity):
return "High"
if severity.lower() == "moderate":
return "Medium"
- if severity.lower() == "unimportant":
+ if severity.lower() in ["unimportant", "unassigned", "negligible", "not yet assigned"]:
return "Low"
- if severity.lower() == "unassigned":
- return "Low"
- if severity.lower() == "negligible":
- return "Low"
- if severity.lower() == "not yet assigned":
- return "Low"
- if severity.lower() == "information":
- return "Info"
- if severity.lower() == "informational":
- return "Info"
- if severity == "":
+ if severity.lower() in ["information", "informational", ""]:
return "Info"
return severity.title()
diff --git a/dojo/tools/veracode/json_parser.py b/dojo/tools/veracode/json_parser.py
index 6584d213821..b873ada3531 100644
--- a/dojo/tools/veracode/json_parser.py
+++ b/dojo/tools/veracode/json_parser.py
@@ -130,7 +130,7 @@ def create_finding_from_details(self, finding_details, scan_type, policy_violate
finding.cvssv3 = CVSS3(str(uncleaned_cvss)).clean_vector(output_prefix=True)
elif not uncleaned_cvss.startswith("CVSS"):
finding.cvssv3 = CVSS3(f"CVSS:3.1/{str(uncleaned_cvss)}").clean_vector(output_prefix=True)
- elif isinstance(uncleaned_cvss, (float, int)):
+ elif isinstance(uncleaned_cvss, float | int):
finding.cvssv3_score = float(uncleaned_cvss)
# Fill in extra info based on the scan type
if scan_type == "STATIC":
@@ -146,10 +146,7 @@ def add_static_details(self, finding, finding_details, backup_title=None) -> Fin
finding.dynamic_finding = False
finding.static_finding = True
# Get the finding category to get the high level info about the vuln
- if category := finding_details.get("finding_category"):
- category_title = category.get("name")
- else:
- category_title = None
+ category_title = category.get("name") if (category := finding_details.get("finding_category")) else None
# Set the title of the finding to the name of the finding category.
# If not present, fall back on CWE title. If that is not present, do nothing
if category_title:
@@ -185,10 +182,7 @@ def add_dynamic_details(self, finding, finding_details, backup_title=None) -> Fi
finding.dynamic_finding = True
finding.static_finding = False
# Get the finding category to get the high level info about the vuln
- if category := finding_details.get("finding_category"):
- category_title = category.get("name")
- else:
- category_title = None
+ category_title = category.get("name") if (category := finding_details.get("finding_category")) else None
# Set the title of the finding to the name of the finding category.
# If not present, fall back on CWE title. If that is not present, do nothing
if category_title:
diff --git a/dojo/tools/veracode_sca/parser.py b/dojo/tools/veracode_sca/parser.py
index 66c7e36ca89..81dcb48d589 100755
--- a/dojo/tools/veracode_sca/parser.py
+++ b/dojo/tools/veracode_sca/parser.py
@@ -229,7 +229,7 @@ def fix_severity(self, severity):
severity = severity.capitalize()
if severity is None:
severity = "Medium"
- elif "Unknown" == severity or "None" == severity:
+ elif severity == "Unknown" or severity == "None":
severity = "Info"
return severity
diff --git a/dojo/tools/wapiti/parser.py b/dojo/tools/wapiti/parser.py
index 8a42ad1c64a..335281b9701 100755
--- a/dojo/tools/wapiti/parser.py
+++ b/dojo/tools/wapiti/parser.py
@@ -66,10 +66,7 @@ def get_findings(self, file, test):
title = category + ": " + entry.findtext("info")
# get numerical severity.
num_severity = entry.findtext("level")
- if num_severity in severity_mapping:
- severity = severity_mapping[num_severity]
- else:
- severity = "Info"
+ severity = severity_mapping.get(num_severity, "Info")
finding = Finding(
title=title,
diff --git a/dojo/tools/wazuh/parser.py b/dojo/tools/wazuh/parser.py
index c3bf5460fc5..c7982733e30 100755
--- a/dojo/tools/wazuh/parser.py
+++ b/dojo/tools/wazuh/parser.py
@@ -49,10 +49,7 @@ def get_findings(self, file, test):
agent_ip = item.get("agent_ip")
detection_time = item.get("detection_time").split("T")[0]
- if links:
- references = "\n".join(links)
- else:
- references = None
+ references = "\n".join(links) if links else None
title = (
item.get("title") + " (version: " + package_version + ")"
diff --git a/dojo/tools/wfuzz/parser.py b/dojo/tools/wfuzz/parser.py
index bd718af546a..4e67768bd82 100755
--- a/dojo/tools/wfuzz/parser.py
+++ b/dojo/tools/wfuzz/parser.py
@@ -18,7 +18,7 @@ def severity_mapper(self, input):
return "Low"
if 400 <= int(input) <= 499:
return "Medium"
- if 500 <= int(input):
+ if int(input) >= 500:
return "Low"
return None
@@ -37,10 +37,7 @@ def get_findings(self, filename, test):
for item in data:
url = hyperlink.parse(item["url"])
return_code = item.get("code", None)
- if return_code is None:
- severity = "Low"
- else:
- severity = self.severity_mapper(input=return_code)
+ severity = "Low" if return_code is None else self.severity_mapper(input=return_code)
description = f"The URL {url.to_text()} must not be exposed\n Please review your configuration\n"
dupe_key = hashlib.sha256(
(url.to_text() + str(return_code)).encode("utf-8"),
diff --git a/dojo/tools/whitehat_sentinel/parser.py b/dojo/tools/whitehat_sentinel/parser.py
index 325bd364283..9ed30078243 100755
--- a/dojo/tools/whitehat_sentinel/parser.py
+++ b/dojo/tools/whitehat_sentinel/parser.py
@@ -3,7 +3,6 @@
import logging
import re
from datetime import datetime
-from typing import List, Union
from dojo.models import Endpoint, Finding
@@ -35,7 +34,7 @@ def get_findings(self, file, test):
# Make sure the findings key exists in the dictionary and that it is
# not null or an empty list
if (
- "collection" not in findings_collection.keys()
+ "collection" not in findings_collection
or not findings_collection["collection"]
):
msg = "collection key not present or there were not findings present."
@@ -55,12 +54,14 @@ def get_findings(self, file, test):
def _convert_whitehat_severity_id_to_dojo_severity(
self, whitehat_severity_id: int,
- ) -> Union[str, None]:
+ ) -> str | None:
"""
Converts a WhiteHat Sentinel numerical severity to a DefectDojo severity.
+
Args:
whitehat_severity_id: The WhiteHat Severity ID (called risk_id in the API)
Returns: A DefectDojo severity if a mapping can be found; otherwise a null value is returned
+
"""
severities = [
"Informational",
@@ -80,9 +81,11 @@ def _convert_whitehat_severity_id_to_dojo_severity(
def _parse_cwe_from_tags(self, whitehat_sentinel_tags) -> str:
"""
Some Vulns include the CWE ID as a tag. This is used to pull it out of that list and return only the ID.
+
Args:
whitehat_sentinel_tags: The Tags list from the WhiteHat vuln
Returns: The first CWE ID in the list, if it exists
+
"""
for tag in whitehat_sentinel_tags:
if tag.startswith("CWE-"):
@@ -92,9 +95,11 @@ def _parse_cwe_from_tags(self, whitehat_sentinel_tags) -> str:
def _parse_description(self, whitehat_sentinel_description: dict):
"""
Manually converts the HTML description to a DefectDojo-friendly format.
+
Args:
whitehat_sentinel_description: The description section of the WhiteHat Sentinel vulnerability dict
Returns: A dict with description and reference link
+
"""
description_ref = {"description": "", "reference_link": ""}
@@ -145,9 +150,11 @@ def _parse_solution(self, whitehat_sentinel_vuln_solution):
def __get_href_url(self, text_to_search):
"""
Searches for the anchor targets within a string that includes an anchor tag.
+
Args:
text_to_search: The text string to search for an anchor tag
Returns:
+
"""
links = ""
@@ -158,15 +165,17 @@ def __get_href_url(self, text_to_search):
def __remove_paragraph_tags(self, html_string):
"""
Manually remove tags from HTML strings to avoid importing yet-another-library.
+
Args:
html_string: The HMTL string to remove
tags from
Returns: The original string stipped of paragraph tags
+
"""
return re.sub(r"|
", "", html_string)
def _convert_attack_vectors_to_endpoints(
- self, attack_vectors: List[dict],
- ) -> List["Endpoint"]:
+ self, attack_vectors: list[dict],
+ ) -> list["Endpoint"]:
"""
Takes a list of Attack Vectors dictionaries from the WhiteHat vuln API and converts them to Defect Dojo
Endpoints
@@ -194,12 +203,13 @@ def _convert_whitehat_sentinel_vulns_to_dojo_finding(
whitehat_sentinel_vulns: The vuln dictionary from WhiteHat Sentinel vuln API
test: The test ID that the DefectDojo finding should be associated with
Returns: A DefectDojo Finding object
+
"""
dupes = {}
for whitehat_vuln in whitehat_sentinel_vulns:
date_created = whitehat_vuln["found"].split("T")[0]
- mitigated_ts = whitehat_vuln.get("closed".split("T")[0], None)
+ mitigated_ts = whitehat_vuln.get("closed", None)
if mitigated_ts is not None:
mitigated_ts = datetime.strptime(mitigated_ts, "%Y-%m-%dT%H:%M:%SZ")
cwe = self._parse_cwe_from_tags(
diff --git a/dojo/tools/wpscan/parser.py b/dojo/tools/wpscan/parser.py
index 95c0a8c4c20..2ba6b5016b7 100755
--- a/dojo/tools/wpscan/parser.py
+++ b/dojo/tools/wpscan/parser.py
@@ -1,6 +1,6 @@
+import datetime
import hashlib
import json
-from datetime import datetime
from dojo.models import Endpoint, Finding
@@ -89,7 +89,7 @@ def get_findings(self, file, test):
report_date = None
if "start_time" in tree:
- report_date = datetime.utcfromtimestamp(tree.get("start_time"))
+ report_date = datetime.datetime.fromtimestamp(tree.get("start_time"), datetime.UTC)
dupes = {}
# manage plugin findings
diff --git a/dojo/tools/xanitizer/parser.py b/dojo/tools/xanitizer/parser.py
index b6a7cabdd55..b4eca87b40f 100755
--- a/dojo/tools/xanitizer/parser.py
+++ b/dojo/tools/xanitizer/parser.py
@@ -85,15 +85,9 @@ def generate_title(self, finding, line):
cl = finding.find("class")
file = finding.find("file")
if pckg is not None and cl is not None:
- if line:
- title = f"{title} ({pckg.text}.{cl.text}:{line})"
- else:
- title = f"{title} ({pckg.text}.{cl.text})"
+ title = f"{title} ({pckg.text}.{cl.text}:{line})" if line else f"{title} ({pckg.text}.{cl.text})"
else:
- if line:
- title = f"{title} ({file.text}:{line})"
- else:
- title = f"{title} ({file.text})"
+ title = f"{title} ({file.text}:{line})" if line else f"{title} ({file.text})"
return title
diff --git a/dojo/user/views.py b/dojo/user/views.py
index fb260deeb92..3660f7406bd 100755
--- a/dojo/user/views.py
+++ b/dojo/user/views.py
@@ -231,10 +231,7 @@ def view_profile(request):
group_members = get_authorized_group_members_for_user(user)
user_contact = user.usercontactinfo if hasattr(user, "usercontactinfo") else None
- if user_contact is None:
- contact_form = UserContactInfoForm()
- else:
- contact_form = UserContactInfoForm(instance=user_contact)
+ contact_form = UserContactInfoForm() if user_contact is None else UserContactInfoForm(instance=user_contact)
global_role = user.global_role if hasattr(user, "global_role") else None
if global_role is None:
@@ -397,16 +394,10 @@ def edit_user(request, uid):
form = EditDojoUserForm(instance=user)
user_contact = user.usercontactinfo if hasattr(user, "usercontactinfo") else None
- if user_contact is None:
- contact_form = UserContactInfoForm()
- else:
- contact_form = UserContactInfoForm(instance=user_contact)
+ contact_form = UserContactInfoForm() if user_contact is None else UserContactInfoForm(instance=user_contact)
global_role = user.global_role if hasattr(user, "global_role") else None
- if global_role is None:
- global_role_form = GlobalRoleForm()
- else:
- global_role_form = GlobalRoleForm(instance=global_role)
+ global_role_form = GlobalRoleForm() if global_role is None else GlobalRoleForm(instance=global_role)
if request.method == "POST":
form = EditDojoUserForm(request.POST, instance=user)
diff --git a/dojo/utils.py b/dojo/utils.py
index 7a320538040..bafd180e531 100644
--- a/dojo/utils.py
+++ b/dojo/utils.py
@@ -9,9 +9,10 @@
import re
import json
from calendar import monthrange
+from collections.abc import Callable
from datetime import date, datetime, timedelta
from math import pi, sqrt
-from typing import Callable, Optional
+from pathlib import Path
import bleach
import crum
@@ -91,6 +92,7 @@ def do_false_positive_history(finding, *args, **kwargs):
Args:
finding (:model:`dojo.Finding`): Finding to be replicated
+
"""
to_mark_as_fp = set()
@@ -152,6 +154,7 @@ def match_finding_to_existing_findings(finding, product=None, engagement=None, t
product (:model:`dojo.Product`, optional): Product to filter findings by
engagement (:model:`dojo.Engagement`, optional): Engagement to filter findings by
test (:model:`dojo.Test`, optional): Test to filter findings by
+
"""
if product:
custom_filter_type = "product"
@@ -792,11 +795,7 @@ def is_title_in_breadcrumbs(title):
if breadcrumbs is None:
return False
- for breadcrumb in breadcrumbs:
- if breadcrumb.get("title") == title:
- return True
-
- return False
+ return any(breadcrumb.get("title") == title for breadcrumb in breadcrumbs)
def get_punchcard_data(objs, start_date, weeks, view="Finding"):
@@ -1169,71 +1168,135 @@ def opened_in_period(start_date, end_date, **kwargs):
end_date.month,
end_date.day,
tzinfo=timezone.get_current_timezone())
- opened_in_period = Finding.objects.filter(
- date__range=[start_date, end_date],
- **kwargs,
- verified=True,
- false_p=False,
- duplicate=False,
- out_of_scope=False,
- mitigated__isnull=True,
- severity__in=(
- "Critical", "High", "Medium",
- "Low")).values("numerical_severity").annotate(
- Count("numerical_severity")).order_by("numerical_severity")
- total_opened_in_period = Finding.objects.filter(
- date__range=[start_date, end_date],
- **kwargs,
- verified=True,
- false_p=False,
- duplicate=False,
- out_of_scope=False,
- mitigated__isnull=True,
- severity__in=("Critical", "High", "Medium", "Low")).aggregate(
- total=Sum(
- Case(
- When(
- severity__in=("Critical", "High", "Medium", "Low"),
- then=Value(1)),
- output_field=IntegerField())))["total"]
-
- oip = {
- "S0":
- 0,
- "S1":
- 0,
- "S2":
- 0,
- "S3":
- 0,
- "Total":
- total_opened_in_period,
- "start_date":
- start_date,
- "end_date":
- end_date,
- "closed":
- Finding.objects.filter(
- mitigated__date__range=[start_date, end_date],
+ if get_system_setting("enforce_verified_status", True):
+ opened_in_period = Finding.objects.filter(
+ date__range=[start_date, end_date],
**kwargs,
+ verified=True,
+ false_p=False,
+ duplicate=False,
+ out_of_scope=False,
+ mitigated__isnull=True,
+ severity__in=(
+ "Critical", "High", "Medium",
+ "Low")).values("numerical_severity").annotate(
+ Count("numerical_severity")).order_by("numerical_severity")
+ total_opened_in_period = Finding.objects.filter(
+ date__range=[start_date, end_date],
+ **kwargs,
+ verified=True,
+ false_p=False,
+ duplicate=False,
+ out_of_scope=False,
+ mitigated__isnull=True,
severity__in=("Critical", "High", "Medium", "Low")).aggregate(
total=Sum(
Case(
When(
severity__in=("Critical", "High", "Medium", "Low"),
then=Value(1)),
- output_field=IntegerField())))["total"],
- "to_date_total":
- Finding.objects.filter(
- date__lte=end_date.date(),
- verified=True,
+ output_field=IntegerField())))["total"]
+
+ oip = {
+ "S0":
+ 0,
+ "S1":
+ 0,
+ "S2":
+ 0,
+ "S3":
+ 0,
+ "Total":
+ total_opened_in_period,
+ "start_date":
+ start_date,
+ "end_date":
+ end_date,
+ "closed":
+ Finding.objects.filter(
+ mitigated__date__range=[start_date, end_date],
+ **kwargs,
+ severity__in=("Critical", "High", "Medium", "Low")).aggregate(
+ total=Sum(
+ Case(
+ When(
+ severity__in=("Critical", "High", "Medium", "Low"),
+ then=Value(1)),
+ output_field=IntegerField())))["total"],
+ "to_date_total":
+ Finding.objects.filter(
+ date__lte=end_date.date(),
+ verified=True,
+ false_p=False,
+ duplicate=False,
+ out_of_scope=False,
+ mitigated__isnull=True,
+ **kwargs,
+ severity__in=("Critical", "High", "Medium", "Low")).count(),
+ }
+ else:
+ opened_in_period = Finding.objects.filter(
+ date__range=[start_date, end_date],
+ **kwargs,
false_p=False,
duplicate=False,
out_of_scope=False,
mitigated__isnull=True,
+ severity__in=(
+ "Critical", "High", "Medium",
+ "Low")).values("numerical_severity").annotate(
+ Count("numerical_severity")).order_by("numerical_severity")
+ total_opened_in_period = Finding.objects.filter(
+ date__range=[start_date, end_date],
**kwargs,
- severity__in=("Critical", "High", "Medium", "Low")).count(),
- }
+ false_p=False,
+ duplicate=False,
+ out_of_scope=False,
+ mitigated__isnull=True,
+ severity__in=("Critical", "High", "Medium", "Low")).aggregate(
+ total=Sum(
+ Case(
+ When(
+ severity__in=("Critical", "High", "Medium", "Low"),
+ then=Value(1)),
+ output_field=IntegerField())))["total"]
+
+ oip = {
+ "S0":
+ 0,
+ "S1":
+ 0,
+ "S2":
+ 0,
+ "S3":
+ 0,
+ "Total":
+ total_opened_in_period,
+ "start_date":
+ start_date,
+ "end_date":
+ end_date,
+ "closed":
+ Finding.objects.filter(
+ mitigated__date__range=[start_date, end_date],
+ **kwargs,
+ severity__in=("Critical", "High", "Medium", "Low")).aggregate(
+ total=Sum(
+ Case(
+ When(
+ severity__in=("Critical", "High", "Medium", "Low"),
+ then=Value(1)),
+ output_field=IntegerField())))["total"],
+ "to_date_total":
+ Finding.objects.filter(
+ date__lte=end_date.date(),
+ false_p=False,
+ duplicate=False,
+ out_of_scope=False,
+ mitigated__isnull=True,
+ **kwargs,
+ severity__in=("Critical", "High", "Medium", "Low")).count(),
+ }
for o in opened_in_period:
oip[o["numerical_severity"]] = o["numerical_severity__count"]
@@ -1295,15 +1358,9 @@ def build_query(query_string, search_fields):
for field_name in search_fields:
q = Q(**{f"{field_name}__icontains": term})
- if or_query:
- or_query = or_query | q
- else:
- or_query = q
+ or_query = or_query | q if or_query else q
- if query:
- query = query & or_query
- else:
- query = or_query
+ query = query & or_query if query else or_query
return query
@@ -1346,11 +1403,12 @@ def get_page_items_and_count(request, items, page_size, prefix="", do_count=True
def handle_uploaded_threat(f, eng):
- _name, extension = os.path.splitext(f.name)
+ path = Path(f.name)
+ extension = path.suffix
# Check if threat folder exist.
- if not os.path.isdir(settings.MEDIA_ROOT + "/threat/"):
+ if not Path(settings.MEDIA_ROOT + "/threat/").is_dir():
# Create the folder
- os.mkdir(settings.MEDIA_ROOT + "/threat/")
+ Path(settings.MEDIA_ROOT + "/threat/").mkdir()
with open(settings.MEDIA_ROOT + f"/threat/{eng.id}{extension}",
"wb+") as destination:
for chunk in f.chunks():
@@ -1360,7 +1418,8 @@ def handle_uploaded_threat(f, eng):
def handle_uploaded_selenium(f, cred):
- _name, extension = os.path.splitext(f.name)
+ path = Path(f.name)
+ extension = path.suffix
with open(settings.MEDIA_ROOT + f"/selenium/{cred.id}{extension}",
"wb+") as destination:
for chunk in f.chunks():
@@ -1556,14 +1615,18 @@ def calculate_grade(product, *args, **kwargs):
if system_settings.enable_product_grade:
logger.debug("calculating product grade for %s:%s", product.id, product.name)
- severity_values = Finding.objects.filter(
- ~Q(severity="Info"),
- active=True,
- duplicate=False,
- verified=True,
- false_p=False,
- test__engagement__product=product).values("severity").annotate(
- Count("numerical_severity")).order_by()
+ findings = Finding.objects.filter(
+ ~Q(severity="Info"),
+ active=True,
+ duplicate=False,
+ false_p=False,
+ test__engagement__product=product)
+
+ if get_system_setting("enforce_verified_status", True):
+ findings = findings.filter(verified=True)
+
+ severity_values = findings.values("severity").annotate(
+ Count("numerical_severity")).order_by()
low = 0
medium = 0
@@ -1818,7 +1881,7 @@ def get_return_url(request):
return_url = request.POST.get("return_url", None)
if return_url is None or not return_url.strip():
# for some reason using request.GET.get('return_url') never works
- return_url = request.GET["return_url"] if "return_url" in request.GET else None
+ return_url = request.GET["return_url"] if "return_url" in request.GET else None # noqa: SIM401
return return_url or None
@@ -2024,7 +2087,7 @@ def _create_notifications():
if sla_age is None:
sla_age = 0
- if (sla_age < 0) and (settings.SLA_NOTIFY_POST_BREACH < abs(sla_age)):
+ if (sla_age < 0) and (abs(sla_age) > settings.SLA_NOTIFY_POST_BREACH):
post_breach_no_notify_count += 1
# Skip finding notification if breached for too long
logger.debug(f"Finding {finding.id} breached the SLA {abs(sla_age)} days ago. Skipping notifications.")
@@ -2271,7 +2334,7 @@ def mass_model_updater(model_type, models, function, fields, page_size=1000, ord
def to_str_typed(obj):
- """for code that handles multiple types of objects, print not only __str__ but prefix the type of the object"""
+ """For code that handles multiple types of objects, print not only __str__ but prefix the type of the object"""
return f"{type(obj)}: {obj}"
@@ -2280,7 +2343,7 @@ def get_product(obj):
if not obj:
return None
- if isinstance(obj, Finding) or isinstance(obj, Finding_Group):
+ if isinstance(obj, Finding | Finding_Group):
return obj.test.engagement.product
if isinstance(obj, Test):
@@ -2636,7 +2699,7 @@ def get_open_findings_burndown(product):
return past_90_days
-def get_custom_method(setting_name: str) -> Optional[Callable]:
+def get_custom_method(setting_name: str) -> Callable | None:
"""
Attempts to load and return the method specified by fully-qualified name at the given setting.
@@ -2677,7 +2740,9 @@ def generate_file_response_from_file_path(
) -> FileResponse:
"""Serve an local file in a uniformed way."""
# Determine the file path
- file_path_without_extension, file_extension = os.path.splitext(file_path)
+ path = Path(file_path)
+ file_path_without_extension = path.parent / path.stem
+ file_extension = path.suffix
# Determine the file name if not supplied
if file_name is None:
file_name = file_path_without_extension.rsplit("/")[-1]
diff --git a/dojo/views.py b/dojo/views.py
index ff0faed8c26..df65be4d6bd 100644
--- a/dojo/views.py
+++ b/dojo/views.py
@@ -1,5 +1,6 @@
import logging
import os
+from pathlib import Path
from auditlog.models import LogEntry
from django.conf import settings
@@ -150,7 +151,7 @@ def manage_files(request, oid, obj_type):
for o in files_formset.deleted_objects:
logger.debug("removing file: %s", o.file.name)
- os.remove(os.path.join(settings.MEDIA_ROOT, o.file.name))
+ Path(os.path.join(settings.MEDIA_ROOT, o.file.name)).unlink()
for o in files_formset.new_objects:
logger.debug("adding file: %s", o.file.name)
@@ -161,7 +162,7 @@ def manage_files(request, oid, obj_type):
finding__isnull=True)
for o in orphan_files:
logger.debug("purging orphan file: %s", o.file.name)
- os.remove(os.path.join(settings.MEDIA_ROOT, o.file.name))
+ Path(os.path.join(settings.MEDIA_ROOT, o.file.name)).unlink()
o.delete()
messages.add_message(
diff --git a/helm/defectdojo/.helmignore b/helm/defectdojo/.helmignore
index 50af0317254..70909a86d60 100755
--- a/helm/defectdojo/.helmignore
+++ b/helm/defectdojo/.helmignore
@@ -20,3 +20,4 @@
.idea/
*.tmproj
.vscode/
+README.md
diff --git a/helm/defectdojo/Chart.lock b/helm/defectdojo/Chart.lock
index 49d15928ea4..7a0e49b95de 100755
--- a/helm/defectdojo/Chart.lock
+++ b/helm/defectdojo/Chart.lock
@@ -1,12 +1,12 @@
dependencies:
- name: postgresql
repository: https://charts.bitnami.com/bitnami
- version: 16.0.0
+ version: 16.2.0
- name: postgresql-ha
repository: https://charts.bitnami.com/bitnami
version: 9.4.11
- name: redis
repository: https://charts.bitnami.com/bitnami
version: 19.6.4
-digest: sha256:43166002555f6bdaac719d3d54e56a3e069b17ed29acd1c70951b7b99b102ae7
-generated: "2024-10-02T16:37:38.736091938Z"
+digest: sha256:0d2e729a1b07543cb813f80f5d05c67ad56817f1b44911e08245e43868f49301
+generated: "2024-11-14T10:51:48.400717864Z"
diff --git a/helm/defectdojo/Chart.yaml b/helm/defectdojo/Chart.yaml
index 5337b2b7059..4d63b24192b 100755
--- a/helm/defectdojo/Chart.yaml
+++ b/helm/defectdojo/Chart.yaml
@@ -1,8 +1,8 @@
apiVersion: v2
-appVersion: "2.39.4"
+appVersion: "2.41.3"
description: A Helm chart for Kubernetes to install DefectDojo
name: defectdojo
-version: 1.6.157
+version: 1.6.165
icon: https://www.defectdojo.org/img/favicon.ico
maintainers:
- name: madchap
@@ -10,7 +10,7 @@ maintainers:
url: https://github.com/DefectDojo/django-DefectDojo
dependencies:
- name: postgresql
- version: ~16.0.0
+ version: ~16.2.0
repository: "https://charts.bitnami.com/bitnami"
condition: postgresql.enabled
- name: postgresql-ha
diff --git a/helm/defectdojo/README.md b/helm/defectdojo/README.md
new file mode 120000
index 00000000000..5c0dd98ed0f
--- /dev/null
+++ b/helm/defectdojo/README.md
@@ -0,0 +1 @@
+../../readme-docs/KUBERNETES.md
\ No newline at end of file
diff --git a/helm/defectdojo/templates/_helpers.tpl b/helm/defectdojo/templates/_helpers.tpl
index 14256e88190..c3e0026c2ef 100755
--- a/helm/defectdojo/templates/_helpers.tpl
+++ b/helm/defectdojo/templates/_helpers.tpl
@@ -102,8 +102,12 @@ Create chart name and version as used by the chart label.
{{- end -}}
{{- define "initializer.jobname" -}}
+{{- if .Values.initializer.staticName -}}
+{{ .Release.Name }}-initializer
+{{- else -}}
{{ .Release.Name }}-initializer-{{- printf "%s" now | date "2006-01-02-15-04" -}}
{{- end -}}
+{{- end -}}
{{/*
Creates the array for DD_ALLOWED_HOSTS in configmap
diff --git a/helm/defectdojo/templates/celery-beat-deployment.yaml b/helm/defectdojo/templates/celery-beat-deployment.yaml
index 7eda46b8680..aedbb117275 100755
--- a/helm/defectdojo/templates/celery-beat-deployment.yaml
+++ b/helm/defectdojo/templates/celery-beat-deployment.yaml
@@ -10,6 +10,9 @@ metadata:
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
helm.sh/chart: {{ include "defectdojo.chart" . }}
+ {{- with .Values.extraLabels }}
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
spec:
replicas: {{ .Values.celery.beat.replicas }}
{{- if .Values.revisionHistoryLimit }}
@@ -28,8 +31,11 @@ spec:
defectdojo.org/subcomponent: beat
app.kubernetes.io/name: {{ include "defectdojo.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
- {{- if .Values.podLabels }}
- {{- toYaml .Values.podLabels | nindent 8 }}
+ {{- with .Values.extraLabels }}
+ {{- toYaml . | nindent 8 }}
+ {{- end }}
+ {{- with .Values.podLabels }}
+ {{- toYaml . | nindent 8 }}
{{- end }}
annotations:
{{- with .Values.celery.beat.annotations }}
@@ -66,17 +72,14 @@ spec:
path: {{ .hostPath }}
{{- end }}
{{- end }}
- {{- if .Values.dbMigrationChecker.enabled }}
+ {{- if or .Values.dbMigrationChecker.enabled .Values.cloudsql.enabled }}
initContainers:
- {{$data := dict "fullName" $fullName }}
- {{- $newContext := merge . (dict "fullName" $fullName) }}
- {{- include "dbMigrationChecker" $newContext | nindent 6 }}
{{- end }}
- containers:
{{- if .Values.cloudsql.enabled }}
- name: cloudsql-proxy
image: {{ .Values.cloudsql.image.repository }}:{{ .Values.cloudsql.image.tag }}
imagePullPolicy: {{ .Values.cloudsql.image.pullPolicy }}
+ restartPolicy: Always
securityContext:
runAsNonRoot: true
command: ["/cloud_sql_proxy"]
@@ -92,6 +95,12 @@ spec:
- "-ip_address_types=PRIVATE"
{{- end }}
{{- end }}
+ {{- if .Values.dbMigrationChecker.enabled }}
+ {{$data := dict "fullName" $fullName }}
+ {{- $newContext := merge . (dict "fullName" $fullName) }}
+ {{- include "dbMigrationChecker" $newContext | nindent 6 }}
+ {{- end }}
+ containers:
- command:
- /entrypoint-celery-beat.sh
name: celery
@@ -143,8 +152,8 @@ spec:
secretKeyRef:
name: {{ $fullName }}
key: DD_SECRET_KEY
- {{- if .Values.extraEnv }}
- {{- toYaml .Values.extraEnv | nindent 8 }}
+ {{- with .Values.extraEnv }}
+ {{- toYaml . | nindent 8 }}
{{- end }}
resources:
{{- toYaml .Values.celery.beat.resources | nindent 10 }}
diff --git a/helm/defectdojo/templates/celery-worker-deployment.yaml b/helm/defectdojo/templates/celery-worker-deployment.yaml
index f21be7a13be..c9505959bda 100755
--- a/helm/defectdojo/templates/celery-worker-deployment.yaml
+++ b/helm/defectdojo/templates/celery-worker-deployment.yaml
@@ -10,6 +10,9 @@ metadata:
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
helm.sh/chart: {{ include "defectdojo.chart" . }}
+ {{- with .Values.extraLabels }}
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
spec:
replicas: {{ .Values.celery.worker.replicas }}
{{- if .Values.revisionHistoryLimit }}
@@ -28,8 +31,11 @@ spec:
defectdojo.org/subcomponent: worker
app.kubernetes.io/name: {{ include "defectdojo.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
- {{- if .Values.podLabels }}
- {{- toYaml .Values.podLabels | nindent 8 }}
+ {{- with .Values.extraLabels }}
+ {{- toYaml . | nindent 8 }}
+ {{- end }}
+ {{- with .Values.podLabels }}
+ {{- toYaml . | nindent 8 }}
{{- end }}
annotations:
{{- with .Values.celery.worker.annotations }}
@@ -64,17 +70,14 @@ spec:
path: {{ .hostPath }}
{{- end }}
{{- end }}
- {{- if .Values.dbMigrationChecker.enabled }}
+ {{- if or .Values.dbMigrationChecker.enabled .Values.cloudsql.enabled }}
initContainers:
- {{$data := dict "fullName" $fullName }}
- {{- $newContext := merge . (dict "fullName" $fullName) }}
- {{- include "dbMigrationChecker" $newContext | nindent 6 }}
{{- end }}
- containers:
{{- if .Values.cloudsql.enabled }}
- name: cloudsql-proxy
image: {{ .Values.cloudsql.image.repository }}:{{ .Values.cloudsql.image.tag }}
imagePullPolicy: {{ .Values.cloudsql.image.pullPolicy }}
+ restartPolicy: Always
securityContext:
runAsNonRoot: true
command: ["/cloud_sql_proxy"]
@@ -90,6 +93,12 @@ spec:
- "-ip_address_types=PRIVATE"
{{- end }}
{{- end }}
+ {{- if .Values.dbMigrationChecker.enabled }}
+ {{$data := dict "fullName" $fullName }}
+ {{- $newContext := merge . (dict "fullName" $fullName) }}
+ {{- include "dbMigrationChecker" $newContext | nindent 6 }}
+ {{- end }}
+ containers:
- name: celery
image: "{{ template "celery.repository" . }}:{{ .Values.tag }}"
imagePullPolicy: {{ .Values.imagePullPolicy }}
@@ -138,8 +147,8 @@ spec:
secretKeyRef:
name: {{ $fullName }}
key: DD_SECRET_KEY
- {{- if .Values.extraEnv }}
- {{- toYaml .Values.extraEnv | nindent 8 }}
+ {{- with .Values.extraEnv }}
+ {{- toYaml . | nindent 8 }}
{{- end }}
resources:
{{- toYaml .Values.celery.worker.resources | nindent 10 }}
diff --git a/helm/defectdojo/templates/configmap.yaml b/helm/defectdojo/templates/configmap.yaml
index b5248a0a9ba..0d8c4a238e1 100755
--- a/helm/defectdojo/templates/configmap.yaml
+++ b/helm/defectdojo/templates/configmap.yaml
@@ -8,6 +8,9 @@ metadata:
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
helm.sh/chart: {{ include "defectdojo.chart" . }}
+ {{- with .Values.extraLabels }}
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
data:
DD_ADMIN_USER: {{ .Values.admin.user | default "admin" }}
DD_ADMIN_MAIL: {{ .Values.admin.Mail | default "admin@defectdojo.local" }}
@@ -18,7 +21,7 @@ data:
DD_CELERY_BROKER_SCHEME: {{ if eq .Values.celery.broker "redis" }}{{ template "redis.scheme" . }}{{ end }}
DD_CELERY_BROKER_USER: ''
DD_CELERY_BROKER_HOST: {{ if eq .Values.celery.broker "redis" }}{{ template "redis.hostname" . }}{{ end }}
- DD_CELERY_BROKER_PORT: '{{ if eq .Values.celery.broker "redis" }}{{ .Values.redis.master.service.ports.redis | default "6379" }}{{ end }}'
+ DD_CELERY_BROKER_PORT: '{{ if eq .Values.celery.broker "redis" }}{{- if ( hasKey .Values.redis "master" ) -}}{{ .Values.redis.master.service.ports.redis }}{{ else }}6379{{ end }}{{- end -}}'
DD_CELERY_BROKER_PARAMS: '{{ if eq .Values.celery.broker "redis" }}{{- if .Values.redis.transportEncryption.enabled -}}{{ .Values.redis.transportEncryption.params | default "ssl_cert_reqs=optional" }}{{ end }}{{ end }}'
DD_CELERY_BROKER_PATH: '{{ .Values.celery.path | default "//" }}'
DD_CELERY_LOG_LEVEL: {{ .Values.celery.logLevel }}
@@ -45,5 +48,5 @@ data:
{{- if .Values.django.uwsgi.certificates.enabled }}
REQUESTS_CA_BUNDLE: {{ .Values.django.uwsgi.certificates.certMountPath }}{{ .Values.django.uwsgi.certificates.certFileName }}
{{- end }}
-{{- if .Values.extraConfigs }}
-{{ toYaml .Values.extraConfigs | indent 2 }}{{- end }}
+{{- with .Values.extraConfigs }}
+ {{- toYaml . | nindent 2 }}{{- end }}
diff --git a/helm/defectdojo/templates/django-deployment.yaml b/helm/defectdojo/templates/django-deployment.yaml
index ce126f1cc28..5ef3dec50cc 100755
--- a/helm/defectdojo/templates/django-deployment.yaml
+++ b/helm/defectdojo/templates/django-deployment.yaml
@@ -9,6 +9,9 @@ metadata:
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
helm.sh/chart: {{ include "defectdojo.chart" . }}
+ {{- with .Values.extraLabels }}
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
spec:
replicas: {{ .Values.django.replicas }}
{{- if .Values.revisionHistoryLimit }}
@@ -25,9 +28,12 @@ spec:
defectdojo.org/component: django
app.kubernetes.io/name: {{ include "defectdojo.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
- {{- if .Values.podLabels }}
- {{- toYaml .Values.podLabels | nindent 8 }}
- {{- end }}
+ {{- with .Values.extraLabels }}
+ {{- toYaml . | nindent 8 }}
+ {{- end }}
+ {{- with .Values.podLabels }}
+ {{- toYaml . | nindent 8 }}
+ {{- end }}
annotations:
{{- with .Values.django.annotations }}
{{- toYaml . | nindent 8 }}
@@ -82,17 +88,14 @@ spec:
emptyDir: {}
{{- end }}
{{- end }}
- {{- if .Values.dbMigrationChecker.enabled }}
+ {{- if or .Values.dbMigrationChecker.enabled .Values.cloudsql.enabled }}
initContainers:
- {{$data := dict "fullName" $fullName }}
- {{- $newContext := merge . (dict "fullName" $fullName) }}
- {{- include "dbMigrationChecker" $newContext | nindent 6 }}
{{- end }}
- containers:
{{- if .Values.cloudsql.enabled }}
- name: cloudsql-proxy
image: {{ .Values.cloudsql.image.repository }}:{{ .Values.cloudsql.image.tag }}
imagePullPolicy: {{ .Values.cloudsql.image.pullPolicy }}
+ restartPolicy: Always
securityContext:
runAsNonRoot: true
command: ["/cloud_sql_proxy"]
@@ -108,6 +111,12 @@ spec:
- "-ip_address_types=PRIVATE"
{{- end }}
{{- end }}
+ {{- if .Values.dbMigrationChecker.enabled }}
+ {{$data := dict "fullName" $fullName }}
+ {{- $newContext := merge . (dict "fullName" $fullName) }}
+ {{- include "dbMigrationChecker" $newContext | nindent 6 }}
+ {{- end }}
+ containers:
{{- if and .Values.monitoring.enabled .Values.monitoring.prometheus.enabled }}
- name: metrics
image: {{ .Values.monitoring.prometheus.image }}
@@ -155,11 +164,6 @@ spec:
- name: http-uwsgi
protocol: TCP
containerPort: 8081
- {{- if .Values.django.uwsgi.enableDebug }}
- - name: debug
- protocol: TCP
- containerPort: 3000
- {{- end }}
envFrom:
- configMapRef:
name: {{ $fullName }}
@@ -202,8 +206,8 @@ spec:
value: {{- if or .Values.django.ingress.activateTLS .Values.django.nginx.tls.enabled }} "True" {{- else }} "False" {{- end }}
- name: DD_CSRF_COOKIE_SECURE
value: {{- if or .Values.django.ingress.activateTLS .Values.django.nginx.tls.enabled }} "True" {{- else }} "False" {{- end }}
- {{- if .Values.extraEnv }}
- {{- toYaml .Values.extraEnv | nindent 8 }}
+ {{- with .Values.extraEnv }}
+ {{- toYaml . | nindent 8 }}
{{- end }}
{{- if .Values.django.uwsgi.livenessProbe.enabled }}
livenessProbe:
@@ -260,6 +264,7 @@ spec:
value: '{{ .Values.django.nginx.tls.enabled }}'
- name: GENERATE_TLS_CERTIFICATE
value: '{{ .Values.django.nginx.tls.generateCertificate }}'
+ {{- if .Values.django.uwsgi.livenessProbe.enabled }}
livenessProbe:
httpGet:
path: /nginx_health
@@ -270,10 +275,13 @@ spec:
httpHeaders:
- name: Host
value: {{ .Values.host }}
- initialDelaySeconds: 10
- periodSeconds: 10
- failureThreshold: 6
- {{- if .Values.django.uwsgi.livenessProbe.enabled }}
+ failureThreshold: {{ .Values.django.uwsgi.livenessProbe.failureThreshold }}
+ initialDelaySeconds: {{ .Values.django.uwsgi.livenessProbe.initialDelaySeconds }}
+ periodSeconds: {{ .Values.django.uwsgi.livenessProbe.periodSeconds }}
+ successThreshold: {{ .Values.django.uwsgi.livenessProbe.successThreshold }}
+ timeoutSeconds: {{ .Values.django.uwsgi.livenessProbe.timeoutSeconds }}
+ {{- end }}
+ {{- if .Values.django.uwsgi.readinessProbe.enabled }}
readinessProbe:
httpGet:
path: /uwsgi_health
@@ -284,11 +292,28 @@ spec:
httpHeaders:
- name: Host
value: {{ .Values.host }}
- failureThreshold: {{ .Values.django.uwsgi.livenessProbe.failureThreshold }}
- initialDelaySeconds: {{ .Values.django.uwsgi.livenessProbe.initialDelaySeconds }}
- periodSeconds: {{ .Values.django.uwsgi.livenessProbe.periodSeconds }}
- successThreshold: {{ .Values.django.uwsgi.livenessProbe.successThreshold }}
- timeoutSeconds: {{ .Values.django.uwsgi.livenessProbe.timeoutSeconds }}
+ failureThreshold: {{ .Values.django.uwsgi.readinessProbe.failureThreshold }}
+ initialDelaySeconds: {{ .Values.django.uwsgi.readinessProbe.initialDelaySeconds }}
+ periodSeconds: {{ .Values.django.uwsgi.readinessProbe.periodSeconds }}
+ successThreshold: {{ .Values.django.uwsgi.readinessProbe.successThreshold }}
+ timeoutSeconds: {{ .Values.django.uwsgi.readinessProbe.timeoutSeconds }}
+ {{- end }}
+ {{- if .Values.django.uwsgi.startupProbe.enabled }}
+ startupProbe:
+ httpGet:
+ path: /uwsgi_health
+ port: http
+ {{- if .Values.django.nginx.tls.enabled }}
+ scheme: HTTPS
+ {{- end }}
+ httpHeaders:
+ - name: Host
+ value: {{ .Values.host }}
+ failureThreshold: {{ .Values.django.uwsgi.startupProbe.failureThreshold }}
+ initialDelaySeconds: {{ .Values.django.uwsgi.startupProbe.initialDelaySeconds }}
+ periodSeconds: {{ .Values.django.uwsgi.startupProbe.periodSeconds }}
+ successThreshold: {{ .Values.django.uwsgi.startupProbe.successThreshold }}
+ timeoutSeconds: {{ .Values.django.uwsgi.startupProbe.timeoutSeconds }}
{{- end }}
resources:
{{- toYaml .Values.django.nginx.resources | nindent 10 }}
diff --git a/helm/defectdojo/templates/django-ingress.yaml b/helm/defectdojo/templates/django-ingress.yaml
index 73ea41404b9..9beecdda923 100755
--- a/helm/defectdojo/templates/django-ingress.yaml
+++ b/helm/defectdojo/templates/django-ingress.yaml
@@ -14,10 +14,13 @@ metadata:
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
helm.sh/chart: {{ include "defectdojo.chart" . }}
+ {{- with .Values.extraLabels }}
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
{{- if or .Values.django.ingress.annotations .Values.gke.useGKEIngress }}
annotations:
{{- with .Values.django.ingress.annotations }}
-{{ toYaml . | indent 4 }}
+ {{- toYaml . | nindent 4 }}
{{- end }}
{{- if .Values.gke.useGKEIngress }}
kubernetes.io/ingress.class: gce
diff --git a/helm/defectdojo/templates/django-service.yaml b/helm/defectdojo/templates/django-service.yaml
index b64f3a05570..3823886bbd2 100755
--- a/helm/defectdojo/templates/django-service.yaml
+++ b/helm/defectdojo/templates/django-service.yaml
@@ -9,6 +9,9 @@ metadata:
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
helm.sh/chart: {{ include "defectdojo.chart" . }}
+ {{- with .Values.extraLabels }}
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
{{- if .Values.django.service.annotations }}
annotations:
{{- range $key, $value := .Values.django.service.annotations }}
diff --git a/helm/defectdojo/templates/extra-secret.yaml b/helm/defectdojo/templates/extra-secret.yaml
index a21e8e27ba6..21f9a9507ee 100755
--- a/helm/defectdojo/templates/extra-secret.yaml
+++ b/helm/defectdojo/templates/extra-secret.yaml
@@ -9,6 +9,9 @@ metadata:
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
helm.sh/chart: {{ include "defectdojo.chart" . }}
+ {{- with .Values.extraLabels }}
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
type: Opaque
data:
{{- range $key, $value := .Values.extraSecrets }}
diff --git a/helm/defectdojo/templates/initializer-job.yaml b/helm/defectdojo/templates/initializer-job.yaml
index b078a1fdc64..60d82b9f2d7 100755
--- a/helm/defectdojo/templates/initializer-job.yaml
+++ b/helm/defectdojo/templates/initializer-job.yaml
@@ -10,20 +10,28 @@ metadata:
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
helm.sh/chart: {{ include "defectdojo.chart" . }}
+ {{- with .Values.extraLabels }}
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
annotations:
{{- with .Values.initializer.jobAnnotations }}
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
+ {{- if and (int .Values.initializer.keepSeconds) (gt (int .Values.initializer.keepSeconds) 0) }}
ttlSecondsAfterFinished: {{ .Values.initializer.keepSeconds }}
+ {{- end }}
template:
metadata:
labels:
defectdojo.org/component: initializer
app.kubernetes.io/name: {{ include "defectdojo.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }}
- {{- if .Values.initializer.labels }}
- {{- toYaml .Values.initializer.labels | nindent 8 }}
+ {{- with .Values.extraLabels }}
+ {{- toYaml . | nindent 8 }}
+ {{- end -}}
+ {{- with .Values.initializer.labels }}
+ {{- toYaml . | nindent 8 }}
{{- end }}
annotations:
{{- with .Values.initializer.annotations }}
@@ -49,28 +57,11 @@ spec:
{{- end }}
{{- end }}
initContainers:
- - name: wait-for-db
- command:
- - '/bin/bash'
- - '-c'
- - '/wait-for-it.sh ${DD_DATABASE_HOST:-postgres}:${DD_DATABASE_PORT:-5432} -t 300 -s -- /bin/echo Database is up'
- image: '{{ template "django.uwsgi.repository" . }}:{{ .Values.tag }}'
- imagePullPolicy: {{ .Values.imagePullPolicy }}
- {{- if .Values.securityContext.enabled }}
- securityContext:
- {{- toYaml .Values.securityContext.djangoSecurityContext | nindent 10 }}
- {{- end }}
- envFrom:
- - configMapRef:
- name: {{ $fullName }}
- - secretRef:
- name: {{ $fullName }}
- optional: true
- containers:
{{- if .Values.cloudsql.enabled }}
- name: cloudsql-proxy
image: {{ .Values.cloudsql.image.repository }}:{{ .Values.cloudsql.image.tag }}
imagePullPolicy: {{ .Values.cloudsql.image.pullPolicy }}
+ restartPolicy: Always
securityContext:
runAsNonRoot: true
command: ["/cloud_sql_proxy"]
@@ -86,6 +77,28 @@ spec:
- "-ip_address_types=PRIVATE"
{{- end }}
{{- end }}
+ - name: wait-for-db
+ command:
+ - '/bin/bash'
+ - '-c'
+ - '/wait-for-it.sh ${DD_DATABASE_HOST:-postgres}:${DD_DATABASE_PORT:-5432} -t 300 -s -- /bin/echo Database is up'
+ image: '{{ template "django.uwsgi.repository" . }}:{{ .Values.tag }}'
+ imagePullPolicy: {{ .Values.imagePullPolicy }}
+ {{- if .Values.securityContext.enabled }}
+ securityContext:
+ {{- toYaml .Values.securityContext.djangoSecurityContext | nindent 10 }}
+ {{- end }}
+ envFrom:
+ - configMapRef:
+ name: {{ $fullName }}
+ - secretRef:
+ name: {{ $fullName }}
+ optional: true
+ env:
+ {{- with .Values.extraEnv }}
+ {{- toYaml . | nindent 8 }}
+ {{- end }}
+ containers:
- name: initializer
image: "{{ template "initializer.repository" . }}:{{ .Values.tag }}"
imagePullPolicy: {{ .Values.imagePullPolicy }}
@@ -118,8 +131,8 @@ spec:
name: {{ .Values.postgresqlha.postgresql.existingSecret }}
key: postgresql-postgres-password
{{- end }}
- {{- if .Values.extraEnv }}
- {{- toYaml .Values.extraEnv | nindent 8 }}
+ {{- with .Values.extraEnv }}
+ {{- toYaml . | nindent 8 }}
{{- end }}
resources:
{{- toYaml .Values.initializer.resources | nindent 10 }}
diff --git a/helm/defectdojo/templates/media-pvc.yaml b/helm/defectdojo/templates/media-pvc.yaml
index 1eba1977e9f..c1ca40050d4 100755
--- a/helm/defectdojo/templates/media-pvc.yaml
+++ b/helm/defectdojo/templates/media-pvc.yaml
@@ -10,6 +10,9 @@ metadata:
app.kubernetes.io/instance: {{ $.Release.Name }}
app.kubernetes.io/managed-by: {{ $.Release.Service }}
helm.sh/chart: {{ include "defectdojo.chart" $ }}
+ {{- with .Values.extraLabels }}
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
name: {{ $fullName }}
spec:
accessModes:
diff --git a/helm/defectdojo/templates/network-policy.yaml b/helm/defectdojo/templates/network-policy.yaml
index 80c55ddcfa3..ea0017fb1e6 100755
--- a/helm/defectdojo/templates/network-policy.yaml
+++ b/helm/defectdojo/templates/network-policy.yaml
@@ -9,26 +9,29 @@ metadata:
app.kubernetes.io/managed-by: {{ .Release.Service }}
helm.sh/chart: {{ include "defectdojo.chart" . }}
app.kubernetes.io/name: {{ include "defectdojo.name" . }}
+ {{- with .Values.extraLabels }}
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
spec:
podSelector:
matchLabels:
app.kubernetes.io/instance: {{ .Release.Name }}
- {{- if .Values.networkPolicy.ingress}}
+ {{- if .Values.networkPolicy.ingress }}
ingress:
- {{- toYaml .Values.networkPolicy.ingress | nindent 4 }}
+ {{- toYaml .Values.networkPolicy.ingress | nindent 4 }}
{{- else }}
ingress:
- from:
- podSelector:
matchLabels:
app.kubernetes.io/instance: {{ .Release.Name }}
- {{- if .Values.networkPolicy.ingressExtend }}
- {{- toYaml .Values.networkPolicy.ingressExtend | nindent 8 }}
+ {{- with .Values.networkPolicy.ingressExtend }}
+ {{- toYaml . | nindent 8 }}
{{ end }}
{{- end }}
- {{- if .Values.networkPolicy.egress }}
+ {{- with .Values.networkPolicy.egress }}
egress:
- {{- toYaml .Values.networkPolicy.egress | nindent 4 }}
+ {{- toYaml . | nindent 4 }}
{{ end }}
---
apiVersion: networking.k8s.io/v1
@@ -40,6 +43,9 @@ metadata:
app.kubernetes.io/managed-by: {{ .Release.Service }}
helm.sh/chart: {{ include "defectdojo.chart" . }}
app.kubernetes.io/name: {{ include "defectdojo.name" . }}
+{{- with .Values.extraLabels }}
+ {{- toYaml . | nindent 4 }}
+{{- end }}
spec:
podSelector:
matchLabels:
diff --git a/helm/defectdojo/templates/sa.yaml b/helm/defectdojo/templates/sa.yaml
index 46f1eaa6d97..23cb70ecd6e 100755
--- a/helm/defectdojo/templates/sa.yaml
+++ b/helm/defectdojo/templates/sa.yaml
@@ -8,6 +8,9 @@ metadata:
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
helm.sh/chart: {{ include "defectdojo.chart" . }}
+ {{- with .Values.extraLabels }}
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
annotations:
helm.sh/resource-policy: keep
helm.sh/hook: "pre-install"
diff --git a/helm/defectdojo/templates/secret-postgresql-ha-pgpool.yaml b/helm/defectdojo/templates/secret-postgresql-ha-pgpool.yaml
index 9a440efffd1..40906c1f180 100755
--- a/helm/defectdojo/templates/secret-postgresql-ha-pgpool.yaml
+++ b/helm/defectdojo/templates/secret-postgresql-ha-pgpool.yaml
@@ -8,6 +8,9 @@ metadata:
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
helm.sh/chart: {{ include "defectdojo.chart" . }}
+ {{- with .Values.extraLabels }}
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
annotations:
helm.sh/resource-policy: keep
helm.sh/hook: "pre-install"
diff --git a/helm/defectdojo/templates/secret-postgresql-ha.yaml b/helm/defectdojo/templates/secret-postgresql-ha.yaml
index 8e884fa0484..e9236a63f00 100755
--- a/helm/defectdojo/templates/secret-postgresql-ha.yaml
+++ b/helm/defectdojo/templates/secret-postgresql-ha.yaml
@@ -8,6 +8,9 @@ metadata:
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
helm.sh/chart: {{ include "defectdojo.chart" . }}
+ {{- with .Values.extraLabels }}
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
annotations:
helm.sh/resource-policy: keep
helm.sh/hook: "pre-install"
diff --git a/helm/defectdojo/templates/secret-postgresql.yaml b/helm/defectdojo/templates/secret-postgresql.yaml
index de6e65420b6..115c244baa5 100755
--- a/helm/defectdojo/templates/secret-postgresql.yaml
+++ b/helm/defectdojo/templates/secret-postgresql.yaml
@@ -8,6 +8,9 @@ metadata:
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
helm.sh/chart: {{ include "defectdojo.chart" . }}
+ {{- with .Values.extraLabels }}
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
annotations:
helm.sh/resource-policy: keep
helm.sh/hook: "pre-install"
diff --git a/helm/defectdojo/templates/secret-redis.yaml b/helm/defectdojo/templates/secret-redis.yaml
index 629e6b4fa93..de4549c1f63 100755
--- a/helm/defectdojo/templates/secret-redis.yaml
+++ b/helm/defectdojo/templates/secret-redis.yaml
@@ -8,6 +8,9 @@ metadata:
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
helm.sh/chart: {{ include "defectdojo.chart" . }}
+ {{- with .Values.extraLabels }}
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
annotations:
helm.sh/resource-policy: keep
helm.sh/hook: "pre-install"
diff --git a/helm/defectdojo/templates/secret.yaml b/helm/defectdojo/templates/secret.yaml
index 94ca3ef268b..500a097dd16 100755
--- a/helm/defectdojo/templates/secret.yaml
+++ b/helm/defectdojo/templates/secret.yaml
@@ -9,6 +9,9 @@ metadata:
app.kubernetes.io/instance: {{ .Release.Name }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
helm.sh/chart: {{ include "defectdojo.chart" . }}
+ {{- with .Values.extraLabels }}
+ {{- toYaml . | nindent 4 }}
+ {{- end }}
annotations:
helm.sh/resource-policy: keep
helm.sh/hook: "pre-install"
diff --git a/helm/defectdojo/values.yaml b/helm/defectdojo/values.yaml
index 67c41eeab3d..8cd5d0aca3b 100755
--- a/helm/defectdojo/values.yaml
+++ b/helm/defectdojo/values.yaml
@@ -16,6 +16,9 @@ createPostgresqlHaPgpoolSecret: false
# - enabled, enables tracking configuration changes based on SHA256
# trackConfig: disabled
+# extraLabels: {}
+# Add extra labels for k8s
+
# Enables application network policy
# For more info follow https://kubernetes.io/docs/concepts/services-networking/network-policies/
networkPolicy:
@@ -234,13 +237,29 @@ django:
tolerations: []
uwsgi:
livenessProbe:
- # Enable liveness checks on uwsgi container. Those values are use on nginx readiness checks as well.
+ # Enable liveness checks on uwsgi container.
enabled: true
failureThreshold: 6
- initialDelaySeconds: 3
+ initialDelaySeconds: 0
periodSeconds: 10
successThreshold: 1
timeoutSeconds: 5
+ readinessProbe:
+ # Enable readiness checks on uwsgi container.
+ enabled: true
+ failureThreshold: 6
+ initialDelaySeconds: 0
+ periodSeconds: 10
+ successThreshold: 1
+ timeoutSeconds: 5
+ startupProbe:
+ # Enable startup checks on uwsgi container.
+ enabled: true
+ failureThreshold: 30
+ initialDelaySeconds: 0
+ periodSeconds: 5
+ successThreshold: 1
+ timeoutSeconds: 1
resources:
requests:
cpu: 100m
@@ -321,7 +340,7 @@ initializer:
jobAnnotations: {}
annotations: {}
labels: {}
- keepSeconds: 60
+ keepSeconds: 60 # A positive integer will keep this Job and Pod deployed for the specified number of seconds, after which they will be removed. For all other values, the Job and Pod will remain deployed.
affinity: {}
nodeSelector: {}
resources:
@@ -365,6 +384,11 @@ initializer:
# @type: array
{% trans "Planned Remediation" %}
+ {% if filter_name != 'Closed' %}
+
+ {% trans "Reviewers" %}
+
+ {% endif %}
{% endblock header %}
@@ -721,6 +726,16 @@
{% if finding.planned_remediation_date %}{{ finding.planned_remediation_date }}{% endif %}
+ {% if filter_name != 'Closed' %}
+
+ {% if finding.reviewers %}
+ {% for reviewer in finding.reviewers.all %}
+ {{reviewer.get_full_name}}
+ {% if not forloop.last %}
{% endif %}
+ {% endfor %}
+ {% endif %}
+
+ {% endif %}
{% endblock body %}
{% endfor %}
@@ -801,6 +816,9 @@
{% endif %}
{ "data": "service" },
{ "data": "planned_remediation_date" },
+ {% if filter_name != 'Closed' %}
+ { "data": "reviewers" },
+ {% endif %}
];
{% endblock datatables_columns %}
diff --git a/dojo/templates/notifications/alert/engagement_closed.tpl b/dojo/templates/notifications/alert/engagement_closed.tpl
new file mode 100644
index 00000000000..2468c566e30
--- /dev/null
+++ b/dojo/templates/notifications/alert/engagement_closed.tpl
@@ -0,0 +1,3 @@
+{% load i18n %}{% blocktranslate trimmed with eng_name=engagement.name eng_product=engagement.product %}
+The engagement "{{ eng_name }}" has been closed in the product "{{ eng_product }}".
+{% endblocktranslate %}
\ No newline at end of file
diff --git a/dojo/templates/notifications/mail/engagement_closed.tpl b/dojo/templates/notifications/mail/engagement_closed.tpl
new file mode 100644
index 00000000000..68eef654865
--- /dev/null
+++ b/dojo/templates/notifications/mail/engagement_closed.tpl
@@ -0,0 +1,41 @@
+{% load i18n %}
+{% load navigation_tags %}
+{% load display_tags %}
+{% url 'view_product' engagement.product.id as product_url %}
+{% url 'view_engagement' engagement.id as engagement_url %}
+
+
+ {% autoescape on %}
+
{% endif %} + {% endfor %} + {% endif %} +
{% endif %} { "data": "service" }, { "data": "planned_remediation_date" }, + {% if filter_name != 'Closed' %} + { "data": "reviewers" }, + {% endif %} ]; {% endblock datatables_columns %} diff --git a/dojo/templates/notifications/alert/engagement_closed.tpl b/dojo/templates/notifications/alert/engagement_closed.tpl new file mode 100644 index 00000000000..2468c566e30 --- /dev/null +++ b/dojo/templates/notifications/alert/engagement_closed.tpl @@ -0,0 +1,3 @@ +{% load i18n %}{% blocktranslate trimmed with eng_name=engagement.name eng_product=engagement.product %} +The engagement "{{ eng_name }}" has been closed in the product "{{ eng_product }}". +{% endblocktranslate %} \ No newline at end of file diff --git a/dojo/templates/notifications/mail/engagement_closed.tpl b/dojo/templates/notifications/mail/engagement_closed.tpl new file mode 100644 index 00000000000..68eef654865 --- /dev/null +++ b/dojo/templates/notifications/mail/engagement_closed.tpl @@ -0,0 +1,41 @@ +{% load i18n %} +{% load navigation_tags %} +{% load display_tags %} +{% url 'view_product' engagement.product.id as product_url %} +{% url 'view_engagement' engagement.id as engagement_url %} + + + {% autoescape on %} +
+ {% trans "Hello" %}, +
++ {% blocktranslate trimmed with engagement_name=engagement.name engagement_product=engagement.product prod_url=product_url|full_url eng_url=engagement_url|full_url%} + The engagement "{{ engagement_name }}" has been closed in the product "{{ engagement_product }}". It can be viewed here: {{product}} / {{ engagement_name }} + {% endblocktranslate %} +
++
+ {% trans "Kind regards" %},
+
+ {% if system_settings.team_name %} + {{ system_settings.team_name }} + {% else %} + Defect Dojo + {% endif %} +
+
+
+ {% url 'notifications' as notification_url %} + {% trans "You can manage your notification settings here" %}: {{ notification_url|full_url }} +
+ {% if system_settings.disclaimer and system_settings.disclaimer.strip %} ++
+ {% trans "Disclaimer" %}
+
+ {% endif %}
+ {% endautoescape %}
+
+
diff --git a/dojo/templates/notifications/msteams/engagement_closed.tpl b/dojo/templates/notifications/msteams/engagement_closed.tpl
new file mode 100644
index 00000000000..3e6bfeed0df
--- /dev/null
+++ b/dojo/templates/notifications/msteams/engagement_closed.tpl
@@ -0,0 +1,44 @@
+{% load i18n %}
+{% load display_tags %}
+{
+ "@context": "https://schema.org/extensions",
+ "@type": "MessageCard",
+ "title": "{% trans "Engagement closed" %}",
+ "summary": "{% trans "Engagement closed" %}",
+ "sections": [
+ {
+ "activityTitle": "DefectDojo",
+ "activityImage": "https://raw.githubusercontent.com/DefectDojo/django-DefectDojo/master/dojo/static/dojo/img/chop.png",
+ "text": "{% trans "An engagement has been closed" %}.",
+ "facts": [
+ {
+ "name": "{% trans "Product" %}:",
+ "value": "{{ engagement.product.name }}"
+ },
+ {
+ "name": "{% trans "Engagement" %}:",
+ "value": "{{ engagement.name }}"
+ }
+ ]
+ }
+ {% if system_settings.disclaimer and system_settings.disclaimer.strip %}
+ ,{
+ "activityTitle": "{% trans "Disclaimer" %}",
+ "text": "{{ system_settings.disclaimer }}"
+ }
+ {% endif %}
+
+ ],
+ "potentialAction": [
+ {
+ "@type": "OpenUri",
+ "name": "{% trans "View Engagement" %}",
+ "targets": [
+ {
+ "os": "default",
+ "uri": "{{ url|full_url }}"
+ }
+ ]
+ }
+ ]
+}
\ No newline at end of file
diff --git a/dojo/templates/notifications/slack/engagement_closed.tpl b/dojo/templates/notifications/slack/engagement_closed.tpl
new file mode 100644
index 00000000000..313c7a1c937
--- /dev/null
+++ b/dojo/templates/notifications/slack/engagement_closed.tpl
@@ -0,0 +1,10 @@
+{% load i18n %}
+{% load display_tags %}
+{% blocktranslate trimmed with name=engagement.name eng_product=engagement.product eng_url=url|full_url %}
+The engagement "{{ name }}" has been closed in the product "{{ eng_product }}". It can be viewed here: {{ eng_url }}
+{% endblocktranslate %}
+{% if system_settings.disclaimer and system_settings.disclaimer.strip %}
+
+ {% trans "Disclaimer" %}:
+ {{ system_settings.disclaimer }}
+{% endif %}
diff --git a/dojo/templates/notifications/webhooks/subtemplates/base.tpl b/dojo/templates/notifications/webhooks/subtemplates/base.tpl
index 44946cd8dd3..3b6e30da989 100644
--- a/dojo/templates/notifications/webhooks/subtemplates/base.tpl
+++ b/dojo/templates/notifications/webhooks/subtemplates/base.tpl
@@ -1,6 +1,7 @@
{% load display_tags %}
---
-description: {{ description | default_if_none:'' }}
+description: "{{ description | default_if_none:'' }}"
+title: "{{ title | default_if_none:'' }}"
user: {{ user | default_if_none:'' }}
{% if url %}
url_ui: {{ url|full_url }}
diff --git a/dojo/templatetags/authorization_tags.py b/dojo/templatetags/authorization_tags.py
index fd40caba7ae..ecf3eb02a60 100755
--- a/dojo/templatetags/authorization_tags.py
+++ b/dojo/templatetags/authorization_tags.py
@@ -43,10 +43,7 @@ def has_global_permission(permission):
@register.filter
def has_configuration_permission(permission, request):
- if request is None:
- user = crum.get_current_user()
- else:
- user = crum.get_current_user() or request.user
+ user = crum.get_current_user() if request is None else crum.get_current_user() or request.user
return configuration_permission(user, permission)
@@ -58,10 +55,7 @@ def get_user_permissions(user):
@register.filter
def user_has_configuration_permission_without_group(user, codename):
permissions = get_user_permissions(user)
- for permission in permissions:
- if permission.codename == codename:
- return True
- return False
+ return any(permission.codename == codename for permission in permissions)
@cache_for_request
@@ -71,10 +65,7 @@ def get_group_permissions(group):
@register.filter
def group_has_configuration_permission(group, codename):
- for permission in get_group_permissions(group):
- if permission.codename == codename:
- return True
- return False
+ return any(permission.codename == codename for permission in get_group_permissions(group))
@register.simple_tag
diff --git a/dojo/templatetags/display_tags.py b/dojo/templatetags/display_tags.py
index 1bd209792cd..abb3133733f 100755
--- a/dojo/templatetags/display_tags.py
+++ b/dojo/templatetags/display_tags.py
@@ -1,4 +1,5 @@
import base64
+import contextlib
import datetime
import logging
import mimetypes
@@ -176,10 +177,8 @@ def remove_string(string, value):
def percentage(fraction, value):
return_value = ""
if int(value) > 0:
- try:
+ with contextlib.suppress(ValueError):
return_value = "%.1f%%" % ((float(fraction) / float(value)) * 100)
- except ValueError:
- pass
return return_value
@@ -328,8 +327,11 @@ def action_log_entry(value, autoescape=None):
import json
history = json.loads(value)
text = ""
- for k in history.keys():
- text += k.capitalize() + ' changed from "' + \
+ for k in history:
+ if isinstance(history[k], dict):
+ text += k.capitalize() + " operation: " + history[k].get("operation", "unknown") + ": " + str(history[k].get("objects", "unknown"))
+ else:
+ text += k.capitalize() + ' changed from "' + \
history[k][0] + '" to "' + history[k][1] + '"\n'
return text
@@ -709,9 +711,7 @@ def get_severity_count(id, table):
if table == "test":
display_counts.append("Total: " + str(total) + " Findings")
- elif table == "engagement":
- display_counts.append("Total: " + str(total) + " Active Findings")
- elif table == "product":
+ elif table == "engagement" or table == "product":
display_counts.append("Total: " + str(total) + " Active Findings")
return ", ".join([str(item) for item in display_counts])
@@ -818,10 +818,7 @@ def has_vulnerability_url(vulnerability_id):
if not vulnerability_id:
return False
- for key in settings.VULNERABILITY_URLS:
- if vulnerability_id.upper().startswith(key):
- return True
- return False
+ return any(vulnerability_id.upper().startswith(key) for key in settings.VULNERABILITY_URLS)
@register.filter
@@ -831,8 +828,15 @@ def vulnerability_url(vulnerability_id):
for key in settings.VULNERABILITY_URLS:
if vulnerability_id.upper().startswith(key):
+ if key in ["AVD", "KHV", "C-"]:
+ return settings.VULNERABILITY_URLS[key] + str(vulnerability_id.lower())
if "&&" in settings.VULNERABILITY_URLS[key]:
- return settings.VULNERABILITY_URLS[key].split("&&")[0] + str(vulnerability_id) + settings.VULNERABILITY_URLS[key].split("&&")[1]
+ # Process specific keys specially if need
+ if key in ["CAPEC", "CWE"]:
+ vuln_id = str(vulnerability_id).replace(f"{key}-", "")
+ else:
+ vuln_id = str(vulnerability_id)
+ return f'{settings.VULNERABILITY_URLS[key].split("&&")[0]}{vuln_id}{settings.VULNERABILITY_URLS[key].split("&&")[1]}'
return settings.VULNERABILITY_URLS[key] + str(vulnerability_id)
return ""
@@ -995,7 +999,7 @@ def esc(x):
"""
jira_project_no_inheritance = jira_helper.get_jira_project(product_or_engagement, use_inheritance=False)
- inherited = True if not jira_project_no_inheritance else False
+ inherited = bool(not jira_project_no_inheritance)
icon = "fa-bug"
color = ""
diff --git a/dojo/templatetags/event_tags.py b/dojo/templatetags/event_tags.py
index ff1ffe8f068..237845738c1 100755
--- a/dojo/templatetags/event_tags.py
+++ b/dojo/templatetags/event_tags.py
@@ -63,8 +63,7 @@ def is_file(field):
@register.filter
def is_text(field):
- return isinstance(field.field.widget, forms.TextInput) or \
- isinstance(field.field.widget, forms.Textarea)
+ return isinstance(field.field.widget, forms.TextInput | forms.Textarea)
@register.filter
diff --git a/dojo/templatetags/get_config_setting.py b/dojo/templatetags/get_config_setting.py
index ca917968b75..08ab9251dbd 100755
--- a/dojo/templatetags/get_config_setting.py
+++ b/dojo/templatetags/get_config_setting.py
@@ -7,7 +7,5 @@
@register.filter
def get_config_setting(config_setting):
if hasattr(settings, config_setting):
- if getattr(settings, config_setting, None):
- return True
- return False
+ return bool(getattr(settings, config_setting, None))
return False
diff --git a/dojo/templatetags/get_endpoint_status.py b/dojo/templatetags/get_endpoint_status.py
index 42a5bdb8eaa..37ca83d7070 100755
--- a/dojo/templatetags/get_endpoint_status.py
+++ b/dojo/templatetags/get_endpoint_status.py
@@ -8,7 +8,7 @@
@register.filter(name="has_endpoints")
def has_endpoints(finding):
- return True if finding.endpoints.all() else False
+ return bool(finding.endpoints.all())
@register.filter(name="get_vulnerable_endpoints")
diff --git a/dojo/test/views.py b/dojo/test/views.py
index 96d3a58c1ed..8c9f42d586a 100755
--- a/dojo/test/views.py
+++ b/dojo/test/views.py
@@ -4,7 +4,6 @@
import operator
from datetime import datetime
from functools import reduce
-from typing import Tuple
from django.contrib import messages
from django.contrib.admin.utils import NestedObjects
@@ -826,7 +825,7 @@ def get_jira_form(
self,
request: HttpRequest,
test: Test,
- ) -> Tuple[JIRAImportScanForm | None, bool]:
+ ) -> tuple[JIRAImportScanForm | None, bool]:
"""Returns a JiraImportScanForm if jira is enabled"""
jira_form = None
push_all_jira_issues = False
@@ -853,7 +852,7 @@ def handle_request(
self,
request: HttpRequest,
test_id: int,
- ) -> Tuple[HttpRequest, dict]:
+ ) -> tuple[HttpRequest, dict]:
"""
Process the common behaviors between request types, and then return
the request and context dict back to be rendered
@@ -865,10 +864,7 @@ def handle_request(
# by default we keep a trace of the scan_type used to create the test
# if it's not here, we use the "name" of the test type
# this feature exists to provide custom label for tests for some parsers
- if test.scan_type:
- scan_type = test.scan_type
- else:
- scan_type = test.test_type.name
+ scan_type = test.scan_type or test.test_type.name
# Set the product tab
product_tab = Product_Tab(test.engagement.product, title=_("Re-upload a %s") % scan_type, tab="engagements")
product_tab.setEngagement(test.engagement)
diff --git a/dojo/tools/acunetix/parse_acunetix360_json.py b/dojo/tools/acunetix/parse_acunetix360_json.py
index 082bf889a6c..60df512d493 100755
--- a/dojo/tools/acunetix/parse_acunetix360_json.py
+++ b/dojo/tools/acunetix/parse_acunetix360_json.py
@@ -15,7 +15,7 @@ def get_findings(self, filename, test):
dupes = {}
data = json.load(filename)
dupes = {}
- scan_date = parser.parse(data["Generated"])
+ scan_date = parser.parse(data["Generated"], dayfirst=True)
text_maker = html2text.HTML2Text()
text_maker.body_width = 0
for item in data["Vulnerabilities"]:
@@ -51,10 +51,7 @@ def get_findings(self, filename, test):
+ references
)
url = item["Url"]
- if item["Impact"] is not None:
- impact = text_maker.handle(item.get("Impact", ""))
- else:
- impact = None
+ impact = text_maker.handle(item.get("Impact", "")) if item["Impact"] is not None else None
dupe_key = title
request = item["HttpRequest"]["Content"]
if request is None or len(request) <= 0:
@@ -96,7 +93,7 @@ def get_findings(self, filename, test):
finding.unsaved_req_resp = [{"req": request, "resp": response}]
finding.unsaved_endpoints = [Endpoint.from_uri(url)]
if item.get("FirstSeenDate"):
- parseddate = parser.parse(item["FirstSeenDate"])
+ parseddate = parser.parse(item["FirstSeenDate"], dayfirst=True)
finding.date = parseddate
if dupe_key in dupes:
find = dupes[dupe_key]
diff --git a/dojo/tools/acunetix/parse_acunetix_xml.py b/dojo/tools/acunetix/parse_acunetix_xml.py
index eb1e64d16a4..c4ec52a1bd8 100644
--- a/dojo/tools/acunetix/parse_acunetix_xml.py
+++ b/dojo/tools/acunetix/parse_acunetix_xml.py
@@ -24,9 +24,9 @@ def get_findings(self, filename, test):
if ":" not in start_url:
start_url = "//" + start_url
# get report date
- if scan.findtext("StartTime") and "" != scan.findtext("StartTime"):
+ if scan.findtext("StartTime") and scan.findtext("StartTime") != "":
report_date = dateutil.parser.parse(
- scan.findtext("StartTime"),
+ scan.findtext("StartTime"), dayfirst=True,
).date()
for item in scan.findall("ReportItems/ReportItem"):
finding = Finding(
@@ -43,11 +43,11 @@ def get_findings(self, filename, test):
dynamic_finding=False,
nb_occurences=1,
)
- if item.findtext("Impact") and "" != item.findtext("Impact"):
+ if item.findtext("Impact") and item.findtext("Impact") != "":
finding.impact = item.findtext("Impact")
- if item.findtext("Recommendation") and "" != item.findtext(
+ if item.findtext("Recommendation") and item.findtext(
"Recommendation",
- ):
+ ) != "":
finding.mitigation = item.findtext("Recommendation")
if report_date:
finding.date = report_date
@@ -105,7 +105,7 @@ def get_findings(self, filename, test):
port=url.port,
path=item.findtext("Affects"),
)
- if url.scheme is not None and "" != url.scheme:
+ if url.scheme is not None and url.scheme != "":
endpoint.protocol = url.scheme
finding.unsaved_endpoints = [endpoint]
dupe_key = hashlib.sha256(
@@ -171,6 +171,4 @@ def get_false_positive(self, false_p):
:param false_p:
:return:
"""
- if false_p:
- return True
- return False
+ return bool(false_p)
diff --git a/dojo/tools/anchore_grype/parser.py b/dojo/tools/anchore_grype/parser.py
index 94a0ac5971e..cb877a06c23 100755
--- a/dojo/tools/anchore_grype/parser.py
+++ b/dojo/tools/anchore_grype/parser.py
@@ -187,9 +187,7 @@ def get_findings(self, file, test):
return list(dupes.values())
def _convert_severity(self, val):
- if "Unknown" == val:
- return "Info"
- if "Negligible" == val:
+ if val == "Unknown" or val == "Negligible":
return "Info"
return val.title()
diff --git a/dojo/tools/anchorectl_policies/parser.py b/dojo/tools/anchorectl_policies/parser.py
index 818b21d1c24..b7a471c073b 100755
--- a/dojo/tools/anchorectl_policies/parser.py
+++ b/dojo/tools/anchorectl_policies/parser.py
@@ -40,7 +40,7 @@ def get_findings(self, filename, test):
image_name = result["tag"]
trigger_id = result["triggerId"]
repo, tag = image_name.split(":", 2)
- severity = map_gate_action_to_severity(status)
+ severity, active = get_severity(status, description)
vulnerability_id = extract_vulnerability_id(trigger_id)
title = (
policy_id
@@ -54,6 +54,7 @@ def get_findings(self, filename, test):
test=test,
description=description,
severity=severity,
+ active=active,
references=f"Policy ID: {policy_id}\nTrigger ID: {trigger_id}",
file_path=search_filepath(description),
component_name=repo,
@@ -77,14 +78,32 @@ def get_findings(self, filename, test):
return items
-def map_gate_action_to_severity(gate):
+def map_gate_action_to_severity(status):
gate_action_to_severity = {
"stop": "Critical",
"warn": "Medium",
}
- if gate in gate_action_to_severity:
- return gate_action_to_severity[gate]
- return "Low"
+ if status in gate_action_to_severity:
+ return gate_action_to_severity[status], True
+
+ return "Low", True
+
+
+def get_severity(status, description):
+ parsed_severity = description.split()[0]
+ valid_severities = ["LOW", "INFO", "UNKNOWN", "CRITICAL", "MEDIUM"]
+ if parsed_severity in valid_severities:
+ severity = "Info"
+ if parsed_severity == "UNKNOWN":
+ severity = "Info"
+ elif status != "go":
+ severity = parsed_severity.lower().capitalize()
+
+ active = status != "go"
+
+ return severity, active
+
+ return map_gate_action_to_severity(status)
def policy_name(policies, policy_id):
diff --git a/dojo/tools/api_blackduck/parser.py b/dojo/tools/api_blackduck/parser.py
index 5c01062e51a..84ffe2ed56b 100755
--- a/dojo/tools/api_blackduck/parser.py
+++ b/dojo/tools/api_blackduck/parser.py
@@ -36,10 +36,7 @@ def api_scan_configuration_hint(self):
)
def get_findings(self, file, test):
- if file is None:
- data = BlackduckApiImporter().get_findings(test)
- else:
- data = json.load(file)
+ data = BlackduckApiImporter().get_findings(test) if file is None else json.load(file)
findings = []
for entry in data:
vulnerability_id = entry["vulnerabilityWithRemediation"][
diff --git a/dojo/tools/api_bugcrowd/api_client.py b/dojo/tools/api_bugcrowd/api_client.py
index f180d64325f..7e9ac2b91cd 100755
--- a/dojo/tools/api_bugcrowd/api_client.py
+++ b/dojo/tools/api_bugcrowd/api_client.py
@@ -1,6 +1,7 @@
from urllib.parse import urlencode
import requests
+from django.conf import settings
class BugcrowdAPI:
@@ -52,7 +53,10 @@ def get_findings(self, program, target):
next = f"{self.bugcrowd_api_url}/submissions?{params_encoded}"
while next != "":
- response = self.session.get(url=next)
+ response = self.session.get(
+ url=next,
+ timeout=settings.REQUESTS_TIMEOUT,
+ )
response.raise_for_status()
if response.ok:
data = response.json()
@@ -75,12 +79,14 @@ def test_connection(self):
# Request programs
response_programs = self.session.get(
url=f"{self.bugcrowd_api_url}/programs",
+ timeout=settings.REQUESTS_TIMEOUT,
)
response_programs.raise_for_status()
# Request submissions to validate the org token
response_subs = self.session.get(
url=f"{self.bugcrowd_api_url}/submissions",
+ timeout=settings.REQUESTS_TIMEOUT,
)
response_subs.raise_for_status()
if response_programs.ok and response_subs.ok:
@@ -95,6 +101,7 @@ def test_connection(self):
# Request targets to validate the org token
response_targets = self.session.get(
url=f"{self.bugcrowd_api_url}/targets",
+ timeout=settings.REQUESTS_TIMEOUT,
)
response_targets.raise_for_status()
if response_targets.ok:
diff --git a/dojo/tools/api_cobalt/api_client.py b/dojo/tools/api_cobalt/api_client.py
index 21318143e27..acd01635e90 100755
--- a/dojo/tools/api_cobalt/api_client.py
+++ b/dojo/tools/api_cobalt/api_client.py
@@ -1,4 +1,5 @@
import requests
+from django.conf import settings
class CobaltAPI:
@@ -36,6 +37,7 @@ def get_assets(self):
response = self.session.get(
url=f"{self.cobalt_api_url}/assets?limit=1000",
headers=self.get_headers(),
+ timeout=settings.REQUESTS_TIMEOUT,
)
if response.ok:
@@ -56,6 +58,7 @@ def get_findings(self, asset_id):
response = self.session.get(
url=f"{self.cobalt_api_url}/findings?limit=1000&asset={asset_id}",
headers=self.get_headers(),
+ timeout=settings.REQUESTS_TIMEOUT,
)
if response.ok:
@@ -72,12 +75,14 @@ def test_connection(self):
response_orgs = self.session.get(
url=f"{self.cobalt_api_url}/orgs",
headers=self.get_headers(),
+ timeout=settings.REQUESTS_TIMEOUT,
)
# Request assets to validate the org token
response_assets = self.session.get(
url=f"{self.cobalt_api_url}/assets",
headers=self.get_headers(),
+ timeout=settings.REQUESTS_TIMEOUT,
)
if response_orgs.ok and response_assets.ok:
diff --git a/dojo/tools/api_cobalt/parser.py b/dojo/tools/api_cobalt/parser.py
index b6f119b07b2..d1559cc50f3 100755
--- a/dojo/tools/api_cobalt/parser.py
+++ b/dojo/tools/api_cobalt/parser.py
@@ -38,10 +38,7 @@ def api_scan_configuration_hint(self):
)
def get_findings(self, file, test):
- if file is None:
- data = CobaltApiImporter().get_findings(test)
- else:
- data = json.load(file)
+ data = CobaltApiImporter().get_findings(test) if file is None else json.load(file)
findings = []
for entry in data["data"]:
@@ -129,9 +126,7 @@ def include_finding(self, resource):
"wont_fix", # Risk of finding has been accepted
]
- if resource["state"] in allowed_states:
- return True
- return False
+ return resource["state"] in allowed_states
def convert_endpoints(self, affected_targets):
"""Convert Cobalt affected_targets into DefectDojo endpoints"""
diff --git a/dojo/tools/api_edgescan/api_client.py b/dojo/tools/api_edgescan/api_client.py
index df0de92a471..580d753226c 100755
--- a/dojo/tools/api_edgescan/api_client.py
+++ b/dojo/tools/api_edgescan/api_client.py
@@ -2,6 +2,7 @@
from json.decoder import JSONDecodeError
import requests
+from django.conf import settings
class EdgescanAPI:
@@ -42,6 +43,7 @@ def get_findings(self, asset_ids):
url=url,
headers=self.get_headers(),
proxies=self.get_proxies(),
+ timeout=settings.REQUESTS_TIMEOUT,
)
response.raise_for_status()
return response.json()
diff --git a/dojo/tools/api_edgescan/parser.py b/dojo/tools/api_edgescan/parser.py
index 3fe86561911..6326010d6e0 100755
--- a/dojo/tools/api_edgescan/parser.py
+++ b/dojo/tools/api_edgescan/parser.py
@@ -33,10 +33,7 @@ def api_scan_configuration_hint(self):
return "In the field Service key 1, provide the Edgescan asset ID(s). Leaving it blank will import all assets' findings."
def get_findings(self, file, test):
- if file:
- data = json.load(file)
- else:
- data = EdgescanImporter().get_findings(test)
+ data = json.load(file) if file else EdgescanImporter().get_findings(test)
return self.process_vulnerabilities(test, data)
@@ -67,7 +64,7 @@ def make_finding(self, test, vulnerability):
finding.severity = ES_SEVERITIES[vulnerability["severity"]]
finding.description = vulnerability["description"]
finding.mitigation = vulnerability["remediation"]
- finding.active = True if vulnerability["status"] == "open" else False
+ finding.active = vulnerability["status"] == "open"
if vulnerability["asset_tags"]:
finding.tags = vulnerability["asset_tags"].split(",")
finding.unique_id_from_tool = vulnerability["id"]
diff --git a/dojo/tools/api_sonarqube/api_client.py b/dojo/tools/api_sonarqube/api_client.py
index 63d79bc79b4..c7bfd8bb870 100755
--- a/dojo/tools/api_sonarqube/api_client.py
+++ b/dojo/tools/api_sonarqube/api_client.py
@@ -1,4 +1,5 @@
import requests
+from django.conf import settings
from requests.exceptions import JSONDecodeError as RequestsJSONDecodeError
from rest_framework.exceptions import ValidationError
from dojo.utils import prepare_for_view
@@ -75,6 +76,7 @@ def find_project(self, project_name, organization=None, branch=None):
url=f"{self.sonar_api_url}/components/search",
params=parameters,
headers=self.default_headers,
+ timeout=settings.REQUESTS_TIMEOUT,
)
if not response.ok:
@@ -115,14 +117,13 @@ def get_project(self, project_key, organization=None, branch=None):
parameters["organization"] = organization
elif self.org_id:
parameters["organization"] = self.org_id
- try:
- response = self.session.get(
- url=f"{self.sonar_api_url}/components/show",
- params=parameters,
- headers=self.default_headers,
- )
- except Exception as e:
- raise ValidationError(e)
+
+ response = self.session.get(
+ url=f"{self.sonar_api_url}/components/show",
+ params=parameters,
+ headers=self.default_headers,
+ timeout=settings.REQUESTS_TIMEOUT,
+ )
if not response.ok:
msg = (
@@ -175,6 +176,7 @@ def find_issues(
url=f"{self.sonar_api_url}/issues/search",
params=request_filter,
headers=self.default_headers,
+ timeout=settings.REQUESTS_TIMEOUT,
)
if not response.ok:
@@ -217,6 +219,7 @@ def find_hotspots(self, project_key, organization=None, branch=None):
url=f"{self.sonar_api_url}/hotspots/search",
params=request_filter,
headers=self.default_headers,
+ timeout=settings.REQUESTS_TIMEOUT,
)
if not response.ok:
@@ -281,6 +284,7 @@ def get_issue(self, branch, issue_key):
url=f"{self.sonar_api_url}/issues/search",
params=request_filter,
headers=self.default_headers,
+ timeout=settings.REQUESTS_TIMEOUT,
)
if not response.ok:
@@ -321,6 +325,7 @@ def get_rule(self, rule_id, organization=None):
url=f"{self.sonar_api_url}/rules/show",
params=request_filter,
headers=self.default_headers,
+ timeout=settings.REQUESTS_TIMEOUT,
)
if not response.ok:
msg = (
@@ -345,6 +350,7 @@ def get_hotspot_rule(self, rule_id):
url=f"{self.sonar_api_url}/hotspots/show",
params={"hotspot": rule_id},
headers=self.default_headers,
+ timeout=settings.REQUESTS_TIMEOUT,
)
if not response.ok:
msg = (
@@ -388,6 +394,7 @@ def transition_issue(self, issue_key, transition):
url=f"{self.sonar_api_url}/issues/do_transition",
data={"issue": issue_key, "transition": transition},
headers=self.default_headers,
+ timeout=settings.REQUESTS_TIMEOUT,
)
if not response.ok:
@@ -409,6 +416,7 @@ def add_comment(self, issue_key, text):
url=f"{self.sonar_api_url}/issues/add_comment",
data={"issue": issue_key, "text": text},
headers=self.default_headers,
+ timeout=settings.REQUESTS_TIMEOUT,
)
if not response.ok:
msg = (
@@ -428,6 +436,7 @@ def test_connection(self):
url=f"{self.sonar_api_url}/components/search",
params=parameters,
headers=self.default_headers,
+ timeout=settings.REQUESTS_TIMEOUT,
)
if not response.ok:
diff --git a/dojo/tools/api_sonarqube/importer.py b/dojo/tools/api_sonarqube/importer.py
index d6fded782a6..80d9939079b 100755
--- a/dojo/tools/api_sonarqube/importer.py
+++ b/dojo/tools/api_sonarqube/importer.py
@@ -128,7 +128,7 @@ def import_issues(self, test):
organization=organization,
branch=test.branch_tag,
)
- logging.info(
+ logger.info(
f'Found {len(issues)} issues for component {component["key"]}',
)
@@ -142,10 +142,7 @@ def import_issues(self, test):
continue
issue_type = issue["type"]
- if len(issue["message"]) > 511:
- title = issue["message"][0:507] + "..."
- else:
- title = issue["message"]
+ title = issue["message"][0:507] + "..." if len(issue["message"]) > 511 else issue["message"]
component_key = issue["component"]
line = issue.get("line")
rule_id = issue["rule"]
@@ -250,7 +247,7 @@ def import_hotspots(self, test):
organization=organization,
branch=test.branch_tag,
)
- logging.info(
+ logger.info(
f'Found {len(hotspots)} hotspots for project {component["key"]}',
)
sonarUrl = client.sonar_api_url[:-3] # [:-3] removes the /api part of the sonarqube/cloud URL
diff --git a/dojo/tools/api_sonarqube/updater.py b/dojo/tools/api_sonarqube/updater.py
index e96ddcc41c0..a0b31e43d28 100755
--- a/dojo/tools/api_sonarqube/updater.py
+++ b/dojo/tools/api_sonarqube/updater.py
@@ -62,10 +62,7 @@ def get_sonarqube_status_for(finding):
elif finding.risk_accepted:
target_status = "RESOLVED / WONTFIX"
elif finding.active:
- if finding.verified:
- target_status = "CONFIRMED"
- else:
- target_status = "REOPENED"
+ target_status = "CONFIRMED" if finding.verified else "REOPENED"
return target_status
def get_sonarqube_required_transitions_for(
diff --git a/dojo/tools/api_sonarqube/updater_from_source.py b/dojo/tools/api_sonarqube/updater_from_source.py
index 36496d4593b..2b91e62e29d 100755
--- a/dojo/tools/api_sonarqube/updater_from_source.py
+++ b/dojo/tools/api_sonarqube/updater_from_source.py
@@ -67,10 +67,7 @@ def get_sonarqube_status_for(finding):
elif finding.risk_accepted:
target_status = "WONTFIX"
elif finding.active:
- if finding.verified:
- target_status = "CONFIRMED"
- else:
- target_status = "REOPENED"
+ target_status = "CONFIRMED" if finding.verified else "REOPENED"
return target_status
@staticmethod
diff --git a/dojo/tools/appcheck_web_application_scanner/engines/appcheck.py b/dojo/tools/appcheck_web_application_scanner/engines/appcheck.py
index 6d10485e4d1..b34931d0f8f 100644
--- a/dojo/tools/appcheck_web_application_scanner/engines/appcheck.py
+++ b/dojo/tools/appcheck_web_application_scanner/engines/appcheck.py
@@ -1,5 +1,4 @@
import re
-from typing import Union
from dojo.models import Finding
from dojo.tools.appcheck_web_application_scanner.engines.base import BaseEngineParser
@@ -29,7 +28,7 @@ def extract_request_response(self, finding: Finding, value: dict[str, [str]]) ->
value.pop("Messages")
finding.unsaved_request, finding.unsaved_response = (d.strip() for d in rr_details[0])
- def parse_details(self, finding: Finding, value: dict[str, Union[str, dict[str, list[str]]]]) -> None:
+ def parse_details(self, finding: Finding, value: dict[str, str | dict[str, list[str]]]) -> None:
self.extract_request_response(finding, value)
# super's version adds everything else to the description field
return super().parse_details(finding, value)
diff --git a/dojo/tools/appcheck_web_application_scanner/engines/base.py b/dojo/tools/appcheck_web_application_scanner/engines/base.py
index 782c047443a..e07433c2946 100644
--- a/dojo/tools/appcheck_web_application_scanner/engines/base.py
+++ b/dojo/tools/appcheck_web_application_scanner/engines/base.py
@@ -1,6 +1,6 @@
import re
from itertools import starmap
-from typing import Any, Optional, Tuple, Union
+from typing import Any
import cvss.parser
import dateutil.parser
@@ -193,7 +193,7 @@ def __init__(self):
#####
# For parsing the initial finding datetime to a date format pleasing to Finding
#####
- def get_date(self, value: str) -> Optional[str]:
+ def get_date(self, value: str) -> str | None:
try:
return str(dateutil.parser.parse(value).date())
except dateutil.parser.ParserError:
@@ -229,7 +229,7 @@ def parse_status(self, finding: Finding, value: str) -> None:
#####
# For parsing component data
#####
- def parse_cpe(self, cpe_str: str) -> (Optional[str], Optional[str]):
+ def parse_cpe(self, cpe_str: str) -> (str | None, str | None):
if not cpe_str:
return None, None
cpe_obj = CPE(cpe_str)
@@ -257,12 +257,12 @@ def append_description(self, finding: Finding, addendum: dict[str, str]) -> None
def parse_notes(self, finding: Finding, value: str) -> None:
self.append_description(finding, {"Notes": value})
- def extract_details(self, value: Union[str, dict[str, Union[str, dict[str, list[str]]]]]) -> dict[str, str]:
+ def extract_details(self, value: str | dict[str, str | dict[str, list[str]]]) -> dict[str, str]:
if isinstance(value, dict):
return {k: v for k, v in value.items() if k != "_meta"}
return {"Details": str(value)}
- def parse_details(self, finding: Finding, value: dict[str, Union[str, dict[str, list[str]]]]) -> None:
+ def parse_details(self, finding: Finding, value: dict[str, str | dict[str, list[str]]]) -> None:
self.append_description(finding, self.extract_details(value))
#####
@@ -271,7 +271,7 @@ def parse_details(self, finding: Finding, value: dict[str, Union[str, dict[str,
def get_host(self, item: dict[str, Any]) -> str:
return item.get("url") or item.get("host") or item.get("ipv4_address") or None
- def parse_port(self, item: Any) -> Optional[int]:
+ def parse_port(self, item: Any) -> int | None:
try:
int_val = int(item)
if 0 < int_val <= 65535:
@@ -280,10 +280,10 @@ def parse_port(self, item: Any) -> Optional[int]:
pass
return None
- def get_port(self, item: dict[str, Any]) -> Optional[int]:
+ def get_port(self, item: dict[str, Any]) -> int | None:
return self.parse_port(item.get("port"))
- def construct_endpoint(self, host: str, port: Optional[int]) -> Endpoint:
+ def construct_endpoint(self, host: str, port: int | None) -> Endpoint:
endpoint = Endpoint.from_uri(host)
if endpoint.host:
if port:
@@ -306,7 +306,7 @@ def set_endpoints(self, finding: Finding, item: Any) -> None:
#####
# For severity (extracted from various cvss vectors)
#####
- def parse_cvss_vector(self, value: str) -> Optional[str]:
+ def parse_cvss_vector(self, value: str) -> str | None:
# CVSS4 vectors don't parse with the handy-danty parse method :(
try:
if (severity := cvss.CVSS4(value).severity) in Finding.SEVERITIES:
@@ -347,7 +347,7 @@ def get_engine_fields(self) -> dict[str, FieldType]:
**BaseEngineParser._COMMON_FIELDS_MAP,
**self._ENGINE_FIELDS_MAP}
- def get_finding_key(self, finding: Finding) -> Tuple:
+ def get_finding_key(self, finding: Finding) -> tuple:
return (
finding.severity,
finding.title,
@@ -355,7 +355,7 @@ def get_finding_key(self, finding: Finding) -> Tuple:
self.SCANNING_ENGINE,
)
- def parse_finding(self, item: dict[str, Any]) -> Tuple[Finding, Tuple]:
+ def parse_finding(self, item: dict[str, Any]) -> tuple[Finding, tuple]:
finding = Finding()
for field, field_handler in self.get_engine_fields().items():
# Check first whether the field even exists on this item entry; if not, skip it
diff --git a/dojo/tools/appcheck_web_application_scanner/engines/nmap.py b/dojo/tools/appcheck_web_application_scanner/engines/nmap.py
index 9252bdcb53d..3fba10e455d 100644
--- a/dojo/tools/appcheck_web_application_scanner/engines/nmap.py
+++ b/dojo/tools/appcheck_web_application_scanner/engines/nmap.py
@@ -1,4 +1,4 @@
-from typing import Any, Union
+from typing import Any
from dojo.models import Endpoint
from dojo.tools.appcheck_web_application_scanner.engines.base import BaseEngineParser
@@ -18,7 +18,7 @@ class NmapScanningEngineParser(BaseEngineParser):
def is_port_table_entry(self, entry) -> bool:
return len(entry) > 0 and self.parse_port(entry[0])
- def get_ports(self, item) -> Union[list[int], list[None]]:
+ def get_ports(self, item) -> list[int] | list[None]:
meta = item.get("meta")
if not isinstance(meta, dict):
meta = {}
diff --git a/dojo/tools/aqua/parser.py b/dojo/tools/aqua/parser.py
index 076c2d71dc5..a3b80281d0e 100755
--- a/dojo/tools/aqua/parser.py
+++ b/dojo/tools/aqua/parser.py
@@ -20,10 +20,7 @@ def get_findings(self, json_output, test):
def get_items(self, tree, test):
self.items = {}
if isinstance(tree, list): # Aqua Scan Report coming from Azure Devops jobs.
- if tree:
- vulnerabilitytree = tree[0]["results"]["resources"]
- else:
- vulnerabilitytree = []
+ vulnerabilitytree = tree[0]["results"]["resources"] if tree else []
self.vulnerability_tree(vulnerabilitytree, test)
elif "resources" in tree: # Aqua Scan Report not from Azure Devops jobs.
vulnerabilitytree = tree["resources"]
diff --git a/dojo/tools/arachni/parser.py b/dojo/tools/arachni/parser.py
index 3823da0589e..30947c33509 100644
--- a/dojo/tools/arachni/parser.py
+++ b/dojo/tools/arachni/parser.py
@@ -87,9 +87,7 @@ def get_item(self, item_node, report_date):
description = html2text.html2text(description)
remediation = (
- item_node["remedy_guidance"]
- if "remedy_guidance" in item_node
- else "n/a"
+ item_node.get("remedy_guidance", "n/a")
)
if remediation:
remediation = html2text.html2text(remediation)
@@ -105,7 +103,7 @@ def get_item(self, item_node, report_date):
references = html2text.html2text(references)
severity = item_node.get("severity", "Info").capitalize()
- if "Informational" == severity:
+ if severity == "Informational":
severity = "Info"
# Finding and Endpoint objects returned have not been saved to the
diff --git a/dojo/tools/asff/parser.py b/dojo/tools/asff/parser.py
index 49fa51fe1a8..87b2d18d282 100755
--- a/dojo/tools/asff/parser.py
+++ b/dojo/tools/asff/parser.py
@@ -63,10 +63,8 @@ def get_findings(self, file, test):
else:
mitigation = None
references = None
- if item.get("RecordState") and item.get("RecordState") == "ACTIVE":
- active = True
- else:
- active = False
+ active = bool(item.get("RecordState") and item.get("RecordState") == "ACTIVE")
+
# Adding the Resources:0/Id value to the description.
#
# This is needed because every Finding in AWS from Security Hub has an
diff --git a/dojo/tools/aws_inspector2/__init__.py b/dojo/tools/aws_inspector2/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/dojo/tools/aws_inspector2/parser.py b/dojo/tools/aws_inspector2/parser.py
new file mode 100644
index 00000000000..5350044d10d
--- /dev/null
+++ b/dojo/tools/aws_inspector2/parser.py
@@ -0,0 +1,255 @@
+import json
+from datetime import UTC, datetime
+
+from dateutil import parser as date_parser
+
+from dojo.models import Endpoint, Finding
+
+
+class AWSInspector2Parser:
+
+ """Import AWS Inspector2 json."""
+
+ def get_scan_types(self):
+ return ["AWS Inspector2 Scan"]
+
+ def get_label_for_scan_types(self, scan_type):
+ return "AWS Inspector2 Scan"
+
+ def get_description_for_scan_types(self, scan_type):
+ return "AWS Inspector2 report file can be imported in JSON format (aws inspector2 list-findings)."
+
+ def get_findings(self, file, test):
+ tree = json.load(file)
+ raw_findings = tree.get("findings", None)
+ if not isinstance(raw_findings, list):
+ msg = "Incorrect Inspector2 report format"
+ raise TypeError(msg)
+ self.test = test
+ findings = []
+ for raw_finding in raw_findings:
+ finding = self.get_base_finding(raw_finding)
+ # type specific details
+ finding_type = raw_finding.get("type", None)
+ if finding_type == "PACKAGE_VULNERABILITY":
+ finding = self.get_package_vulnerability(finding, raw_finding)
+ elif finding_type == "CODE_VULNERABILITY":
+ finding = self.get_code_vulnerability(finding, raw_finding)
+ elif finding_type == "NETWORK_REACHABILITY":
+ finding = self.get_network_reachability(finding, raw_finding)
+ else:
+ msg = "Incorrect Inspector2 report format"
+ raise TypeError(msg)
+ # process the endpoints
+ finding = self.process_endpoints(finding, raw_finding)
+ findings.append(finding)
+
+ return findings
+
+ def get_severity(self, severity_string):
+ if severity_string == "UNTRIAGED":
+ severity_string = "Info"
+ return severity_string.title()
+
+ def get_base_finding(self, raw_finding: dict) -> Finding:
+ # basic fields
+ finding_id = raw_finding.get("findingArn")
+ title = raw_finding.get("title", "The title could not be identified...")
+ description = ""
+ if (aws_account := raw_finding.get("awsAccountId")) is not None:
+ description += f"**AWS Account**: {aws_account}\n"
+ if finding_id is not None:
+ description += f"**Finding ARN**: {finding_id}\n"
+ if (inspector_score := raw_finding.get("inspectorScore")) is not None:
+ description += f"Inspector score: {inspector_score}\n"
+ if (discovered_at := raw_finding.get("firstObservedAt")) is not None:
+ description += f"Discovered at: {discovered_at}\n"
+ if (last_seen_at := raw_finding.get("lastObservedAt")) is not None:
+ description += f"Last seen: {last_seen_at}\n"
+ if (orig_description := raw_finding.get("description")) is not None:
+ description += f"Original description: \n{orig_description}\n"
+ finding = Finding(
+ title=title,
+ test=self.test,
+ description=description,
+ severity=self.get_severity(raw_finding.get("severity", "Info")),
+ unique_id_from_tool=finding_id,
+ static_finding=True,
+ dynamic_finding=False,
+ )
+ # set mitigation status
+ if raw_finding.get("status", "ACTIVE") == "ACTIVE":
+ mitigated = None
+ is_mitigated = False
+ active = True
+ else:
+ is_mitigated = True
+ active = False
+ if (last_observed := raw_finding.get("lastObservedAt")) is not None:
+ mitigated = date_parser(last_observed)
+ else:
+ mitigated = datetime.now(UTC)
+ finding.active = active
+ finding.is_mitigated = is_mitigated
+ finding.mitigated = mitigated
+ # EPSS
+ finding.epss_score = raw_finding.get("epss", {}).get("score", None)
+
+ return finding
+
+ def get_package_vulnerability(self, finding: Finding, raw_finding: dict) -> Finding:
+ vulnerability_details = raw_finding.get("packageVulnerabilityDetails", {})
+ vulnerability_packages_descriptions = "\n".join(
+ [
+ (
+ f'*Vulnerable package*: {vulnerability_package.get("name", "N/A")}\n'
+ f'\tpackage manager: {vulnerability_package.get("packageManager", "N/A")}\n'
+ f'\tversion: {vulnerability_package.get("version", "N/A")}\n'
+ f'\tfixed version: {vulnerability_package.get("fixedInVersion", "N/A")}\n'
+ f'\tremediation: {vulnerability_package.get("remediation", "N/A")}\n'
+ )
+ for vulnerability_package in vulnerability_details.get("vulnerablePackages", [])
+ ],
+ )
+ if (vulnerability_id := vulnerability_details.get("vulnerabilityId", None)) is not None:
+ finding.unsaved_vulnerability_ids = [vulnerability_id]
+ vulnerability_source = vulnerability_details.get("source")
+ vulnerability_source_url = vulnerability_details.get("sourceUrl")
+ # populate fields
+ if vulnerability_source is not None and vulnerability_source_url is not None:
+ finding.url = vulnerability_source_url
+ finding.description += (
+ "\n**Additional info**\n"
+ f"Vulnerability info from: {vulnerability_source} {vulnerability_source_url}\n"
+ "Affected packages:\n"
+ f"{vulnerability_packages_descriptions}\n"
+ )
+
+ return finding
+
+ def get_code_vulnerability(self, finding: Finding, raw_finding: dict) -> Finding:
+ cwes = raw_finding.get("cwes", [])
+ detector_id = raw_finding.get("detectorId", "N/A")
+ detector_name = raw_finding.get("detectorName", "N/A")
+ file_path_info = raw_finding.get("filePath", {})
+ file_name = file_path_info.get("fileName", "N/A")
+ file_path = file_path_info.get("filePath", "N/A")
+ start_line = file_path_info.get("startLine", "N/A")
+ end_line = file_path_info.get("endLine", "N/A")
+ detector_tags = ", ".join(raw_finding.get("detectorTags", []))
+ reference_urls = ", ".join(raw_finding.get("referenceUrls", []))
+ rule_id = raw_finding.get("ruleId", "N/A")
+ layer_arn = raw_finding.get("sourceLambdaLayerArn", "N/A")
+ string_cwes = ", ".join(cwes)
+ # populate fields
+ finding.cwe = cwes[0] if cwes else None
+ finding.file_path = f"{file_path}{file_name}"
+ finding.sast_source_file_path = f"{file_path}{file_name}"
+ finding.line = start_line
+ finding.sast_source_line = start_line
+ finding.description += (
+ "\n**Additional info**\n"
+ f"CWEs: {string_cwes}\n"
+ f"Vulnerability info from: {detector_id} {detector_name}\n"
+ f"Rule: {rule_id}\n"
+ f"Lines: {start_line} - {end_line}\n"
+ f"Tags: {detector_tags or 'N/A'}\n"
+ f"URLs: {reference_urls or 'N/A'}\n"
+ f"Lambda layer ARN: {layer_arn}\n"
+ )
+
+ return finding
+
+ def get_network_reachability(self, finding: Finding, raw_finding: dict) -> Finding:
+ network_path_info = raw_finding.get("networkPath", {})
+ network_path_steps = network_path_info.get("steps", [])
+ steps_descriptions = "\n".join(
+ [
+ f'steps:\n{step_number}: {step.get("componentId", "N/A")} {step.get("componentType", "N/A")}'
+ for step_number, step in enumerate(network_path_steps)
+ ],
+ )
+ open_port_range_info = raw_finding.get("openPortRange", {})
+ port_range_start = open_port_range_info.get("begin", "N/A")
+ port_range_end = open_port_range_info.get("end", "N/A")
+ protocol = raw_finding.get("protocol", "N/A")
+ finding.description += (
+ "\n**Additional info**\n"
+ f"protocol {protocol}, port range {port_range_start} - {port_range_end}"
+ f"{steps_descriptions}\n"
+ )
+
+ return finding
+
+ def process_endpoints(self, finding: Finding, raw_finding: dict) -> Finding:
+ impact = []
+ endpoints = []
+ for resource_info in raw_finding.get("resources", {}):
+ resource_type = resource_info.get("type", None)
+ resource_id = resource_info.get("id", "N/A")
+ resource_details = resource_info.get("details", {})
+ endpoint_host = f"{resource_type} - {resource_id}"
+ if resource_type == "AWS_EC2_INSTANCE":
+ aws_account = raw_finding.get("awsAccountId")
+ resource_region = resource_info.get("region", "N/A")
+ endpoint_host = resource_id
+ ec2_instance_details = resource_details.get("awsEc2Instance", None)
+ if ec2_instance_details:
+ impact.extend(
+ (
+ f"ARN: {resource_id}",
+ f"Image ID: {ec2_instance_details.get('imageId', 'N/A')}",
+ f"IPv4 address: {ec2_instance_details.get('ipV4Addresses', 'N/A')}",
+ f"Subnet: {ec2_instance_details.get('subnetId', 'N/A')}",
+ f"VPC: {ec2_instance_details.get('vpcId', 'N/A')}",
+ f"Region: {resource_region}",
+ f"AWS Account: {aws_account}",
+ f"Launched at: {ec2_instance_details.get('launchedAt', 'N/A')}",
+ "---",
+ ),
+ )
+ elif resource_type == "AWS_ECR_CONTAINER_IMAGE":
+ image_id = resource_id.split("repository/")[1].replace("sha256:", "").replace("/", "-")
+ endpoint_host = image_id
+ ecr_image_details = resource_details.get("awsEcrContainerImage", None)
+ if ecr_image_details:
+ impact.extend(
+ (
+ f"ARN: {resource_id}",
+ f"Registry: {ecr_image_details.get('registry', 'N/A')}",
+ f"Repository: {ecr_image_details.get('repositoryName', 'N/A')}",
+ f"Hash: {ecr_image_details.get('imageHash', 'N/A')}",
+ f"Author: {ecr_image_details.get('author', 'N/A')}",
+ f"Pushed at: {ecr_image_details.get('pushedAt', 'N/A')}",
+ "---",
+ ),
+ )
+ elif resource_type == "AWS_ECR_REPOSITORY":
+ # no corresponding
+ # key present in
+ # https://docs.aws.amazon.com/inspector/v2/APIReference/API_ResourceDetails.html
+ pass
+ elif resource_type == "AWS_LAMBDA_FUNCTION":
+ lambda_id = resource_id.split("function:")[1].replace(":", "-").replace("/", "-")
+ endpoint_host = lambda_id
+ lambda_details = resource_details.get("awsLambdaFunction", None)
+ if lambda_details:
+ impact.extend(
+ (
+ f"ARN: {resource_id}",
+ f"Name: {lambda_details.get('functionName', 'N/A')}",
+ f"Version: {lambda_details.get('version', 'N/A')}",
+ f"Runtime: {lambda_details.get('runtime', 'N/A')}",
+ f"Hash: {lambda_details.get('codeSha256', 'N/A')}",
+ f"Pushed at: {lambda_details.get('lastModifiedAt', 'N/A')}",
+ ),
+ )
+ else:
+ msg = "Incorrect Inspector2 report format"
+ raise TypeError(msg)
+ endpoints.append(Endpoint(host=endpoint_host))
+ finding.impact = "\n".join(impact)
+ finding.unsaved_endpoints = []
+ finding.unsaved_endpoints.extend(endpoints)
+
+ return finding
diff --git a/dojo/tools/aws_prowler/parser.py b/dojo/tools/aws_prowler/parser.py
index 7093a596012..e24ac155296 100755
--- a/dojo/tools/aws_prowler/parser.py
+++ b/dojo/tools/aws_prowler/parser.py
@@ -65,16 +65,10 @@ def process_csv(self, file, test):
# title = re.sub(r"\[.*\]\s", "", result_extended)
control = re.sub(r"\[.*\]\s", "", title_text)
sev = self.getCriticalityRating(result, level, severity)
- if result == "INFO" or result == "PASS":
- active = False
- else:
- active = True
+ active = not (result == "INFO" or result == "PASS")
# creating description early will help with duplication control
- if not level:
- level = ""
- else:
- level = ", " + level
+ level = "" if not level else ", " + level
description = (
"**Issue:** "
+ str(result_extended)
@@ -160,10 +154,7 @@ def process_json(self, file, test):
sev = self.getCriticalityRating("FAIL", level, severity)
# creating description early will help with duplication control
- if not level:
- level = ""
- else:
- level = ", " + level
+ level = "" if not level else ", " + level
description = (
"**Issue:** "
+ str(result_extended)
@@ -221,19 +212,15 @@ def formatview(self, depth):
# Criticality rating
def getCriticalityRating(self, result, level, severity):
- criticality = "Info"
if result == "INFO" or result == "PASS":
- criticality = "Info"
- elif result == "FAIL":
+ return "Info"
+ if result == "FAIL":
if severity:
# control is failing but marked as Info so we want to mark as
# Low to appear in the Dojo
if severity == "Informational":
return "Low"
return severity
- if level == "Level 1":
- criticality = "Critical"
- else:
- criticality = "High"
+ return "Critical" if level == "Level 1" else "High"
- return criticality
+ return "Info"
diff --git a/dojo/tools/aws_prowler_v3plus/prowler_v4.py b/dojo/tools/aws_prowler_v3plus/prowler_v4.py
index 1b9c155b63a..dd543f27f57 100644
--- a/dojo/tools/aws_prowler_v3plus/prowler_v4.py
+++ b/dojo/tools/aws_prowler_v3plus/prowler_v4.py
@@ -37,7 +37,8 @@ def process_ocsf_json(self, file, test):
documentation = deserialized.get("remediation", {}).get("references", "")
documentation = str(documentation) + "\n" + str(deserialized.get("unmapped", {}).get("related_url", ""))
security_domain = deserialized.get("resources", [{}])[0].get("type", "")
- timestamp = deserialized.get("event_time")
+ # Prowler v4.5.0 changed 'event_time' key in report with 'time_dt'
+ timestamp = deserialized.get("time_dt") or deserialized.get("event_time")
resource_arn = deserialized.get("resources", [{}])[0].get("uid", "")
resource_id = deserialized.get("resources", [{}])[0].get("name", "")
unique_id_from_tool = deserialized.get("finding_info", {}).get("uid", "")
diff --git a/dojo/tools/awssecurityhub/compliance.py b/dojo/tools/awssecurityhub/compliance.py
index 5fea1a8a786..563a4995b99 100644
--- a/dojo/tools/awssecurityhub/compliance.py
+++ b/dojo/tools/awssecurityhub/compliance.py
@@ -1,4 +1,4 @@
-from datetime import datetime
+import datetime
from dojo.models import Finding
@@ -29,13 +29,13 @@ def get_item(self, finding: dict, test):
if finding.get("Compliance", {}).get("Status", "PASSED") == "PASSED":
is_Mitigated = True
active = False
- if finding.get("LastObservedAt", None):
+ if finding.get("LastObservedAt"):
try:
- mitigated = datetime.strptime(finding.get("LastObservedAt"), "%Y-%m-%dT%H:%M:%S.%fZ")
+ mitigated = datetime.datetime.strptime(finding.get("LastObservedAt"), "%Y-%m-%dT%H:%M:%S.%fZ")
except Exception:
- mitigated = datetime.strptime(finding.get("LastObservedAt"), "%Y-%m-%dT%H:%M:%fZ")
+ mitigated = datetime.datetime.strptime(finding.get("LastObservedAt"), "%Y-%m-%dT%H:%M:%fZ")
else:
- mitigated = datetime.utcnow()
+ mitigated = datetime.datetime.now(datetime.UTC)
else:
mitigated = None
is_Mitigated = False
diff --git a/dojo/tools/awssecurityhub/guardduty.py b/dojo/tools/awssecurityhub/guardduty.py
index 40b26649500..9f1cfb63aab 100644
--- a/dojo/tools/awssecurityhub/guardduty.py
+++ b/dojo/tools/awssecurityhub/guardduty.py
@@ -1,4 +1,4 @@
-from datetime import datetime
+import datetime
from dojo.models import Endpoint, Finding
@@ -23,13 +23,13 @@ def get_item(self, finding: dict, test):
mitigated = None
else:
is_Mitigated = True
- if finding.get("LastObservedAt", None):
+ if finding.get("LastObservedAt"):
try:
- mitigated = datetime.strptime(finding.get("LastObservedAt"), "%Y-%m-%dT%H:%M:%S.%fZ")
+ mitigated = datetime.datetime.strptime(finding.get("LastObservedAt"), "%Y-%m-%dT%H:%M:%S.%fZ")
except Exception:
- mitigated = datetime.strptime(finding.get("LastObservedAt"), "%Y-%m-%dT%H:%M:%fZ")
+ mitigated = datetime.datetime.strptime(finding.get("LastObservedAt"), "%Y-%m-%dT%H:%M:%fZ")
else:
- mitigated = datetime.utcnow()
+ mitigated = datetime.datetime.now(datetime.UTC)
description = f"This is a GuardDuty Finding\n{finding.get('Description', '')}" + "\n"
description += f"**AWS Finding ARN:** {finding_id}\n"
if finding.get("SourceUrl"):
diff --git a/dojo/tools/awssecurityhub/inspector.py b/dojo/tools/awssecurityhub/inspector.py
index 61b18be5bf8..5235bf70a05 100644
--- a/dojo/tools/awssecurityhub/inspector.py
+++ b/dojo/tools/awssecurityhub/inspector.py
@@ -1,4 +1,4 @@
-from datetime import datetime
+import datetime
from dojo.models import Endpoint, Finding
@@ -12,10 +12,7 @@ def get_item(self, finding: dict, test):
impact = []
references = []
unsaved_vulnerability_ids = []
- if finding.get("EpssScore") is not None:
- epss_score = finding.get("EpssScore")
- else:
- epss_score = None
+ epss_score = finding.get("EpssScore")
description = f"This is an Inspector Finding\n{finding.get('Description', '')}" + "\n"
description += f"**AWS Finding ARN:** {finding_id}\n"
description += f"**AwsAccountId:** {finding.get('AwsAccountId', '')}\n"
@@ -46,13 +43,13 @@ def get_item(self, finding: dict, test):
else:
is_Mitigated = True
active = False
- if finding.get("LastObservedAt", None):
+ if finding.get("LastObservedAt"):
try:
- mitigated = datetime.strptime(finding.get("LastObservedAt"), "%Y-%m-%dT%H:%M:%S.%fZ")
+ mitigated = datetime.datetime.strptime(finding.get("LastObservedAt"), "%Y-%m-%dT%H:%M:%S.%fZ")
except Exception:
- mitigated = datetime.strptime(finding.get("LastObservedAt"), "%Y-%m-%dT%H:%M:%fZ")
+ mitigated = datetime.datetime.strptime(finding.get("LastObservedAt"), "%Y-%m-%dT%H:%M:%fZ")
else:
- mitigated = datetime.utcnow()
+ mitigated = datetime.datetime.now(datetime.UTC)
title_suffix = ""
hosts = []
for resource in finding.get("Resources", []):
diff --git a/dojo/tools/awssecurityhub/parser.py b/dojo/tools/awssecurityhub/parser.py
index e59afa23ce3..94041a6bc14 100755
--- a/dojo/tools/awssecurityhub/parser.py
+++ b/dojo/tools/awssecurityhub/parser.py
@@ -47,7 +47,7 @@ def get_findings(self, filehandle, test):
def get_items(self, tree: dict, test):
items = {}
- findings = tree.get("Findings", tree.get("findings", None))
+ findings = tree.get("Findings", tree.get("findings"))
if not isinstance(findings, list):
msg = "Incorrect Security Hub report format"
raise TypeError(msg)
diff --git a/dojo/tools/azure_security_center_recommendations/parser.py b/dojo/tools/azure_security_center_recommendations/parser.py
index 9838f65ae58..5fc42a7a193 100755
--- a/dojo/tools/azure_security_center_recommendations/parser.py
+++ b/dojo/tools/azure_security_center_recommendations/parser.py
@@ -35,7 +35,7 @@ def process_csv(self, file, test):
findings = []
for row in reader:
- if "unhealthy" == row.get("state").lower():
+ if row.get("state").lower() == "unhealthy":
subscription_id = row.get("subscriptionId")
subscription_name = row.get("subscriptionName")
resource_group = row.get("resourceGroup")
diff --git a/dojo/tools/bandit/parser.py b/dojo/tools/bandit/parser.py
index 3e4e54fcd8b..6beca950ef9 100755
--- a/dojo/tools/bandit/parser.py
+++ b/dojo/tools/bandit/parser.py
@@ -64,10 +64,10 @@ def get_findings(self, filename, test):
return results
def convert_confidence(self, value):
- if "high" == value.lower():
+ if value.lower() == "high":
return 2
- if "medium" == value.lower():
+ if value.lower() == "medium":
return 3
- if "low" == value.lower():
+ if value.lower() == "low":
return 6
return None
diff --git a/dojo/tools/bearer_cli/parser.py b/dojo/tools/bearer_cli/parser.py
index 7cee6dbf4c6..e49ed553d2f 100644
--- a/dojo/tools/bearer_cli/parser.py
+++ b/dojo/tools/bearer_cli/parser.py
@@ -33,7 +33,7 @@ def get_findings(self, file, test):
finding = Finding(
title=bearerfinding["title"] + " in " + bearerfinding["filename"] + ":" + str(bearerfinding["line_number"]),
test=test,
- description=bearerfinding["description"] + "\n Detected code snippet: \n" + bearerfinding["snippet"],
+ description=bearerfinding["description"] + "\n Detected code snippet: \n" + bearerfinding.get("snippet", bearerfinding.get("code_extract")),
severity=severity,
cwe=bearerfinding["cwe_ids"][0],
static_finding=True,
diff --git a/dojo/tools/blackduck/importer.py b/dojo/tools/blackduck/importer.py
index 83175371705..9d50dc7332b 100755
--- a/dojo/tools/blackduck/importer.py
+++ b/dojo/tools/blackduck/importer.py
@@ -4,8 +4,8 @@
import zipfile
from abc import ABC, abstractmethod
from collections import defaultdict
+from collections.abc import Iterable
from pathlib import Path
-from typing import Iterable
from .model import BlackduckFinding
@@ -76,10 +76,7 @@ def _process_project_findings(
file_entry_dict = dict(file_entry)
path = file_entry_dict.get("Path")
archive_context = file_entry_dict.get("Archive context")
- if archive_context:
- full_path = f"{archive_context}{path[1:]}"
- else:
- full_path = path
+ full_path = f"{archive_context}{path[1:]}" if archive_context else path
# 4000 character limit on this field
total_len = len(full_path)
@@ -125,10 +122,7 @@ def __partition_by_key(self, csv_file):
findings = defaultdict(set)
# Backwards compatibility. Newer versions of Blackduck use Component
# id.
- if "Project id" in records.fieldnames:
- key = "Project id"
- else:
- key = "Component id"
+ key = "Project id" if "Project id" in records.fieldnames else "Component id"
for record in records:
findings[record.get(key)].add(frozenset(record.items()))
return findings
diff --git a/dojo/tools/blackduck_binary_analysis/importer.py b/dojo/tools/blackduck_binary_analysis/importer.py
index 4d381aae058..0ada8cca26b 100644
--- a/dojo/tools/blackduck_binary_analysis/importer.py
+++ b/dojo/tools/blackduck_binary_analysis/importer.py
@@ -1,8 +1,8 @@
import csv
from abc import ABC, abstractmethod
from collections import defaultdict
+from collections.abc import Iterable
from pathlib import Path
-from typing import Iterable
from .model import BlackduckBinaryAnalysisFinding
diff --git a/dojo/tools/bugcrowd/parser.py b/dojo/tools/bugcrowd/parser.py
index a643499976a..7cad12ead9d 100755
--- a/dojo/tools/bugcrowd/parser.py
+++ b/dojo/tools/bugcrowd/parser.py
@@ -249,8 +249,5 @@ def convert_severity(self, sev_num):
def get_endpoint(self, url):
stripped_url = url.strip()
- if "://" in stripped_url: # is the host full uri?
- endpoint = Endpoint.from_uri(stripped_url)
- else:
- endpoint = Endpoint.from_uri("//" + stripped_url)
- return endpoint
+ # is the host full uri?
+ return Endpoint.from_uri(stripped_url) if "://" in stripped_url else Endpoint.from_uri("//" + stripped_url)
diff --git a/dojo/tools/bundler_audit/parser.py b/dojo/tools/bundler_audit/parser.py
index c960bb374c8..1534e170ed7 100755
--- a/dojo/tools/bundler_audit/parser.py
+++ b/dojo/tools/bundler_audit/parser.py
@@ -43,10 +43,7 @@ def get_findings(self, filename, test):
advisory_id = field.replace("GHSA: ", "")
elif field.startswith("Criticality"):
criticality = field.replace("Criticality: ", "")
- if criticality.lower() == "unknown":
- sev = "Medium"
- else:
- sev = criticality
+ sev = "Medium" if criticality.lower() == "unknown" else criticality
elif field.startswith("URL"):
advisory_url = field.replace("URL: ", "")
elif field.startswith("Title"):
diff --git a/dojo/tools/burp/parser.py b/dojo/tools/burp/parser.py
index cd5128cb9c1..f30f0c86091 100644
--- a/dojo/tools/burp/parser.py
+++ b/dojo/tools/burp/parser.py
@@ -226,7 +226,7 @@ def get_item(item_node, test):
references = text_maker.handle(references)
severity = item_node.findall("severity")[0].text
- if "information" == severity.lower():
+ if severity.lower() == "information":
severity = "Info"
scanner_confidence = item_node.findall("confidence")[0].text
diff --git a/dojo/tools/burp_api/parser.py b/dojo/tools/burp_api/parser.py
index be25f824978..86a876870c7 100755
--- a/dojo/tools/burp_api/parser.py
+++ b/dojo/tools/burp_api/parser.py
@@ -36,7 +36,7 @@ def get_findings(self, file, test):
# for each issue found
for issue_event in tree.get("issue_events", []):
if (
- "issue_found" == issue_event.get("type")
+ issue_event.get("type") == "issue_found"
and "issue" in issue_event
):
issue = issue_event.get("issue")
@@ -52,7 +52,7 @@ def get_findings(self, file, test):
)
false_p = False
# manage special case of false positives
- if "false_positive" == issue.get("severity", "undefined"):
+ if issue.get("severity", "undefined") == "false_positive":
false_p = True
finding = Finding(
@@ -160,10 +160,10 @@ def convert_confidence(issue):
},
"""
value = issue.get("confidence", "undefined").lower()
- if "certain" == value:
+ if value == "certain":
return 2
- if "firm" == value:
+ if value == "firm":
return 3
- if "tentative" == value:
+ if value == "tentative":
return 6
return None
diff --git a/dojo/tools/burp_enterprise/parser.py b/dojo/tools/burp_enterprise/parser.py
index aab8e565242..052d8a80f84 100755
--- a/dojo/tools/burp_enterprise/parser.py
+++ b/dojo/tools/burp_enterprise/parser.py
@@ -1,7 +1,7 @@
import logging
import re
-from lxml import etree
+from lxml import etree, html
from dojo.models import Endpoint, Finding
@@ -9,6 +9,16 @@
class BurpEnterpriseParser:
+ vulnerability_list_xpath = (
+ "/html/body/div/div[contains(@class, 'section details')]/div[contains(@class, 'issue-container')]"
+ )
+ table_contents_xpath = "/html/body/div/div[contains(@class, 'section') and .//table[contains(@class, 'issue-table')]]"
+ description_headers = ["issue detail", "issue description"]
+ request_response_headers = ["request", "response"]
+ impact_headers = ["issue background", "issue remediation"]
+ mitigation_headers = ["remediation detail", "remediation background"]
+ references_headers = ["vulnerability classifications", "references"]
+
def get_scan_types(self):
return ["Burp Enterprise Scan"]
@@ -19,230 +29,231 @@ def get_description_for_scan_types(self, scan_type):
return "Import Burp Enterprise Edition findings in HTML format"
def get_findings(self, filename, test):
- parser = etree.HTMLParser()
- tree = etree.parse(filename, parser)
+ tree = html.parse(filename)
if tree:
return self.get_items(tree, test)
return ()
- def get_content(self, container):
+ def _get_endpoints_title_severity_mapping(self, tree: etree.ElementTree) -> dict[str, str]:
+ """
+ Construct a dict that contains mappings of endpoints and severities by a a title key.
+
+ Example: {
+ "finding-title": {
+ "title": "finding-title",
+ "severity: "Medium",
+ "cwe": None,
+ "endpoints: [
+ "http://127.0.0.1/path/A",
+ "http://127.0.0.1/path/B",
+ ],
+ }
+ }
+ """
+ finding_mapping = {}
+ table_contents = tree.xpath(self.table_contents_xpath)
+ for table in table_contents:
+ # There is only one header in this div, so we will get a string back here
+ base_endpoint = table.xpath("h1")[0].text.replace("Issues found on ", "").removesuffix("/")
+ # Iterate over the table of endpoint paths and severities
+ title = None
+ for entry in table.xpath("table[contains(@class, 'issue-table')]/tbody/tr"):
+ # The etree.element with a class of "issue-type-row" is the title of the finding
+ if "issue-type-row" in entry.classes:
+ # The structure of this section is consistent
+ # +
{{ system_settings.disclaimer }}
+tags from HTML strings to avoid importing yet-another-library. + Args: html_string: The HMTL string to remove
tags from Returns: The original string stipped of paragraph tags + """ return re.sub(r"
|
", "", html_string) def _convert_attack_vectors_to_endpoints( - self, attack_vectors: List[dict], - ) -> List["Endpoint"]: + self, attack_vectors: list[dict], + ) -> list["Endpoint"]: """ Takes a list of Attack Vectors dictionaries from the WhiteHat vuln API and converts them to Defect Dojo Endpoints @@ -194,12 +203,13 @@ def _convert_whitehat_sentinel_vulns_to_dojo_finding( whitehat_sentinel_vulns: The vuln dictionary from WhiteHat Sentinel vuln API test: The test ID that the DefectDojo finding should be associated with Returns: A DefectDojo Finding object + """ dupes = {} for whitehat_vuln in whitehat_sentinel_vulns: date_created = whitehat_vuln["found"].split("T")[0] - mitigated_ts = whitehat_vuln.get("closed".split("T")[0], None) + mitigated_ts = whitehat_vuln.get("closed", None) if mitigated_ts is not None: mitigated_ts = datetime.strptime(mitigated_ts, "%Y-%m-%dT%H:%M:%SZ") cwe = self._parse_cwe_from_tags( diff --git a/dojo/tools/wpscan/parser.py b/dojo/tools/wpscan/parser.py index 95c0a8c4c20..2ba6b5016b7 100755 --- a/dojo/tools/wpscan/parser.py +++ b/dojo/tools/wpscan/parser.py @@ -1,6 +1,6 @@ +import datetime import hashlib import json -from datetime import datetime from dojo.models import Endpoint, Finding @@ -89,7 +89,7 @@ def get_findings(self, file, test): report_date = None if "start_time" in tree: - report_date = datetime.utcfromtimestamp(tree.get("start_time")) + report_date = datetime.datetime.fromtimestamp(tree.get("start_time"), datetime.UTC) dupes = {} # manage plugin findings diff --git a/dojo/tools/xanitizer/parser.py b/dojo/tools/xanitizer/parser.py index b6a7cabdd55..b4eca87b40f 100755 --- a/dojo/tools/xanitizer/parser.py +++ b/dojo/tools/xanitizer/parser.py @@ -85,15 +85,9 @@ def generate_title(self, finding, line): cl = finding.find("class") file = finding.find("file") if pckg is not None and cl is not None: - if line: - title = f"{title} ({pckg.text}.{cl.text}:{line})" - else: - title = f"{title} ({pckg.text}.{cl.text})" + title = f"{title} ({pckg.text}.{cl.text}:{line})" if line else f"{title} ({pckg.text}.{cl.text})" else: - if line: - title = f"{title} ({file.text}:{line})" - else: - title = f"{title} ({file.text})" + title = f"{title} ({file.text}:{line})" if line else f"{title} ({file.text})" return title diff --git a/dojo/user/views.py b/dojo/user/views.py index fb260deeb92..3660f7406bd 100755 --- a/dojo/user/views.py +++ b/dojo/user/views.py @@ -231,10 +231,7 @@ def view_profile(request): group_members = get_authorized_group_members_for_user(user) user_contact = user.usercontactinfo if hasattr(user, "usercontactinfo") else None - if user_contact is None: - contact_form = UserContactInfoForm() - else: - contact_form = UserContactInfoForm(instance=user_contact) + contact_form = UserContactInfoForm() if user_contact is None else UserContactInfoForm(instance=user_contact) global_role = user.global_role if hasattr(user, "global_role") else None if global_role is None: @@ -397,16 +394,10 @@ def edit_user(request, uid): form = EditDojoUserForm(instance=user) user_contact = user.usercontactinfo if hasattr(user, "usercontactinfo") else None - if user_contact is None: - contact_form = UserContactInfoForm() - else: - contact_form = UserContactInfoForm(instance=user_contact) + contact_form = UserContactInfoForm() if user_contact is None else UserContactInfoForm(instance=user_contact) global_role = user.global_role if hasattr(user, "global_role") else None - if global_role is None: - global_role_form = GlobalRoleForm() - else: - global_role_form = GlobalRoleForm(instance=global_role) + global_role_form = GlobalRoleForm() if global_role is None else GlobalRoleForm(instance=global_role) if request.method == "POST": form = EditDojoUserForm(request.POST, instance=user) diff --git a/dojo/utils.py b/dojo/utils.py index 7a320538040..bafd180e531 100644 --- a/dojo/utils.py +++ b/dojo/utils.py @@ -9,9 +9,10 @@ import re import json from calendar import monthrange +from collections.abc import Callable from datetime import date, datetime, timedelta from math import pi, sqrt -from typing import Callable, Optional +from pathlib import Path import bleach import crum @@ -91,6 +92,7 @@ def do_false_positive_history(finding, *args, **kwargs): Args: finding (:model:`dojo.Finding`): Finding to be replicated + """ to_mark_as_fp = set() @@ -152,6 +154,7 @@ def match_finding_to_existing_findings(finding, product=None, engagement=None, t product (:model:`dojo.Product`, optional): Product to filter findings by engagement (:model:`dojo.Engagement`, optional): Engagement to filter findings by test (:model:`dojo.Test`, optional): Test to filter findings by + """ if product: custom_filter_type = "product" @@ -792,11 +795,7 @@ def is_title_in_breadcrumbs(title): if breadcrumbs is None: return False - for breadcrumb in breadcrumbs: - if breadcrumb.get("title") == title: - return True - - return False + return any(breadcrumb.get("title") == title for breadcrumb in breadcrumbs) def get_punchcard_data(objs, start_date, weeks, view="Finding"): @@ -1169,71 +1168,135 @@ def opened_in_period(start_date, end_date, **kwargs): end_date.month, end_date.day, tzinfo=timezone.get_current_timezone()) - opened_in_period = Finding.objects.filter( - date__range=[start_date, end_date], - **kwargs, - verified=True, - false_p=False, - duplicate=False, - out_of_scope=False, - mitigated__isnull=True, - severity__in=( - "Critical", "High", "Medium", - "Low")).values("numerical_severity").annotate( - Count("numerical_severity")).order_by("numerical_severity") - total_opened_in_period = Finding.objects.filter( - date__range=[start_date, end_date], - **kwargs, - verified=True, - false_p=False, - duplicate=False, - out_of_scope=False, - mitigated__isnull=True, - severity__in=("Critical", "High", "Medium", "Low")).aggregate( - total=Sum( - Case( - When( - severity__in=("Critical", "High", "Medium", "Low"), - then=Value(1)), - output_field=IntegerField())))["total"] - - oip = { - "S0": - 0, - "S1": - 0, - "S2": - 0, - "S3": - 0, - "Total": - total_opened_in_period, - "start_date": - start_date, - "end_date": - end_date, - "closed": - Finding.objects.filter( - mitigated__date__range=[start_date, end_date], + if get_system_setting("enforce_verified_status", True): + opened_in_period = Finding.objects.filter( + date__range=[start_date, end_date], **kwargs, + verified=True, + false_p=False, + duplicate=False, + out_of_scope=False, + mitigated__isnull=True, + severity__in=( + "Critical", "High", "Medium", + "Low")).values("numerical_severity").annotate( + Count("numerical_severity")).order_by("numerical_severity") + total_opened_in_period = Finding.objects.filter( + date__range=[start_date, end_date], + **kwargs, + verified=True, + false_p=False, + duplicate=False, + out_of_scope=False, + mitigated__isnull=True, severity__in=("Critical", "High", "Medium", "Low")).aggregate( total=Sum( Case( When( severity__in=("Critical", "High", "Medium", "Low"), then=Value(1)), - output_field=IntegerField())))["total"], - "to_date_total": - Finding.objects.filter( - date__lte=end_date.date(), - verified=True, + output_field=IntegerField())))["total"] + + oip = { + "S0": + 0, + "S1": + 0, + "S2": + 0, + "S3": + 0, + "Total": + total_opened_in_period, + "start_date": + start_date, + "end_date": + end_date, + "closed": + Finding.objects.filter( + mitigated__date__range=[start_date, end_date], + **kwargs, + severity__in=("Critical", "High", "Medium", "Low")).aggregate( + total=Sum( + Case( + When( + severity__in=("Critical", "High", "Medium", "Low"), + then=Value(1)), + output_field=IntegerField())))["total"], + "to_date_total": + Finding.objects.filter( + date__lte=end_date.date(), + verified=True, + false_p=False, + duplicate=False, + out_of_scope=False, + mitigated__isnull=True, + **kwargs, + severity__in=("Critical", "High", "Medium", "Low")).count(), + } + else: + opened_in_period = Finding.objects.filter( + date__range=[start_date, end_date], + **kwargs, false_p=False, duplicate=False, out_of_scope=False, mitigated__isnull=True, + severity__in=( + "Critical", "High", "Medium", + "Low")).values("numerical_severity").annotate( + Count("numerical_severity")).order_by("numerical_severity") + total_opened_in_period = Finding.objects.filter( + date__range=[start_date, end_date], **kwargs, - severity__in=("Critical", "High", "Medium", "Low")).count(), - } + false_p=False, + duplicate=False, + out_of_scope=False, + mitigated__isnull=True, + severity__in=("Critical", "High", "Medium", "Low")).aggregate( + total=Sum( + Case( + When( + severity__in=("Critical", "High", "Medium", "Low"), + then=Value(1)), + output_field=IntegerField())))["total"] + + oip = { + "S0": + 0, + "S1": + 0, + "S2": + 0, + "S3": + 0, + "Total": + total_opened_in_period, + "start_date": + start_date, + "end_date": + end_date, + "closed": + Finding.objects.filter( + mitigated__date__range=[start_date, end_date], + **kwargs, + severity__in=("Critical", "High", "Medium", "Low")).aggregate( + total=Sum( + Case( + When( + severity__in=("Critical", "High", "Medium", "Low"), + then=Value(1)), + output_field=IntegerField())))["total"], + "to_date_total": + Finding.objects.filter( + date__lte=end_date.date(), + false_p=False, + duplicate=False, + out_of_scope=False, + mitigated__isnull=True, + **kwargs, + severity__in=("Critical", "High", "Medium", "Low")).count(), + } for o in opened_in_period: oip[o["numerical_severity"]] = o["numerical_severity__count"] @@ -1295,15 +1358,9 @@ def build_query(query_string, search_fields): for field_name in search_fields: q = Q(**{f"{field_name}__icontains": term}) - if or_query: - or_query = or_query | q - else: - or_query = q + or_query = or_query | q if or_query else q - if query: - query = query & or_query - else: - query = or_query + query = query & or_query if query else or_query return query @@ -1346,11 +1403,12 @@ def get_page_items_and_count(request, items, page_size, prefix="", do_count=True def handle_uploaded_threat(f, eng): - _name, extension = os.path.splitext(f.name) + path = Path(f.name) + extension = path.suffix # Check if threat folder exist. - if not os.path.isdir(settings.MEDIA_ROOT + "/threat/"): + if not Path(settings.MEDIA_ROOT + "/threat/").is_dir(): # Create the folder - os.mkdir(settings.MEDIA_ROOT + "/threat/") + Path(settings.MEDIA_ROOT + "/threat/").mkdir() with open(settings.MEDIA_ROOT + f"/threat/{eng.id}{extension}", "wb+") as destination: for chunk in f.chunks(): @@ -1360,7 +1418,8 @@ def handle_uploaded_threat(f, eng): def handle_uploaded_selenium(f, cred): - _name, extension = os.path.splitext(f.name) + path = Path(f.name) + extension = path.suffix with open(settings.MEDIA_ROOT + f"/selenium/{cred.id}{extension}", "wb+") as destination: for chunk in f.chunks(): @@ -1556,14 +1615,18 @@ def calculate_grade(product, *args, **kwargs): if system_settings.enable_product_grade: logger.debug("calculating product grade for %s:%s", product.id, product.name) - severity_values = Finding.objects.filter( - ~Q(severity="Info"), - active=True, - duplicate=False, - verified=True, - false_p=False, - test__engagement__product=product).values("severity").annotate( - Count("numerical_severity")).order_by() + findings = Finding.objects.filter( + ~Q(severity="Info"), + active=True, + duplicate=False, + false_p=False, + test__engagement__product=product) + + if get_system_setting("enforce_verified_status", True): + findings = findings.filter(verified=True) + + severity_values = findings.values("severity").annotate( + Count("numerical_severity")).order_by() low = 0 medium = 0 @@ -1818,7 +1881,7 @@ def get_return_url(request): return_url = request.POST.get("return_url", None) if return_url is None or not return_url.strip(): # for some reason using request.GET.get('return_url') never works - return_url = request.GET["return_url"] if "return_url" in request.GET else None + return_url = request.GET["return_url"] if "return_url" in request.GET else None # noqa: SIM401 return return_url or None @@ -2024,7 +2087,7 @@ def _create_notifications(): if sla_age is None: sla_age = 0 - if (sla_age < 0) and (settings.SLA_NOTIFY_POST_BREACH < abs(sla_age)): + if (sla_age < 0) and (abs(sla_age) > settings.SLA_NOTIFY_POST_BREACH): post_breach_no_notify_count += 1 # Skip finding notification if breached for too long logger.debug(f"Finding {finding.id} breached the SLA {abs(sla_age)} days ago. Skipping notifications.") @@ -2271,7 +2334,7 @@ def mass_model_updater(model_type, models, function, fields, page_size=1000, ord def to_str_typed(obj): - """for code that handles multiple types of objects, print not only __str__ but prefix the type of the object""" + """For code that handles multiple types of objects, print not only __str__ but prefix the type of the object""" return f"{type(obj)}: {obj}" @@ -2280,7 +2343,7 @@ def get_product(obj): if not obj: return None - if isinstance(obj, Finding) or isinstance(obj, Finding_Group): + if isinstance(obj, Finding | Finding_Group): return obj.test.engagement.product if isinstance(obj, Test): @@ -2636,7 +2699,7 @@ def get_open_findings_burndown(product): return past_90_days -def get_custom_method(setting_name: str) -> Optional[Callable]: +def get_custom_method(setting_name: str) -> Callable | None: """ Attempts to load and return the method specified by fully-qualified name at the given setting. @@ -2677,7 +2740,9 @@ def generate_file_response_from_file_path( ) -> FileResponse: """Serve an local file in a uniformed way.""" # Determine the file path - file_path_without_extension, file_extension = os.path.splitext(file_path) + path = Path(file_path) + file_path_without_extension = path.parent / path.stem + file_extension = path.suffix # Determine the file name if not supplied if file_name is None: file_name = file_path_without_extension.rsplit("/")[-1] diff --git a/dojo/views.py b/dojo/views.py index ff0faed8c26..df65be4d6bd 100644 --- a/dojo/views.py +++ b/dojo/views.py @@ -1,5 +1,6 @@ import logging import os +from pathlib import Path from auditlog.models import LogEntry from django.conf import settings @@ -150,7 +151,7 @@ def manage_files(request, oid, obj_type): for o in files_formset.deleted_objects: logger.debug("removing file: %s", o.file.name) - os.remove(os.path.join(settings.MEDIA_ROOT, o.file.name)) + Path(os.path.join(settings.MEDIA_ROOT, o.file.name)).unlink() for o in files_formset.new_objects: logger.debug("adding file: %s", o.file.name) @@ -161,7 +162,7 @@ def manage_files(request, oid, obj_type): finding__isnull=True) for o in orphan_files: logger.debug("purging orphan file: %s", o.file.name) - os.remove(os.path.join(settings.MEDIA_ROOT, o.file.name)) + Path(os.path.join(settings.MEDIA_ROOT, o.file.name)).unlink() o.delete() messages.add_message( diff --git a/helm/defectdojo/.helmignore b/helm/defectdojo/.helmignore index 50af0317254..70909a86d60 100755 --- a/helm/defectdojo/.helmignore +++ b/helm/defectdojo/.helmignore @@ -20,3 +20,4 @@ .idea/ *.tmproj .vscode/ +README.md diff --git a/helm/defectdojo/Chart.lock b/helm/defectdojo/Chart.lock index 49d15928ea4..7a0e49b95de 100755 --- a/helm/defectdojo/Chart.lock +++ b/helm/defectdojo/Chart.lock @@ -1,12 +1,12 @@ dependencies: - name: postgresql repository: https://charts.bitnami.com/bitnami - version: 16.0.0 + version: 16.2.0 - name: postgresql-ha repository: https://charts.bitnami.com/bitnami version: 9.4.11 - name: redis repository: https://charts.bitnami.com/bitnami version: 19.6.4 -digest: sha256:43166002555f6bdaac719d3d54e56a3e069b17ed29acd1c70951b7b99b102ae7 -generated: "2024-10-02T16:37:38.736091938Z" +digest: sha256:0d2e729a1b07543cb813f80f5d05c67ad56817f1b44911e08245e43868f49301 +generated: "2024-11-14T10:51:48.400717864Z" diff --git a/helm/defectdojo/Chart.yaml b/helm/defectdojo/Chart.yaml index 5337b2b7059..4d63b24192b 100755 --- a/helm/defectdojo/Chart.yaml +++ b/helm/defectdojo/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: "2.39.4" +appVersion: "2.41.3" description: A Helm chart for Kubernetes to install DefectDojo name: defectdojo -version: 1.6.157 +version: 1.6.165 icon: https://www.defectdojo.org/img/favicon.ico maintainers: - name: madchap @@ -10,7 +10,7 @@ maintainers: url: https://github.com/DefectDojo/django-DefectDojo dependencies: - name: postgresql - version: ~16.0.0 + version: ~16.2.0 repository: "https://charts.bitnami.com/bitnami" condition: postgresql.enabled - name: postgresql-ha diff --git a/helm/defectdojo/README.md b/helm/defectdojo/README.md new file mode 120000 index 00000000000..5c0dd98ed0f --- /dev/null +++ b/helm/defectdojo/README.md @@ -0,0 +1 @@ +../../readme-docs/KUBERNETES.md \ No newline at end of file diff --git a/helm/defectdojo/templates/_helpers.tpl b/helm/defectdojo/templates/_helpers.tpl index 14256e88190..c3e0026c2ef 100755 --- a/helm/defectdojo/templates/_helpers.tpl +++ b/helm/defectdojo/templates/_helpers.tpl @@ -102,8 +102,12 @@ Create chart name and version as used by the chart label. {{- end -}} {{- define "initializer.jobname" -}} +{{- if .Values.initializer.staticName -}} +{{ .Release.Name }}-initializer +{{- else -}} {{ .Release.Name }}-initializer-{{- printf "%s" now | date "2006-01-02-15-04" -}} {{- end -}} +{{- end -}} {{/* Creates the array for DD_ALLOWED_HOSTS in configmap diff --git a/helm/defectdojo/templates/celery-beat-deployment.yaml b/helm/defectdojo/templates/celery-beat-deployment.yaml index 7eda46b8680..aedbb117275 100755 --- a/helm/defectdojo/templates/celery-beat-deployment.yaml +++ b/helm/defectdojo/templates/celery-beat-deployment.yaml @@ -10,6 +10,9 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }} helm.sh/chart: {{ include "defectdojo.chart" . }} + {{- with .Values.extraLabels }} + {{- toYaml . | nindent 4 }} + {{- end }} spec: replicas: {{ .Values.celery.beat.replicas }} {{- if .Values.revisionHistoryLimit }} @@ -28,8 +31,11 @@ spec: defectdojo.org/subcomponent: beat app.kubernetes.io/name: {{ include "defectdojo.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} - {{- if .Values.podLabels }} - {{- toYaml .Values.podLabels | nindent 8 }} + {{- with .Values.extraLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.podLabels }} + {{- toYaml . | nindent 8 }} {{- end }} annotations: {{- with .Values.celery.beat.annotations }} @@ -66,17 +72,14 @@ spec: path: {{ .hostPath }} {{- end }} {{- end }} - {{- if .Values.dbMigrationChecker.enabled }} + {{- if or .Values.dbMigrationChecker.enabled .Values.cloudsql.enabled }} initContainers: - {{$data := dict "fullName" $fullName }} - {{- $newContext := merge . (dict "fullName" $fullName) }} - {{- include "dbMigrationChecker" $newContext | nindent 6 }} {{- end }} - containers: {{- if .Values.cloudsql.enabled }} - name: cloudsql-proxy image: {{ .Values.cloudsql.image.repository }}:{{ .Values.cloudsql.image.tag }} imagePullPolicy: {{ .Values.cloudsql.image.pullPolicy }} + restartPolicy: Always securityContext: runAsNonRoot: true command: ["/cloud_sql_proxy"] @@ -92,6 +95,12 @@ spec: - "-ip_address_types=PRIVATE" {{- end }} {{- end }} + {{- if .Values.dbMigrationChecker.enabled }} + {{$data := dict "fullName" $fullName }} + {{- $newContext := merge . (dict "fullName" $fullName) }} + {{- include "dbMigrationChecker" $newContext | nindent 6 }} + {{- end }} + containers: - command: - /entrypoint-celery-beat.sh name: celery @@ -143,8 +152,8 @@ spec: secretKeyRef: name: {{ $fullName }} key: DD_SECRET_KEY - {{- if .Values.extraEnv }} - {{- toYaml .Values.extraEnv | nindent 8 }} + {{- with .Values.extraEnv }} + {{- toYaml . | nindent 8 }} {{- end }} resources: {{- toYaml .Values.celery.beat.resources | nindent 10 }} diff --git a/helm/defectdojo/templates/celery-worker-deployment.yaml b/helm/defectdojo/templates/celery-worker-deployment.yaml index f21be7a13be..c9505959bda 100755 --- a/helm/defectdojo/templates/celery-worker-deployment.yaml +++ b/helm/defectdojo/templates/celery-worker-deployment.yaml @@ -10,6 +10,9 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }} helm.sh/chart: {{ include "defectdojo.chart" . }} + {{- with .Values.extraLabels }} + {{- toYaml . | nindent 4 }} + {{- end }} spec: replicas: {{ .Values.celery.worker.replicas }} {{- if .Values.revisionHistoryLimit }} @@ -28,8 +31,11 @@ spec: defectdojo.org/subcomponent: worker app.kubernetes.io/name: {{ include "defectdojo.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} - {{- if .Values.podLabels }} - {{- toYaml .Values.podLabels | nindent 8 }} + {{- with .Values.extraLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.podLabels }} + {{- toYaml . | nindent 8 }} {{- end }} annotations: {{- with .Values.celery.worker.annotations }} @@ -64,17 +70,14 @@ spec: path: {{ .hostPath }} {{- end }} {{- end }} - {{- if .Values.dbMigrationChecker.enabled }} + {{- if or .Values.dbMigrationChecker.enabled .Values.cloudsql.enabled }} initContainers: - {{$data := dict "fullName" $fullName }} - {{- $newContext := merge . (dict "fullName" $fullName) }} - {{- include "dbMigrationChecker" $newContext | nindent 6 }} {{- end }} - containers: {{- if .Values.cloudsql.enabled }} - name: cloudsql-proxy image: {{ .Values.cloudsql.image.repository }}:{{ .Values.cloudsql.image.tag }} imagePullPolicy: {{ .Values.cloudsql.image.pullPolicy }} + restartPolicy: Always securityContext: runAsNonRoot: true command: ["/cloud_sql_proxy"] @@ -90,6 +93,12 @@ spec: - "-ip_address_types=PRIVATE" {{- end }} {{- end }} + {{- if .Values.dbMigrationChecker.enabled }} + {{$data := dict "fullName" $fullName }} + {{- $newContext := merge . (dict "fullName" $fullName) }} + {{- include "dbMigrationChecker" $newContext | nindent 6 }} + {{- end }} + containers: - name: celery image: "{{ template "celery.repository" . }}:{{ .Values.tag }}" imagePullPolicy: {{ .Values.imagePullPolicy }} @@ -138,8 +147,8 @@ spec: secretKeyRef: name: {{ $fullName }} key: DD_SECRET_KEY - {{- if .Values.extraEnv }} - {{- toYaml .Values.extraEnv | nindent 8 }} + {{- with .Values.extraEnv }} + {{- toYaml . | nindent 8 }} {{- end }} resources: {{- toYaml .Values.celery.worker.resources | nindent 10 }} diff --git a/helm/defectdojo/templates/configmap.yaml b/helm/defectdojo/templates/configmap.yaml index b5248a0a9ba..0d8c4a238e1 100755 --- a/helm/defectdojo/templates/configmap.yaml +++ b/helm/defectdojo/templates/configmap.yaml @@ -8,6 +8,9 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }} helm.sh/chart: {{ include "defectdojo.chart" . }} + {{- with .Values.extraLabels }} + {{- toYaml . | nindent 4 }} + {{- end }} data: DD_ADMIN_USER: {{ .Values.admin.user | default "admin" }} DD_ADMIN_MAIL: {{ .Values.admin.Mail | default "admin@defectdojo.local" }} @@ -18,7 +21,7 @@ data: DD_CELERY_BROKER_SCHEME: {{ if eq .Values.celery.broker "redis" }}{{ template "redis.scheme" . }}{{ end }} DD_CELERY_BROKER_USER: '' DD_CELERY_BROKER_HOST: {{ if eq .Values.celery.broker "redis" }}{{ template "redis.hostname" . }}{{ end }} - DD_CELERY_BROKER_PORT: '{{ if eq .Values.celery.broker "redis" }}{{ .Values.redis.master.service.ports.redis | default "6379" }}{{ end }}' + DD_CELERY_BROKER_PORT: '{{ if eq .Values.celery.broker "redis" }}{{- if ( hasKey .Values.redis "master" ) -}}{{ .Values.redis.master.service.ports.redis }}{{ else }}6379{{ end }}{{- end -}}' DD_CELERY_BROKER_PARAMS: '{{ if eq .Values.celery.broker "redis" }}{{- if .Values.redis.transportEncryption.enabled -}}{{ .Values.redis.transportEncryption.params | default "ssl_cert_reqs=optional" }}{{ end }}{{ end }}' DD_CELERY_BROKER_PATH: '{{ .Values.celery.path | default "//" }}' DD_CELERY_LOG_LEVEL: {{ .Values.celery.logLevel }} @@ -45,5 +48,5 @@ data: {{- if .Values.django.uwsgi.certificates.enabled }} REQUESTS_CA_BUNDLE: {{ .Values.django.uwsgi.certificates.certMountPath }}{{ .Values.django.uwsgi.certificates.certFileName }} {{- end }} -{{- if .Values.extraConfigs }} -{{ toYaml .Values.extraConfigs | indent 2 }}{{- end }} +{{- with .Values.extraConfigs }} + {{- toYaml . | nindent 2 }}{{- end }} diff --git a/helm/defectdojo/templates/django-deployment.yaml b/helm/defectdojo/templates/django-deployment.yaml index ce126f1cc28..5ef3dec50cc 100755 --- a/helm/defectdojo/templates/django-deployment.yaml +++ b/helm/defectdojo/templates/django-deployment.yaml @@ -9,6 +9,9 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }} helm.sh/chart: {{ include "defectdojo.chart" . }} + {{- with .Values.extraLabels }} + {{- toYaml . | nindent 4 }} + {{- end }} spec: replicas: {{ .Values.django.replicas }} {{- if .Values.revisionHistoryLimit }} @@ -25,9 +28,12 @@ spec: defectdojo.org/component: django app.kubernetes.io/name: {{ include "defectdojo.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} - {{- if .Values.podLabels }} - {{- toYaml .Values.podLabels | nindent 8 }} - {{- end }} + {{- with .Values.extraLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.podLabels }} + {{- toYaml . | nindent 8 }} + {{- end }} annotations: {{- with .Values.django.annotations }} {{- toYaml . | nindent 8 }} @@ -82,17 +88,14 @@ spec: emptyDir: {} {{- end }} {{- end }} - {{- if .Values.dbMigrationChecker.enabled }} + {{- if or .Values.dbMigrationChecker.enabled .Values.cloudsql.enabled }} initContainers: - {{$data := dict "fullName" $fullName }} - {{- $newContext := merge . (dict "fullName" $fullName) }} - {{- include "dbMigrationChecker" $newContext | nindent 6 }} {{- end }} - containers: {{- if .Values.cloudsql.enabled }} - name: cloudsql-proxy image: {{ .Values.cloudsql.image.repository }}:{{ .Values.cloudsql.image.tag }} imagePullPolicy: {{ .Values.cloudsql.image.pullPolicy }} + restartPolicy: Always securityContext: runAsNonRoot: true command: ["/cloud_sql_proxy"] @@ -108,6 +111,12 @@ spec: - "-ip_address_types=PRIVATE" {{- end }} {{- end }} + {{- if .Values.dbMigrationChecker.enabled }} + {{$data := dict "fullName" $fullName }} + {{- $newContext := merge . (dict "fullName" $fullName) }} + {{- include "dbMigrationChecker" $newContext | nindent 6 }} + {{- end }} + containers: {{- if and .Values.monitoring.enabled .Values.monitoring.prometheus.enabled }} - name: metrics image: {{ .Values.monitoring.prometheus.image }} @@ -155,11 +164,6 @@ spec: - name: http-uwsgi protocol: TCP containerPort: 8081 - {{- if .Values.django.uwsgi.enableDebug }} - - name: debug - protocol: TCP - containerPort: 3000 - {{- end }} envFrom: - configMapRef: name: {{ $fullName }} @@ -202,8 +206,8 @@ spec: value: {{- if or .Values.django.ingress.activateTLS .Values.django.nginx.tls.enabled }} "True" {{- else }} "False" {{- end }} - name: DD_CSRF_COOKIE_SECURE value: {{- if or .Values.django.ingress.activateTLS .Values.django.nginx.tls.enabled }} "True" {{- else }} "False" {{- end }} - {{- if .Values.extraEnv }} - {{- toYaml .Values.extraEnv | nindent 8 }} + {{- with .Values.extraEnv }} + {{- toYaml . | nindent 8 }} {{- end }} {{- if .Values.django.uwsgi.livenessProbe.enabled }} livenessProbe: @@ -260,6 +264,7 @@ spec: value: '{{ .Values.django.nginx.tls.enabled }}' - name: GENERATE_TLS_CERTIFICATE value: '{{ .Values.django.nginx.tls.generateCertificate }}' + {{- if .Values.django.uwsgi.livenessProbe.enabled }} livenessProbe: httpGet: path: /nginx_health @@ -270,10 +275,13 @@ spec: httpHeaders: - name: Host value: {{ .Values.host }} - initialDelaySeconds: 10 - periodSeconds: 10 - failureThreshold: 6 - {{- if .Values.django.uwsgi.livenessProbe.enabled }} + failureThreshold: {{ .Values.django.uwsgi.livenessProbe.failureThreshold }} + initialDelaySeconds: {{ .Values.django.uwsgi.livenessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.django.uwsgi.livenessProbe.periodSeconds }} + successThreshold: {{ .Values.django.uwsgi.livenessProbe.successThreshold }} + timeoutSeconds: {{ .Values.django.uwsgi.livenessProbe.timeoutSeconds }} + {{- end }} + {{- if .Values.django.uwsgi.readinessProbe.enabled }} readinessProbe: httpGet: path: /uwsgi_health @@ -284,11 +292,28 @@ spec: httpHeaders: - name: Host value: {{ .Values.host }} - failureThreshold: {{ .Values.django.uwsgi.livenessProbe.failureThreshold }} - initialDelaySeconds: {{ .Values.django.uwsgi.livenessProbe.initialDelaySeconds }} - periodSeconds: {{ .Values.django.uwsgi.livenessProbe.periodSeconds }} - successThreshold: {{ .Values.django.uwsgi.livenessProbe.successThreshold }} - timeoutSeconds: {{ .Values.django.uwsgi.livenessProbe.timeoutSeconds }} + failureThreshold: {{ .Values.django.uwsgi.readinessProbe.failureThreshold }} + initialDelaySeconds: {{ .Values.django.uwsgi.readinessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.django.uwsgi.readinessProbe.periodSeconds }} + successThreshold: {{ .Values.django.uwsgi.readinessProbe.successThreshold }} + timeoutSeconds: {{ .Values.django.uwsgi.readinessProbe.timeoutSeconds }} + {{- end }} + {{- if .Values.django.uwsgi.startupProbe.enabled }} + startupProbe: + httpGet: + path: /uwsgi_health + port: http + {{- if .Values.django.nginx.tls.enabled }} + scheme: HTTPS + {{- end }} + httpHeaders: + - name: Host + value: {{ .Values.host }} + failureThreshold: {{ .Values.django.uwsgi.startupProbe.failureThreshold }} + initialDelaySeconds: {{ .Values.django.uwsgi.startupProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.django.uwsgi.startupProbe.periodSeconds }} + successThreshold: {{ .Values.django.uwsgi.startupProbe.successThreshold }} + timeoutSeconds: {{ .Values.django.uwsgi.startupProbe.timeoutSeconds }} {{- end }} resources: {{- toYaml .Values.django.nginx.resources | nindent 10 }} diff --git a/helm/defectdojo/templates/django-ingress.yaml b/helm/defectdojo/templates/django-ingress.yaml index 73ea41404b9..9beecdda923 100755 --- a/helm/defectdojo/templates/django-ingress.yaml +++ b/helm/defectdojo/templates/django-ingress.yaml @@ -14,10 +14,13 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }} helm.sh/chart: {{ include "defectdojo.chart" . }} + {{- with .Values.extraLabels }} + {{- toYaml . | nindent 4 }} + {{- end }} {{- if or .Values.django.ingress.annotations .Values.gke.useGKEIngress }} annotations: {{- with .Values.django.ingress.annotations }} -{{ toYaml . | indent 4 }} + {{- toYaml . | nindent 4 }} {{- end }} {{- if .Values.gke.useGKEIngress }} kubernetes.io/ingress.class: gce diff --git a/helm/defectdojo/templates/django-service.yaml b/helm/defectdojo/templates/django-service.yaml index b64f3a05570..3823886bbd2 100755 --- a/helm/defectdojo/templates/django-service.yaml +++ b/helm/defectdojo/templates/django-service.yaml @@ -9,6 +9,9 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }} helm.sh/chart: {{ include "defectdojo.chart" . }} + {{- with .Values.extraLabels }} + {{- toYaml . | nindent 4 }} + {{- end }} {{- if .Values.django.service.annotations }} annotations: {{- range $key, $value := .Values.django.service.annotations }} diff --git a/helm/defectdojo/templates/extra-secret.yaml b/helm/defectdojo/templates/extra-secret.yaml index a21e8e27ba6..21f9a9507ee 100755 --- a/helm/defectdojo/templates/extra-secret.yaml +++ b/helm/defectdojo/templates/extra-secret.yaml @@ -9,6 +9,9 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }} helm.sh/chart: {{ include "defectdojo.chart" . }} + {{- with .Values.extraLabels }} + {{- toYaml . | nindent 4 }} + {{- end }} type: Opaque data: {{- range $key, $value := .Values.extraSecrets }} diff --git a/helm/defectdojo/templates/initializer-job.yaml b/helm/defectdojo/templates/initializer-job.yaml index b078a1fdc64..60d82b9f2d7 100755 --- a/helm/defectdojo/templates/initializer-job.yaml +++ b/helm/defectdojo/templates/initializer-job.yaml @@ -10,20 +10,28 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }} helm.sh/chart: {{ include "defectdojo.chart" . }} + {{- with .Values.extraLabels }} + {{- toYaml . | nindent 4 }} + {{- end }} annotations: {{- with .Values.initializer.jobAnnotations }} {{- toYaml . | nindent 4 }} {{- end }} spec: + {{- if and (int .Values.initializer.keepSeconds) (gt (int .Values.initializer.keepSeconds) 0) }} ttlSecondsAfterFinished: {{ .Values.initializer.keepSeconds }} + {{- end }} template: metadata: labels: defectdojo.org/component: initializer app.kubernetes.io/name: {{ include "defectdojo.name" . }} app.kubernetes.io/instance: {{ .Release.Name }} - {{- if .Values.initializer.labels }} - {{- toYaml .Values.initializer.labels | nindent 8 }} + {{- with .Values.extraLabels }} + {{- toYaml . | nindent 8 }} + {{- end -}} + {{- with .Values.initializer.labels }} + {{- toYaml . | nindent 8 }} {{- end }} annotations: {{- with .Values.initializer.annotations }} @@ -49,28 +57,11 @@ spec: {{- end }} {{- end }} initContainers: - - name: wait-for-db - command: - - '/bin/bash' - - '-c' - - '/wait-for-it.sh ${DD_DATABASE_HOST:-postgres}:${DD_DATABASE_PORT:-5432} -t 300 -s -- /bin/echo Database is up' - image: '{{ template "django.uwsgi.repository" . }}:{{ .Values.tag }}' - imagePullPolicy: {{ .Values.imagePullPolicy }} - {{- if .Values.securityContext.enabled }} - securityContext: - {{- toYaml .Values.securityContext.djangoSecurityContext | nindent 10 }} - {{- end }} - envFrom: - - configMapRef: - name: {{ $fullName }} - - secretRef: - name: {{ $fullName }} - optional: true - containers: {{- if .Values.cloudsql.enabled }} - name: cloudsql-proxy image: {{ .Values.cloudsql.image.repository }}:{{ .Values.cloudsql.image.tag }} imagePullPolicy: {{ .Values.cloudsql.image.pullPolicy }} + restartPolicy: Always securityContext: runAsNonRoot: true command: ["/cloud_sql_proxy"] @@ -86,6 +77,28 @@ spec: - "-ip_address_types=PRIVATE" {{- end }} {{- end }} + - name: wait-for-db + command: + - '/bin/bash' + - '-c' + - '/wait-for-it.sh ${DD_DATABASE_HOST:-postgres}:${DD_DATABASE_PORT:-5432} -t 300 -s -- /bin/echo Database is up' + image: '{{ template "django.uwsgi.repository" . }}:{{ .Values.tag }}' + imagePullPolicy: {{ .Values.imagePullPolicy }} + {{- if .Values.securityContext.enabled }} + securityContext: + {{- toYaml .Values.securityContext.djangoSecurityContext | nindent 10 }} + {{- end }} + envFrom: + - configMapRef: + name: {{ $fullName }} + - secretRef: + name: {{ $fullName }} + optional: true + env: + {{- with .Values.extraEnv }} + {{- toYaml . | nindent 8 }} + {{- end }} + containers: - name: initializer image: "{{ template "initializer.repository" . }}:{{ .Values.tag }}" imagePullPolicy: {{ .Values.imagePullPolicy }} @@ -118,8 +131,8 @@ spec: name: {{ .Values.postgresqlha.postgresql.existingSecret }} key: postgresql-postgres-password {{- end }} - {{- if .Values.extraEnv }} - {{- toYaml .Values.extraEnv | nindent 8 }} + {{- with .Values.extraEnv }} + {{- toYaml . | nindent 8 }} {{- end }} resources: {{- toYaml .Values.initializer.resources | nindent 10 }} diff --git a/helm/defectdojo/templates/media-pvc.yaml b/helm/defectdojo/templates/media-pvc.yaml index 1eba1977e9f..c1ca40050d4 100755 --- a/helm/defectdojo/templates/media-pvc.yaml +++ b/helm/defectdojo/templates/media-pvc.yaml @@ -10,6 +10,9 @@ metadata: app.kubernetes.io/instance: {{ $.Release.Name }} app.kubernetes.io/managed-by: {{ $.Release.Service }} helm.sh/chart: {{ include "defectdojo.chart" $ }} + {{- with .Values.extraLabels }} + {{- toYaml . | nindent 4 }} + {{- end }} name: {{ $fullName }} spec: accessModes: diff --git a/helm/defectdojo/templates/network-policy.yaml b/helm/defectdojo/templates/network-policy.yaml index 80c55ddcfa3..ea0017fb1e6 100755 --- a/helm/defectdojo/templates/network-policy.yaml +++ b/helm/defectdojo/templates/network-policy.yaml @@ -9,26 +9,29 @@ metadata: app.kubernetes.io/managed-by: {{ .Release.Service }} helm.sh/chart: {{ include "defectdojo.chart" . }} app.kubernetes.io/name: {{ include "defectdojo.name" . }} + {{- with .Values.extraLabels }} + {{- toYaml . | nindent 4 }} + {{- end }} spec: podSelector: matchLabels: app.kubernetes.io/instance: {{ .Release.Name }} - {{- if .Values.networkPolicy.ingress}} + {{- if .Values.networkPolicy.ingress }} ingress: - {{- toYaml .Values.networkPolicy.ingress | nindent 4 }} + {{- toYaml .Values.networkPolicy.ingress | nindent 4 }} {{- else }} ingress: - from: - podSelector: matchLabels: app.kubernetes.io/instance: {{ .Release.Name }} - {{- if .Values.networkPolicy.ingressExtend }} - {{- toYaml .Values.networkPolicy.ingressExtend | nindent 8 }} + {{- with .Values.networkPolicy.ingressExtend }} + {{- toYaml . | nindent 8 }} {{ end }} {{- end }} - {{- if .Values.networkPolicy.egress }} + {{- with .Values.networkPolicy.egress }} egress: - {{- toYaml .Values.networkPolicy.egress | nindent 4 }} + {{- toYaml . | nindent 4 }} {{ end }} --- apiVersion: networking.k8s.io/v1 @@ -40,6 +43,9 @@ metadata: app.kubernetes.io/managed-by: {{ .Release.Service }} helm.sh/chart: {{ include "defectdojo.chart" . }} app.kubernetes.io/name: {{ include "defectdojo.name" . }} +{{- with .Values.extraLabels }} + {{- toYaml . | nindent 4 }} +{{- end }} spec: podSelector: matchLabels: diff --git a/helm/defectdojo/templates/sa.yaml b/helm/defectdojo/templates/sa.yaml index 46f1eaa6d97..23cb70ecd6e 100755 --- a/helm/defectdojo/templates/sa.yaml +++ b/helm/defectdojo/templates/sa.yaml @@ -8,6 +8,9 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }} helm.sh/chart: {{ include "defectdojo.chart" . }} + {{- with .Values.extraLabels }} + {{- toYaml . | nindent 4 }} + {{- end }} annotations: helm.sh/resource-policy: keep helm.sh/hook: "pre-install" diff --git a/helm/defectdojo/templates/secret-postgresql-ha-pgpool.yaml b/helm/defectdojo/templates/secret-postgresql-ha-pgpool.yaml index 9a440efffd1..40906c1f180 100755 --- a/helm/defectdojo/templates/secret-postgresql-ha-pgpool.yaml +++ b/helm/defectdojo/templates/secret-postgresql-ha-pgpool.yaml @@ -8,6 +8,9 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }} helm.sh/chart: {{ include "defectdojo.chart" . }} + {{- with .Values.extraLabels }} + {{- toYaml . | nindent 4 }} + {{- end }} annotations: helm.sh/resource-policy: keep helm.sh/hook: "pre-install" diff --git a/helm/defectdojo/templates/secret-postgresql-ha.yaml b/helm/defectdojo/templates/secret-postgresql-ha.yaml index 8e884fa0484..e9236a63f00 100755 --- a/helm/defectdojo/templates/secret-postgresql-ha.yaml +++ b/helm/defectdojo/templates/secret-postgresql-ha.yaml @@ -8,6 +8,9 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }} helm.sh/chart: {{ include "defectdojo.chart" . }} + {{- with .Values.extraLabels }} + {{- toYaml . | nindent 4 }} + {{- end }} annotations: helm.sh/resource-policy: keep helm.sh/hook: "pre-install" diff --git a/helm/defectdojo/templates/secret-postgresql.yaml b/helm/defectdojo/templates/secret-postgresql.yaml index de6e65420b6..115c244baa5 100755 --- a/helm/defectdojo/templates/secret-postgresql.yaml +++ b/helm/defectdojo/templates/secret-postgresql.yaml @@ -8,6 +8,9 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }} helm.sh/chart: {{ include "defectdojo.chart" . }} + {{- with .Values.extraLabels }} + {{- toYaml . | nindent 4 }} + {{- end }} annotations: helm.sh/resource-policy: keep helm.sh/hook: "pre-install" diff --git a/helm/defectdojo/templates/secret-redis.yaml b/helm/defectdojo/templates/secret-redis.yaml index 629e6b4fa93..de4549c1f63 100755 --- a/helm/defectdojo/templates/secret-redis.yaml +++ b/helm/defectdojo/templates/secret-redis.yaml @@ -8,6 +8,9 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }} helm.sh/chart: {{ include "defectdojo.chart" . }} + {{- with .Values.extraLabels }} + {{- toYaml . | nindent 4 }} + {{- end }} annotations: helm.sh/resource-policy: keep helm.sh/hook: "pre-install" diff --git a/helm/defectdojo/templates/secret.yaml b/helm/defectdojo/templates/secret.yaml index 94ca3ef268b..500a097dd16 100755 --- a/helm/defectdojo/templates/secret.yaml +++ b/helm/defectdojo/templates/secret.yaml @@ -9,6 +9,9 @@ metadata: app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }} helm.sh/chart: {{ include "defectdojo.chart" . }} + {{- with .Values.extraLabels }} + {{- toYaml . | nindent 4 }} + {{- end }} annotations: helm.sh/resource-policy: keep helm.sh/hook: "pre-install" diff --git a/helm/defectdojo/values.yaml b/helm/defectdojo/values.yaml index 67c41eeab3d..8cd5d0aca3b 100755 --- a/helm/defectdojo/values.yaml +++ b/helm/defectdojo/values.yaml @@ -16,6 +16,9 @@ createPostgresqlHaPgpoolSecret: false # - enabled, enables tracking configuration changes based on SHA256 # trackConfig: disabled +# extraLabels: {} +# Add extra labels for k8s + # Enables application network policy # For more info follow https://kubernetes.io/docs/concepts/services-networking/network-policies/ networkPolicy: @@ -234,13 +237,29 @@ django: tolerations: [] uwsgi: livenessProbe: - # Enable liveness checks on uwsgi container. Those values are use on nginx readiness checks as well. + # Enable liveness checks on uwsgi container. enabled: true failureThreshold: 6 - initialDelaySeconds: 3 + initialDelaySeconds: 0 periodSeconds: 10 successThreshold: 1 timeoutSeconds: 5 + readinessProbe: + # Enable readiness checks on uwsgi container. + enabled: true + failureThreshold: 6 + initialDelaySeconds: 0 + periodSeconds: 10 + successThreshold: 1 + timeoutSeconds: 5 + startupProbe: + # Enable startup checks on uwsgi container. + enabled: true + failureThreshold: 30 + initialDelaySeconds: 0 + periodSeconds: 5 + successThreshold: 1 + timeoutSeconds: 1 resources: requests: cpu: 100m @@ -321,7 +340,7 @@ initializer: jobAnnotations: {} annotations: {} labels: {} - keepSeconds: 60 + keepSeconds: 60 # A positive integer will keep this Job and Pod deployed for the specified number of seconds, after which they will be removed. For all other values, the Job and Pod will remain deployed. affinity: {} nodeSelector: {} resources: @@ -365,6 +384,11 @@ initializer: # @type: array