Merge branch 'main' into 340_packaging_for_fedora

Author: chinyeungli

.github/workflows/run-unit-tests.yml

@@ -45,7 +45,12 @@ jobs:
       - name: Install python-ldap OS dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y libldap2-dev libsasl2-dev
+          sudo apt-get install -y libldap2-dev libsasl2-dev slapd ldap-utils
+
+      - name: Disable AppArmor for slapd
+        run: |
+          sudo ln -s /etc/apparmor.d/usr.sbin.slapd /etc/apparmor.d/disable/
+          sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.slapd
 
       - name: Install dependencies
         run: make dev envfile

CHANGELOG.rst

@@ -1,7 +1,27 @@
 Release notes
 =============
 
-### Version 5.3.1-dev (unreleased)
+### Version 5.5.0-dev
+
+- Update ProductPackage "unknown" license during "Scan all Packages".
+  Only "unknown" licenses are updated.
+  Products with a is_locked configuration status are excluded.
+  Inactive is_active=False products are excluded.
+  https://github.com/aboutcode-org/dejacode/issues/388
+
+### Version 5.4.2
+
+- Migrate the LDAP testing from using mockldap to slapdtest.
+  The mockldap and funcparserlib dependencies has been removed.
+  https://github.com/aboutcode-org/dejacode/issues/394
+
+### Version 5.4.1
+
+- Upgrade Django to latest security release 5.2.7
+  Also upgrade dependencies to latest releases.
+  https://github.com/aboutcode-org/dejacode/pull/389
+
+### Version 5.4.0
 
 - Upgrade Python version to 3.13 and Django to 5.2.x
   https://github.com/aboutcode-org/dejacode/pull/315
@@ -42,6 +62,26 @@ Release notes
   * `/products/{uuid}/imports/`
   https://github.com/aboutcode-org/dejacode/issues/273
 
+- Add GitHub workflow Request integration.
+  Documentation: https://dejacode.readthedocs.io/en/latest/integrations-github.html
+  https://github.com/aboutcode-org/dejacode/issues/349
+
+- Add GitLab workflow Request integration.
+  Documentation: https://dejacode.readthedocs.io/en/latest/integrations-gitlab.html
+  https://github.com/aboutcode-org/dejacode/issues/346
+
+- Add Jira workflow Request integration.
+  Documentation: https://dejacode.readthedocs.io/en/latest/integrations-jira.html
+  https://github.com/aboutcode-org/dejacode/issues/350
+
+- Add Forgejo workflow Request integration.
+  Documentation: https://dejacode.readthedocs.io/en/latest/integrations-forgejo.html
+  https://github.com/aboutcode-org/dejacode/issues/347
+
+- Add SourceHut workflow Request integration.
+  Documentation: https://dejacode.readthedocs.io/en/latest/integrations-sourcehut.html
+  https://github.com/aboutcode-org/dejacode/issues/348
+
 ### Version 5.3.0
 
 - Rename ProductDependency is_resolved to is_pinned.

Dockerfile

@@ -36,6 +36,8 @@ RUN apt-get update \
       build-essential \
       libldap2-dev \
       libsasl2-dev \
+      slapd \
+      ldap-utils \
       libpq5 \
       git \
       wait-for-it \

component_catalog/migrations/0012_alter_component_children.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.4 on 2025-07-30 13:00
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('component_catalog', '0011_alter_component_owner'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='component',
+            name='children',
+            field=models.ManyToManyField(through='component_catalog.Subcomponent', through_fields=('parent', 'child'), to='component_catalog.component'),
+        ),
+    ]

component_catalog/models.py

@@ -2630,19 +2630,28 @@ def update_from_purldb(self, user):
         )
         return updated_fields
 
-    def update_from_scan(self, user):
-        scancodeio = ScanCodeIO(self.dataspace)
+    def update_from_scan(self, user, update_products=False):
+        package = self
+        dataspace = self.dataspace
+        scancodeio = ScanCodeIO(dataspace)
+
         can_update_from_scan = all(
             [
-                self.dataspace.enable_package_scanning,
-                self.dataspace.update_packages_from_scan,
+                dataspace.enable_package_scanning,
+                dataspace.update_packages_from_scan,
                 scancodeio.is_configured(),
             ]
         )
+        if not can_update_from_scan:
+            return
+
+        updated_fields = scancodeio.update_from_scan(package=package, user=user)
 
-        if can_update_from_scan:
-            updated_fields = scancodeio.update_from_scan(package=self, user=user)
-            return updated_fields
+        if update_products:
+            if "declared_license_expression" in updated_fields:
+                package.productpackages.update_license_unknown()
+
+        return updated_fields
 
     def get_related_packages_qs(self):
         """

component_catalog/tests/test_models.py

@@ -1769,22 +1769,33 @@ def test_package_model_create_from_url_enable_purldb_access(
 
     @mock.patch("dejacode_toolkit.scancodeio.ScanCodeIO.is_configured")
     @mock.patch("dejacode_toolkit.scancodeio.ScanCodeIO.update_from_scan")
-    def test_package_model_update_from_scan(self, mock_update_from_scan, mock_is_configured):
+    def test_package_model_update_from_scan(self, mock_scio_update_from_scan, mock_is_configured):
         mock_is_configured.return_value = True
-        package1 = make_package(self.dataspace)
+        package1 = make_package(self.dataspace, declared_license_expression="mit")
+        product1 = make_product(self.dataspace, inventory=[package1])
+
+        pp1 = product1.productpackages.get()
+        self.assertEqual("", pp1.license_expression)
+        pp1.update(license_expression="unknown")
 
         results = package1.update_from_scan(user=self.user)
-        mock_update_from_scan.assert_not_called()
+        mock_scio_update_from_scan.assert_not_called()
         self.assertIsNone(results)
 
         self.dataspace.enable_package_scanning = True
         self.dataspace.update_packages_from_scan = True
         self.dataspace.save()
 
-        mock_update_from_scan.return_value = ["updated_field"]
-        results = package1.update_from_scan(user=self.user)
-        mock_update_from_scan.assert_called()
-        self.assertEqual(["updated_field"], results)
+        mock_scio_update_from_scan.return_value = ["declared_license_expression"]
+        results = package1.update_from_scan(user=self.user, update_products=False)
+        mock_scio_update_from_scan.assert_called()
+        self.assertEqual(["declared_license_expression"], results)
+        pp1.refresh_from_db()
+        self.assertEqual("unknown", pp1.license_expression)
+
+        results = package1.update_from_scan(user=self.user, update_products=True)
+        pp1.refresh_from_db()
+        self.assertEqual("mit", pp1.license_expression)
 
     def test_package_model_get_url_methods(self):
         package = Package(

component_catalog/views.py

@@ -1761,7 +1761,7 @@ def send_scan_notification(request, key):
     run = json_data.get("run")
     scan_status = run.get("status")
     if scan_status.lower() == "success":
-        updated_fields = package.update_from_scan(user)
+        updated_fields = package.update_from_scan(user, update_products=True)
 
     if updated_fields:
         description = (

dejacode/__init__.py

@@ -14,7 +14,7 @@
 
 import git
 
-VERSION = "5.3.1-dev"
+VERSION = "5.4.1"
 
 PROJECT_DIR = Path(__file__).resolve().parent
 ROOT_DIR = PROJECT_DIR.parent

dejacode/static/css/dejacode_bootstrap.css

@@ -717,6 +717,9 @@ body.signup-form .nav-link.active {
 body.signup-form label {
   display: none;
 }
+body.signup-form label.altcha-label {
+  display: initial !important;
+}
 body.signup-form #div_id_updates_email_notification label {
   display: block;
   margin-bottom: 0!important;

dejacode_toolkit/__init__.py

@@ -10,7 +10,6 @@
 from os import getenv
 
 from django.conf import settings
-from django.core.exceptions import ObjectDoesNotExist
 
 import requests
 
@@ -53,11 +52,7 @@ def __init__(self, dataspace):
         self.basic_auth_user = None
         self.basic_auth_password = None
 
-        try:
-            dataspace_configuration = dataspace.configuration
-        except ObjectDoesNotExist:
-            dataspace_configuration = None
-
+        dataspace_configuration = dataspace.get_configuration()
         # Take the integration settings from the Dataspace when defined
         if dataspace_configuration:
             self.service_url = getattr(dataspace_configuration, self.url_field_name)