Merge pull request #206 from secureCodeBox/fix/productName

J12934 · web-flow · commit feaa76e0e69e · 2020-11-10T13:20:39.000+01:00
diff --git a/scb-persistenceproviders/defectdojo-persistenceprovider/src/main/java/io/securecodebox/persistence/DefectDojoService.java b/scb-persistenceproviders/defectdojo-persistenceprovider/src/main/java/io/securecodebox/persistence/DefectDojoService.java
@@ -125,18 +125,28 @@ public Long retrieveUserId(String username){
         }
     }
 
-    public long retrieveProductId(String product){
+    public long retrieveProductId(String productName) {
+        return retrieveProductId(productName, 0L);
+    }
+    public long retrieveProductId(String productName, long offset) {
+        final long PAGE_SIZE = 50;
         RestTemplate restTemplate = new RestTemplate();
 
-        String uri = defectDojoUrl + "/api/v2/products/?name=" + product;
+        String uri = defectDojoUrl + "/api/v2/products/?limit=" + String.valueOf(PAGE_SIZE) + "&offset=" + offset + "&name=" + productName;
         HttpEntity productRequest = new HttpEntity(getHeaders());
         ResponseEntity<DefectDojoResponse<DefectDojoProduct>> productResponse = restTemplate.exchange(uri, HttpMethod.GET, productRequest, new ParameterizedTypeReference<DefectDojoResponse<DefectDojoProduct>>(){});
-        if(productResponse.getBody().getCount() == 1){
-            return productResponse.getBody().getResults().get(0).getId();
+        if(productResponse.getBody().getCount() >= 1) {
+            // Since DefectDojo 1.8/1.9 name searches for inclusion and not match
+            for(DefectDojoProduct product : productResponse.getBody().getResults()) {
+                if(product.getName() != null && product.getName().equals(productName)) {
+                    return product.getId();
+                }
+            }
         }
-        else {
-            throw new DefectDojoProductNotFound(MessageFormat.format("Could not find product: \"{0}\" in DefectDojo", product));
+        if(productResponse.getBody().getNext() != null) {
+            return retrieveProductId(productName, offset + PAGE_SIZE);
         }
+        throw new DefectDojoProductNotFound(MessageFormat.format("Could not find product: \"{0}\" in DefectDojo", productName));
     }
     private long retrieveOrCreateProduct(String productName, String productDescription, List<String> productTags, int productType) {
         long productId = 0;
diff --git a/scb-persistenceproviders/defectdojo-persistenceprovider/src/main/java/io/securecodebox/persistence/models/DefectDojoProduct.java b/scb-persistenceproviders/defectdojo-persistenceprovider/src/main/java/io/securecodebox/persistence/models/DefectDojoProduct.java
@@ -28,4 +28,10 @@ public DefectDojoProduct(String productName, String productDescription) {
         name = productName;
         description = productDescription;
     }
+    public long getId() {
+        return id;
+    }
+    public String getName() {
+        return name;
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -28,4 +28,10 @@ public DefectDojoProduct(String productName, String productDescription) {`
`28`	`28`	`name = productName;`
`29`	`29`	`description = productDescription;`
`30`	`30`	`}`
	`31`	`+ public long getId() {`
	`32`	`+ return id;`
	`33`	`+ }`
	`34`	`+ public String getName() {`
	`35`	`+ return name;`
	`36`	`+ }`
`31`	`37`	`}`