Add getLatestTestIdByEngagementName

dependency-check-suppression.xml

@@ -45,20 +45,12 @@
  <cve>CVE-2019-0232</cve>
  </suppress>
 
- <suppress until="2020-01-01Z">
+ <suppress>
  <!--
- Introduced through: spring-security-core-5.2.0.RELEASE.jar
+ False Positive.
+ Does not apply to our Spring Version: https://pivotal.io/security/cve-2018-1258
  -->
  <cve>CVE-2018-1258</cve>
-
- <!--
- Not fixable until camunda-spin updates its jackson dependency
- Introduced through: camunda-spin-dataformat-all-1.6.3.jar/META-INF/maven/com.fasterxml.jackson.core/jackson-databind/pom.xml
- -->
- <cve>CVE-2019-14379</cve>
- <cve>CVE-2018-19362</cve>
- <cve>CVE-2018-19361</cve>
- <cve>CVE-2018-19360</cve>
  </suppress>
 
 </suppressions>

pom.xml

@@ -57,7 +57,7 @@
  please see org.camunda.bpm.springboot.project:camunda-bpm-spring-boot-starter-root
  -->
  <camunda.version>7.10.0</camunda.version>
- <camunda.spring.boot.starter.version>3.2.7</camunda.spring.boot.starter.version>
+ <camunda.spring.boot.starter.version>3.2.8</camunda.spring.boot.starter.version>
  <!-- END IMPORTANT -->
 
  <spring-boot.version>2.2.2.RELEASE</spring-boot.version>
@@ -256,7 +256,7 @@
  <plugin>
  <groupId>org.owasp</groupId>
  <artifactId>dependency-check-maven</artifactId>
- <version>5.2.2</version>
+ <version>5.2.4</version>
  <configuration>
  <failBuildOnCVSS>8</failBuildOnCVSS>
  <format>ALL</format>

scb-engine/pom.xml

@@ -35,6 +35,12 @@
  <version>2.2.2.RELEASE</version>
  </dependency>
 
+ <dependency>
+ <groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-core</artifactId>
+ <version>5.2.1.RELEASE</version>
+ </dependency>
+
  <dependency>
  <groupId>io.springfox</groupId>
  <artifactId>springfox-swagger2</artifactId>
@@ -65,6 +71,7 @@
  <dependency>
  <groupId>org.camunda.spin</groupId>
  <artifactId>camunda-spin-dataformat-all</artifactId>
+ <version>1.7.5</version>
  </dependency>
 
  <dependency>
@@ -83,6 +90,22 @@
  <artifactId>tomcat-jdbc</artifactId>
  </dependency>
 
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-core</artifactId>
+ <version>9.0.30</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-el</artifactId>
+ <version>9.0.30</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-websocket</artifactId>
+ <version>9.0.30</version>
+ </dependency>
+
  <dependency>
  <groupId>io.securecodebox.persistenceproviders</groupId>
  <artifactId>empty-persistenceprovider</artifactId>

scb-persistenceproviders/defectdojo-persistenceprovider/src/main/java/io/securecodebox/persistence/DefectDojoService.java

@@ -262,7 +262,12 @@ private Optional<Long> getTestIdByEngagementName(long engagementId, String testN
  .queryParam("engagement", Long.toString(engagementId))
  .queryParam("limit", Long.toString(50L))
  .queryParam("offset", Long.toString(offset));
- if(testName!= null) builder.queryParam("testType", testName);
+ if(testName == null) {
+ LOG.warn("TestName must be set unique, e.g. with time");
+ return Optional.empty(); 
+ } else {
+ builder.queryParam("testType", testName);
+ }
 
  RestTemplate restTemplate = new RestTemplate();
  HttpEntity engagementRequest = new HttpEntity(getHeaders());
@@ -285,6 +290,51 @@ private Optional<Long> getTestIdByEngagementName(long engagementId, String testN
  LOG.warn("Test with name '{}' not found.", testName);
  return Optional.empty();
  }
+ /*
+ * Be aware that using latest might results in "conflicting" "latest" in case a new test is added while requesting latest
+ */
+ public Optional<Long> getLatestTestIdByEngagementName(String engagementName, String productName, String testName, long offset) {
+ Optional<Long> optionalEngagementId = getEngagementIdByEngagementName(engagementName, productName);
+ if(!optionalEngagementId.isPresent()) {
+ LOG.warn("engagementName with name '{}' not found.", engagementName);
+ return Optional.empty();
+ }
+ Long engagementId = optionalEngagementId.get();
+ UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(defectDojoUrl + "/api/v2/tests")
+ .queryParam("engagement", Long.toString(engagementId))
+ .queryParam("limit", Long.toString(50L))
+ .queryParam("offset", Long.toString(offset));
+ if(testName != null) builder.queryParam("testType", testName);
+
+ RestTemplate restTemplate = new RestTemplate();
+ HttpEntity engagementRequest = new HttpEntity(getHeaders());
+
+ ResponseEntity<DefectDojoResponse<TestResponse>> response = restTemplate.exchange(builder.toUriString(), HttpMethod.GET, engagementRequest, new ParameterizedTypeReference<DefectDojoResponse<TestResponse>>(){});
+
+ Optional<Long> testResponseId = null;
+ for(TestResponse test : response.getBody().getResults()){
+ if(testResponseId == null || test.getId() > testResponseId.get()) {
+ testResponseId = Optional.of(test.getId());
+ }
+ }
+
+ if(response.getBody().getNext() != null){
+ Optional<Long> subOptionalTestResponseId = getTestIdByEngagementName(engagementId, testName, offset + 1);
+ if(testResponseId == null ||
+ (subOptionalTestResponseId.isPresent()) && 
+ subOptionalTestResponseId.get() > testResponseId.get() 
+ ) {
+ testResponseId = subOptionalTestResponseId;
+ }
+ }
+ if(testResponseId != null) {
+ return testResponseId;
+ }
+
+ LOG.warn("Test with name '{}' not found.", testName);
+ return Optional.empty();
+ }
+
  private EngagementResponse createTest(TestPayload testPayload) {
  RestTemplate restTemplate = new RestTemplate();