Skip to content
This repository was archived by the owner on Feb 26, 2021. It is now read-only.

Commit 86022e8

Browse files
authored
Merge pull request #76 from secureCodeBox/next-release
Next release
2 parents e2b7d11 + ba66ca9 commit 86022e8

File tree

30 files changed

+88
-181
lines changed

30 files changed

+88
-181
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ COPY --from=builder ./scb-scanprocesses/nikto-process/target/nikto-process-0.0.1
1616
COPY --from=builder ./scb-scanprocesses/nmap-process/target/nmap-process-0.0.1-SNAPSHOT.jar /scb-engine/lib/
1717
COPY --from=builder ./scb-scanprocesses/zap-process/target/zap-process-0.0.1-SNAPSHOT.jar /scb-engine/lib/
1818
COPY --from=builder ./scb-scanprocesses/combined-amass-nmap-process/target/combined-amass-nmap-process-0.0.1-SNAPSHOT.jar /scb-engine/lib/
19-
COPY --from=builder ./scb-scanprocesses/combined-nmap-nikto-scanprocess/target/combined-nmap-nikto-scanprocess-0.0.1-SNAPSHOT.jar /scb-engine/lib/
19+
COPY --from=builder ./scb-scanprocesses/combined-nmap-nikto-process/target/combined-nmap-nikto-process-0.0.1-SNAPSHOT.jar /scb-engine/lib/
2020
COPY --from=builder ./scb-scanprocesses/sslyze-process/target/sslyze-process-0.0.1-SNAPSHOT.jar /scb-engine/lib/
2121
COPY --from=builder ./scb-scanprocesses/arachni-process/target/arachni-process-1.0-SNAPSHOT.jar /scb-engine/lib/
22-
COPY --from=builder ./scb-scanprocesses/subdomain-scanner-process/target/subdomain-scanner-process-1.0-SNAPSHOT.jar /scb-engine/lib/
22+
COPY --from=builder ./scb-scanprocesses/amass-process/target/amass-process-1.0-SNAPSHOT.jar /scb-engine/lib/
2323

2424
COPY --from=builder ./scb-persistenceproviders/elasticsearch-persistenceprovider/target/elasticsearch-persistenceprovider-0.0.1-SNAPSHOT-jar-with-dependencies.jar /scb-engine/lib/
2525
COPY --from=builder ./scb-persistenceproviders/s3-persistenceprovider/target/s3-persistenceprovider-0.0.1-SNAPSHOT-jar-with-dependencies.jar /scb-engine/lib/

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<camunda.spring.boot.starter.version>3.2.0</camunda.spring.boot.starter.version>
6161
<!-- END IMPORTANT -->
6262

63-
<spring-boot.version>2.1.1.RELEASE</spring-boot.version>
63+
<spring-boot.version>2.1.2.RELEASE</spring-boot.version>
6464
<swagger-version>2.9.0</swagger-version>
6565
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
6666
</properties>

scb-engine/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,13 +179,13 @@
179179
</dependency>
180180
<dependency>
181181
<groupId>io.securecodebox.scanprocesses</groupId>
182-
<artifactId>subdomain-scanner-process</artifactId>
182+
<artifactId>amass-process</artifactId>
183183
<version>1.0-SNAPSHOT</version>
184184
<scope>runtime</scope>
185185
</dependency>
186186
<dependency>
187187
<groupId>io.securecodebox.scanprocesses</groupId>
188-
<artifactId>combined-nmap-nikto-scanprocess</artifactId>
188+
<artifactId>combined-nmap-nikto-process</artifactId>
189189
<version>0.0.1-SNAPSHOT</version>
190190
<scope>runtime</scope>
191191
</dependency>

scb-engine/src/main/resources/application-dev.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,7 @@ logging.level.io.securecodebox: DEBUG
1212
securecodebox.rest.user.scanner-default:
1313
user-id: defaultScanner
1414
password: scan
15+
16+
securecodebox.persistence.defectdojo.url:
17+
securecodebox.persistence.defectdojo.auth.key:
18+
securecodebox.persistence.defectdojo.auth.name:

scb-persistenceproviders/elasticsearch-persistenceprovider/src/main/java/io/securecodebox/persistence/elasticsearch/ElasticSearchPersistenceProvider.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ public void persist(SecurityTest securityTest) throws PersistenceException{
197197
findingAsMap.put("type", indexTypeNameForFindings);
198198
findingAsMap.put("security_test_id", securityTest.getId().toString());
199199
findingAsMap.put("security_test_name", securityTest.getName());
200+
findingAsMap.put("security_test_context", securityTest.getContext());
200201
findingAsMap.put("@timestamp", new SimpleDateFormat(dateTimeFormatToPersist).format(new Date()));
201202

202203
IndexRequest findingIndexRequest = new IndexRequest(getElasticIndexName(), "_doc");

scb-scanprocesses/subdomain-scanner-process/pom.xml renamed to scb-scanprocesses/amass-process/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
</parent>
3030

3131
<groupId>io.securecodebox.scanprocesses</groupId>
32-
<artifactId>subdomain-scanner-process</artifactId>
32+
<artifactId>amass-process</artifactId>
3333
<version>1.0-SNAPSHOT</version>
3434

3535
<dependencies>

scb-scanprocesses/subdomain-scanner-process/src/main/java/io/securecodebox/scanprocess/ProcessInitConfiguration.java renamed to scb-scanprocesses/amass-process/src/main/java/io/securecodebox/scanprocess/ProcessInitConfiguration.java

File renamed without changes.

scb-scanprocesses/combined-nmap-nikto-scanprocess/src/main/resources/META-INF/processes.xml renamed to scb-scanprocesses/amass-process/src/main/resources/META-INF/processes.xml

File renamed without changes.

scb-scanprocesses/subdomain-scanner-process/src/main/resources/bpmn/subdomain_scanner_process.bpmn renamed to scb-scanprocesses/amass-process/src/main/resources/bpmn/amass_process.bpmn

File renamed without changes.

scb-scanprocesses/subdomain-scanner-process/src/main/resources/forms/default/approve-results.html renamed to scb-scanprocesses/amass-process/src/main/resources/forms/default/approve-results.html

File renamed without changes.

0 commit comments

Comments
 (0)