diff --git a/scanpipe/migrations/0070_discoveredpackage_analysis_subproject.py b/scanpipe/migrations/0070_discoveredpackage_analysis_subproject.py new file mode 100644 index 0000000000..2702972519 --- /dev/null +++ b/scanpipe/migrations/0070_discoveredpackage_analysis_subproject.py @@ -0,0 +1,19 @@ +# Generated by Django 5.1.5 on 2025-03-03 06:53 + +import django.db.models.deletion +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('scanpipe', '0069_project_purl'), + ] + + operations = [ + migrations.AddField( + model_name='discoveredpackage', + name='analysis_subproject', + field=models.OneToOneField(blank=True, editable=False, help_text='Sub-project dedicated to analyzing this package.', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='analyzed_package', to='scanpipe.project'), + ), + ] diff --git a/scanpipe/models.py b/scanpipe/models.py index 0461cc663a..0f448c43f4 100644 --- a/scanpipe/models.py +++ b/scanpipe/models.py @@ -3442,6 +3442,15 @@ class DiscoveredPackage( notes = models.TextField(blank=True) source_packages = models.JSONField(default=list, blank=True) tag = models.CharField(blank=True, max_length=50) + analysis_subproject = models.OneToOneField( + Project, + related_name="analyzed_package", + help_text=_("Sub-project dedicated to analyzing this package."), + on_delete=models.SET_NULL, + blank=True, + null=True, + editable=False, + ) objects = DiscoveredPackageQuerySet.as_manager() diff --git a/scanpipe/templates/scanpipe/includes/project_analyzed_package_warning.html b/scanpipe/templates/scanpipe/includes/project_analyzed_package_warning.html new file mode 100644 index 0000000000..23a1f5756d --- /dev/null +++ b/scanpipe/templates/scanpipe/includes/project_analyzed_package_warning.html @@ -0,0 +1,26 @@ +
+
+
+

+ + + + + This package analysis was initiated for the + + + {{ project.analyzed_package.package_url }} + + + package of the + + + {{ project.analyzed_package.project.slug }} + + + project. + +

+
+
+
\ No newline at end of file diff --git a/scanpipe/templates/scanpipe/package_list.html b/scanpipe/templates/scanpipe/package_list.html index ee415673f8..5283e36778 100644 --- a/scanpipe/templates/scanpipe/package_list.html +++ b/scanpipe/templates/scanpipe/package_list.html @@ -22,14 +22,34 @@ {% for package in object_list %} - - {# CAUTION: Avoid relying on get_absolute_url to prevent unnecessary query triggers #} - {{ package.package_url }} - {% if package.is_vulnerable %} - - - - {% endif %} + +
+
+ {# CAUTION: Avoid relying on get_absolute_url to prevent unnecessary query triggers #} + {{ package.package_url }} +
+
+ {% if package.is_vulnerable %} + + + + {% endif %} + {% if package.download_url %} + + + + {% if package.analysis_subproject %} + + + + {% else %} + + + + {% endif %} + {% endif %} +
+
diff --git a/scanpipe/templates/scanpipe/project_detail.html b/scanpipe/templates/scanpipe/project_detail.html index 89cad4436b..b20b8a1d64 100644 --- a/scanpipe/templates/scanpipe/project_detail.html +++ b/scanpipe/templates/scanpipe/project_detail.html @@ -54,6 +54,10 @@
+ + {% if project.analyzed_package %} + {% include "scanpipe/includes/project_analyzed_package_warning.html" %} + {% endif %} {% include "scanpipe/includes/project_summary_level.html" with project=project title_class="title" %}
diff --git a/scanpipe/tests/test_models.py b/scanpipe/tests/test_models.py index 428591bf0c..bc086f4bfe 100644 --- a/scanpipe/tests/test_models.py +++ b/scanpipe/tests/test_models.py @@ -2503,6 +2503,7 @@ def test_scanpipe_package_model_integrity_with_toolkit_package_model(self): "resolved_from_dependencies", "parent_packages", "children_packages", + "analysis_subproject", "notes", ] diff --git a/scanpipe/views.py b/scanpipe/views.py index 52e48c30b4..937b672405 100644 --- a/scanpipe/views.py +++ b/scanpipe/views.py @@ -639,6 +639,14 @@ class ProjectCreateView(ConditionalLoginRequired, FormAjaxMixin, generic.CreateV form_class = ProjectForm template_name = "scanpipe/project_form.html" + def get_initial(self): + """Get initial data for the form from the URL query parameters.""" + initial = super().get_initial() + for field in self.form_class().fields: + if value := self.request.GET.get(field): + initial[field] = value + return initial + def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) pipelines = { @@ -1654,11 +1662,13 @@ def get_queryset(self): "package_uid", *PACKAGE_URL_FIELDS, "project", + "download_url", "primary_language", "declared_license_expression", "compliance_alert", "copyright", "affected_by_vulnerabilities", + "analysis_subproject", ) .with_resources_count() .order_by_package_url()