Fix component properties not being cloned

nscuro · nscuro · commit 23afb5cbf39e · 2025-03-11T12:16:22.000+01:00
Signed-off-by: nscuro &lt;nscuro@protonmail.com&gt;
diff --git a/src/main/java/org/dependencytrack/persistence/ProjectQueryManager.java b/src/main/java/org/dependencytrack/persistence/ProjectQueryManager.java
@@ -45,6 +45,7 @@
 import org.dependencytrack.model.AnalysisComment;
 import org.dependencytrack.model.Classifier;
 import org.dependencytrack.model.Component;
+import org.dependencytrack.model.ComponentProperty;
 import org.dependencytrack.model.ConfigPropertyConstants;
 import org.dependencytrack.model.FindingAttribution;
 import org.dependencytrack.model.PolicyViolation;
@@ -745,6 +746,24 @@ public Project clone(
                 if (sourceComponents != null) {
                     for (final Component sourceComponent : sourceComponents) {
                         final Component clonedComponent = cloneComponent(sourceComponent, project, false);
+
+                        if (sourceComponent.getProperties() != null && !sourceComponent.getProperties().isEmpty()) {
+                            final var clonedProperties = new ArrayList<ComponentProperty>(sourceComponent.getProperties().size());
+                            for (final ComponentProperty sourceProperty : sourceComponent.getProperties()) {
+                                final ComponentProperty clonedProperty = new ComponentProperty();
+                                clonedProperty.setComponent(clonedComponent);
+                                clonedProperty.setPropertyType(sourceProperty.getPropertyType());
+                                clonedProperty.setGroupName(sourceProperty.getGroupName());
+                                clonedProperty.setPropertyName(sourceProperty.getPropertyName());
+                                clonedProperty.setPropertyValue(sourceProperty.getPropertyValue());
+                                clonedProperty.setDescription(sourceProperty.getDescription());
+                                clonedProperties.add(clonedProperty);
+                            }
+
+                            persist(clonedProperties);
+                            clonedComponent.setProperties(clonedProperties);
+                        }
+
                         // Add vulnerabilties and finding attribution from the source component to the cloned component
                         for (Vulnerability vuln : sourceComponent.getVulnerabilities()) {
                             final FindingAttribution sourceAttribution = this.getFindingAttribution(vuln, sourceComponent);
diff --git a/src/test/java/org/dependencytrack/resources/v1/ProjectResourceTest.java b/src/test/java/org/dependencytrack/resources/v1/ProjectResourceTest.java
@@ -39,6 +39,7 @@
 import org.dependencytrack.model.AnalysisState;
 import org.dependencytrack.model.Component;
 import org.dependencytrack.model.ComponentIdentity;
+import org.dependencytrack.model.ComponentProperty;
 import org.dependencytrack.model.ConfigPropertyConstants;
 import org.dependencytrack.model.ExternalReference;
 import org.dependencytrack.model.OrganizationalContact;
@@ -1919,6 +1920,14 @@ public void cloneProjectTest() {
         componentA.setSupplier(componentSupplier);
         qm.persist(componentA);
 
+        final var componentProperty = new ComponentProperty();
+        componentProperty.setComponent(componentA);
+        componentProperty.setGroupName("groupName");
+        componentProperty.setPropertyName("propertyName");
+        componentProperty.setPropertyValue("propertyValue");
+        componentProperty.setPropertyType(PropertyType.STRING);
+        qm.persist(componentProperty);
+
         final var componentB = new Component();
         componentB.setProject(project);
         componentB.setName("acme-lib-b");
@@ -2032,6 +2041,13 @@ public void cloneProjectTest() {
                                                 ]
                                                 """);
 
+                                assertThat(clonedComponent.getProperties()).satisfiesExactly(property -> {
+                                    assertThat(property.getGroupName()).isEqualTo("groupName");
+                                    assertThat(property.getPropertyName()).isEqualTo("propertyName");
+                                    assertThat(property.getPropertyValue()).isEqualTo("propertyValue");
+                                    assertThat(property.getPropertyType()).isEqualTo(PropertyType.STRING);
+                                });
+
                                 assertThat(qm.getAllVulnerabilities(clonedComponent)).containsOnly(vuln);
 
                                 assertThat(qm.getAnalysis(clonedComponent, vuln)).satisfies(clonedAnalysis -> {
