v3 labels

Author: dogboat

.github/workflows/integration-tests.yml

@@ -41,7 +41,15 @@ jobs:
           "tests/notifications_test.py",
           "tests/tool_config.py",
           "openapi-validatator",
-
+          # V3 migration
+          "tests/asset_group_test.py",
+          "tests/asset_member_test.py",
+          "tests/asset_test.py",
+          "tests/organization_group_test.py",
+          "tests/organization_member_test.py",
+          "tests/organization_test.py",
+          # v2; can be removed after v3 migration complete
+          "tests/report_builder_test_v2.py",
         ]
         os: [alpine, debian]
       fail-fast: false

dojo/api_v2/views.py

@@ -85,6 +85,7 @@
     get_authorized_jira_issues,
     get_authorized_jira_projects,
 )
+from dojo.labels import get_labels
 from dojo.models import (
     Announcement,
     Answer,
@@ -179,6 +180,9 @@
 logger = logging.getLogger(__name__)
 
 
+labels = get_labels()
+
+
 def schema_with_prefetch() -> dict:
     return {
         "list": extend_schema(
@@ -2725,7 +2729,7 @@ def report_generate(request, obj, options):
     if type(obj).__name__ == "Product_Type":
         product_type = obj
 
-        report_name = "Product Type Report: " + str(product_type)
+        report_name = labels.ORG_REPORT_WITH_NAME_TITLE % {"name": str(product_type)}
 
         findings = report_finding_filter_class(
             request.GET,
@@ -2754,7 +2758,7 @@ def report_generate(request, obj, options):
     elif type(obj).__name__ == "Product":
         product = obj
 
-        report_name = "Product Report: " + str(product)
+        report_name = labels.ASSET_REPORT_WITH_NAME_TITLE % {"name": str(product)}
 
         findings = report_finding_filter_class(
             request.GET,

dojo/context_processors.py

@@ -5,6 +5,7 @@
 from django.conf import settings
 
 from dojo.models import Alerts, System_Settings, UserAnnouncement
+from dojo.labels import get_labels
 
 
 def globalize_vars(request):
@@ -74,3 +75,9 @@ def session_expiry_notification(request):
         return {
             "session_notify_time": notify_time,
         }
+
+
+def labels(request):
+    return {
+        "labels": get_labels(),
+    }

dojo/db_migrations/0243_system_settings_enable_v3_migration.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.1.11 on 2025-08-22 12:49
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dojo', '0242_file_upload_cleanup'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='system_settings',
+            name='enable_v3_migration',
+            field=models.BooleanField(default=True, help_text='Whether to use features and labels associated with V3.', verbose_name='Enable V3 Migration'),
+        ),
+    ]

dojo/filters.py

@@ -37,6 +37,7 @@
 from dojo.engagement.queries import get_authorized_engagements
 from dojo.finding.queries import get_authorized_findings
 from dojo.group.queries import get_authorized_groups, get_group_member_roles
+from dojo.labels import get_labels
 from dojo.models import (
     EFFORT_FOR_FIXING_CHOICES,
     SEVERITY_CHOICES,
@@ -118,6 +119,8 @@
 
 logger = logging.getLogger(__name__)
 
+labels = get_labels()
+
 RE_DATE = re.compile(r"(\d{4})-(\d\d?)-(\d\d?)$")
 
 FINDING_STATUS = (("verified", "Verified"),
@@ -244,6 +247,11 @@ class Product_TypeForm(forms.ModelForm):
     description = forms.CharField(widget=forms.Textarea(attrs={}),
                                   required=False)
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.fields["critical_product"].label = labels.ORG_CRITICAL_PRODUCT_LABEL
+        self.fields["key_product"].label = labels.ORG_KEY_PRODUCT_LABEL
+
     class Meta:
         model = Product_Type
         fields = ["name", "description", "critical_product", "key_product"]
@@ -280,6 +288,7 @@ def __init__(self, *args, **kwargs):
         self.fields["users"].queryset = Dojo_User.objects.exclude(
             Q(is_superuser=True)
             | Q(id__in=current_members)).exclude(is_active=False).order_by("first_name", "last_name")
+        self.fields["product_type"].label = labels.ORG_LABEL
         self.fields["product_type"].disabled = True
 
     class Meta:
@@ -288,13 +297,14 @@ class Meta:
 
 
 class Add_Product_Type_Member_UserForm(forms.ModelForm):
-    product_types = forms.ModelMultipleChoiceField(queryset=Product_Type.objects.none(), required=True, label="Product Types")
+    product_types = forms.ModelMultipleChoiceField(queryset=Product_Type.objects.none(), required=True)
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         current_members = Product_Type_Member.objects.filter(user=self.initial["user"]).values_list("product_type", flat=True)
         self.fields["product_types"].queryset = get_authorized_product_types(Permissions.Product_Type_Member_Add_Owner) \
             .exclude(id__in=current_members)
+        self.fields["product_types"].label = labels.ORG_PLURAL_LABEL
         self.fields["user"].disabled = True
 
     class Meta:
@@ -306,6 +316,7 @@ class Delete_Product_Type_MemberForm(Edit_Product_Type_MemberForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.fields["role"].disabled = True
+        self.fields["product_type"].label = labels.ORG_LABEL
 
 
 class Test_TypeForm(forms.ModelForm):
@@ -331,8 +342,7 @@ class ProductForm(forms.ModelForm):
     description = forms.CharField(widget=forms.Textarea(attrs={}),
                                   required=True)
 
-    prod_type = forms.ModelChoiceField(label="Product Type",
-                                       queryset=Product_Type.objects.none(),
+    prod_type = forms.ModelChoiceField(queryset=Product_Type.objects.none(),
                                        required=True)
 
     sla_configuration = forms.ModelChoiceField(label="SLA Configuration",
@@ -347,6 +357,10 @@ class ProductForm(forms.ModelForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.fields["prod_type"].queryset = get_authorized_product_types(Permissions.Product_Type_Add_Product)
+        self.fields["prod_type"].label = labels.ORG_LABEL
+        self.fields["product_manager"].label = labels.ASSET_MANAGER_LABEL
+        self.fields["enable_product_tag_inheritance"].label = labels.ASSET_TAG_INHERITANCE_ENABLE_LABEL
+        self.fields["enable_product_tag_inheritance"].help_text = labels.ASSET_TAG_INHERITANCE_ENABLE_HELP
         if prod_type_id := kwargs.get("instance", Product()).prod_type_id:  # we are editing existing instance
             self.fields["prod_type"].queryset |= Product_Type.objects.filter(pk=prod_type_id)  # even if user does not have permission for any other ProdType we need to add at least assign ProdType to make form submittable (otherwise empty list was here which generated invalid form)
 
@@ -415,6 +429,7 @@ class Edit_Product_MemberForm(forms.ModelForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.fields["product"].disabled = True
+        self.fields["product"].label = labels.ASSET_LABEL
         self.fields["user"].queryset = Dojo_User.objects.order_by("first_name", "last_name")
         self.fields["user"].disabled = True
 
@@ -429,6 +444,7 @@ class Add_Product_MemberForm(forms.ModelForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.fields["product"].disabled = True
+        self.fields["product"].label = labels.ASSET_LABEL
         current_members = Product_Member.objects.filter(product=self.initial["product"]).values_list("user", flat=True)
         self.fields["users"].queryset = Dojo_User.objects.exclude(
             Q(is_superuser=True)
@@ -440,13 +456,14 @@ class Meta:
 
 
 class Add_Product_Member_UserForm(forms.ModelForm):
-    products = forms.ModelMultipleChoiceField(queryset=Product.objects.none(), required=True, label="Products")
+    products = forms.ModelMultipleChoiceField(queryset=Product.objects.none(), required=True)
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         current_members = Product_Member.objects.filter(user=self.initial["user"]).values_list("product", flat=True)
         self.fields["products"].queryset = get_authorized_products(Permissions.Product_Member_Add_Owner) \
             .exclude(id__in=current_members)
+        self.fields["products"].label = labels.ASSET_PLURAL_LABEL
         self.fields["user"].disabled = True
 
     class Meta:
@@ -608,6 +625,9 @@ def __init__(self, *args, **kwargs):
             choices.insert(0, ("", "---------"))
             self.fields["group_by"].choices = choices
 
+        self.fields["close_old_findings_product_scope"].label = labels.ASSET_FINDINGS_CLOSE_LABEL
+        self.fields["close_old_findings_product_scope"].help_text = labels.ASSET_FINDINGS_CLOSE_HELP
+
         self.endpoints_to_add_list = []
 
     def clean(self):
@@ -1003,9 +1023,8 @@ class EngForm(forms.ModelForm):
         ))
     description = forms.CharField(widget=forms.Textarea(attrs={}),
                                   required=False, help_text="Description of the engagement and details regarding the engagement.")
-    product = forms.ModelChoiceField(label="Product",
-                                       queryset=Product.objects.none(),
-                                       required=True)
+    product = forms.ModelChoiceField(queryset=Product.objects.none(),
+                                     required=True)
     target_start = forms.DateField(widget=forms.TextInput(
         attrs={"class": "datepicker", "autocomplete": "off"}))
     target_end = forms.DateField(widget=forms.TextInput(
@@ -1037,6 +1056,7 @@ def __init__(self, *args, **kwargs):
             self.fields["lead"].queryset = get_authorized_users(Permissions.Engagement_View).filter(is_active=True)
 
         self.fields["product"].queryset = get_authorized_products(Permissions.Engagement_Add)
+        self.fields["product"].label = labels.ASSET_LABEL
 
         # Don't show CICD fields on a interactive engagement
         if cicd is False:
@@ -1777,8 +1797,7 @@ class AddEndpointForm(forms.Form):
                                          "Each must be valid.",
                                widget=forms.widgets.Textarea(attrs={"rows": "15", "cols": "400"}))
     product = forms.CharField(required=True,
-                              widget=forms.widgets.HiddenInput(), help_text="The product this endpoint should be "
-                                                                            "associated with.")
+                              widget=forms.widgets.HiddenInput())
     tags = TagField(required=False,
                     help_text="Add tags that help describe this endpoint.  "
                               "Choose from the list or add new tags. Press Enter key to add.")
@@ -1788,7 +1807,10 @@ def __init__(self, *args, **kwargs):
         if "product" in kwargs:
             product = kwargs.pop("product")
         super().__init__(*args, **kwargs)
-        self.fields["product"] = forms.ModelChoiceField(queryset=get_authorized_products(Permissions.Endpoint_Add))
+        self.fields["product"] = forms.ModelChoiceField(
+            queryset=get_authorized_products(Permissions.Endpoint_Add),
+            label=labels.ASSET_LABEL,
+            help_text=labels.ASSET_ENDPOINT_HELP)
         if product is not None:
             self.fields["product"].initial = product.id
 
@@ -2195,6 +2217,7 @@ class Add_Product_GroupForm(forms.ModelForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.fields["product"].disabled = True
+        self.fields["product"].label = labels.ASSET_LABEL
         current_groups = Product_Group.objects.filter(product=self.initial["product"]).values_list("group", flat=True)
         authorized_groups = get_authorized_groups(Permissions.Group_View)
         authorized_groups = authorized_groups.exclude(id__in=current_groups)
@@ -2206,13 +2229,14 @@ class Meta:
 
 
 class Add_Product_Group_GroupForm(forms.ModelForm):
-    products = forms.ModelMultipleChoiceField(queryset=Product.objects.none(), required=True, label="Products")
+    products = forms.ModelMultipleChoiceField(queryset=Product.objects.none(), required=True)
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         current_members = Product_Group.objects.filter(group=self.initial["group"]).values_list("product", flat=True)
         self.fields["products"].queryset = get_authorized_products(Permissions.Product_Member_Add_Owner) \
             .exclude(id__in=current_members)
+        self.fields["products"].label = labels.ASSET_PLURAL_LABEL
         self.fields["group"].disabled = True
 
     class Meta:
@@ -2225,6 +2249,7 @@ class Edit_Product_Group_Form(forms.ModelForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.fields["product"].disabled = True
+        self.fields["product"].label = labels.ASSET_LABEL
         self.fields["group"].disabled = True
 
     class Meta:
@@ -2248,20 +2273,22 @@ def __init__(self, *args, **kwargs):
         authorized_groups = authorized_groups.exclude(id__in=current_groups)
         self.fields["groups"].queryset = authorized_groups
         self.fields["product_type"].disabled = True
+        self.fields["product_type"].label = labels.ORG_LABEL
 
     class Meta:
         model = Product_Type_Group
         fields = ["product_type", "groups", "role"]
 
 
 class Add_Product_Type_Group_GroupForm(forms.ModelForm):
-    product_types = forms.ModelMultipleChoiceField(queryset=Product_Type.objects.none(), required=True, label="Product Types")
+    product_types = forms.ModelMultipleChoiceField(queryset=Product_Type.objects.none(), required=True)
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         current_members = Product_Type_Group.objects.filter(group=self.initial["group"]).values_list("product_type", flat=True)
         self.fields["product_types"].queryset = get_authorized_product_types(Permissions.Product_Type_Member_Add_Owner) \
             .exclude(id__in=current_members)
+        self.fields["product_types"].label = labels.ORG_PLURAL_LABEL
         self.fields["group"].disabled = True
 
     class Meta:
@@ -2274,6 +2301,7 @@ class Edit_Product_Type_Group_Form(forms.ModelForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.fields["product_type"].disabled = True
+        self.fields["product_type"].label = labels.ORG_LABEL
         self.fields["group"].disabled = True
 
     class Meta:
@@ -2414,6 +2442,7 @@ class Meta:
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         current_user = get_current_user()
+        self.fields["role"].help_text = labels.ASSET_GLOBAL_ROLE_HELP
         if not current_user.is_superuser:
             self.fields["role"].disabled = True
 
@@ -2439,6 +2468,7 @@ class ProductTypeCountsForm(ProductCountsFormBase):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.fields["product_type"].queryset = get_authorized_product_types(Permissions.Product_Type_View)
+        self.fields["product_type"].label = labels.ORG_LABEL
 
 
 class ProductTagCountsForm(ProductCountsFormBase):
@@ -2452,6 +2482,7 @@ def __init__(self, *args, **kwargs):
         prods = get_authorized_products(Permissions.Product_View)
         tags_available_to_user = Product.tags.tag_model.objects.filter(product__in=prods)
         self.fields["product_tag"].queryset = tags_available_to_user
+        self.fields["product_tag"].label = labels.ASSET_TAG_LABEL
 
 
 class APIKeyForm(forms.ModelForm):
@@ -2932,6 +2963,20 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.fields["default_group_role"].queryset = get_group_member_roles()
 
+        self.fields["enable_product_tracking_files"].label = labels.SETTINGS_TRACKED_FILES_ENABLE_LABEL
+        self.fields["enable_product_tracking_files"].help_text = labels.SETTINGS_TRACKED_FILES_ENABLE_HELP
+
+        self.fields[
+            "enforce_verified_status_product_grading"].label = labels.SETTINGS_ASSET_GRADING_ENFORCE_VERIFIED_LABEL
+        self.fields[
+            "enforce_verified_status_product_grading"].help_text = labels.SETTINGS_ASSET_GRADING_ENFORCE_VERIFIED_HELP
+
+        self.fields["enable_product_grade"].label = labels.SETTINGS_ASSET_GRADING_ENABLE_LABEL
+        self.fields["enable_product_grade"].help_text = labels.SETTINGS_ASSET_GRADING_ENABLE_HELP
+
+        self.fields["enable_product_tag_inheritance"].label = labels.SETTINGS_ASSET_TAG_INHERITANCE_ENABLE_LABEL
+        self.fields["enable_product_tag_inheritance"].help_text = labels.SETTINGS_ASSET_TAG_INHERITANCE_ENABLE_HELP
+
     def clean(self):
         cleaned_data = super().clean()
         enable_jira_value = cleaned_data.get("enable_jira")