Skip to content
This repository was archived by the owner on Feb 26, 2021. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
090818f
removed naming inconsistencies
Feb 13, 2019
dfca42f
fixed forgotten change
Feb 13, 2019
8318763
Update Dockerfile
SirDany Feb 13, 2019
06f924b
fixed forgotten change
Feb 13, 2019
6ae6418
Merge branch 'bugfix/naming-inconsistencies' of https://github.com/se…
Feb 13, 2019
d0e8f82
Revert renaming of the topic
J12934 Mar 13, 2019
5357883
Merge pull request #70 from secureCodeBox/bugfix/naming-inconsistencies
J12934 Mar 13, 2019
f7f8a56
process related bpmn&test naming
Jan 23, 2019
de80c76
fixed invalid html & replaced custom persistenceProvider with provide…
Jan 23, 2019
c261366
changed portscan to scan
Feb 13, 2019
6eb24d5
change initial version from 3 to 1
Feb 13, 2019
950c899
Corrected validation pattern
J12934 Mar 13, 2019
5b5d254
Using the artefactId for the bpmn model file name
J12934 Mar 13, 2019
19a40f0
Fixed html formatting in form
J12934 Mar 13, 2019
d8b9e87
Removed copy pasta references to port scans
J12934 Mar 13, 2019
22cf01a
Updated test in archetype to match the other test
J12934 Mar 13, 2019
9b064c1
Add securityTest context to findings
J12934 Mar 13, 2019
76bc471
fix: pom.xml to reduce vulnerabilities
snyk-bot Mar 14, 2019
e4f897f
Merge pull request #74 from secureCodeBox/feature/add-context-to-find…
J12934 Mar 15, 2019
537ff73
Merge pull request #75 from secureCodeBox/snyk-fix-2guhtt
J12934 Mar 15, 2019
ba66ca9
Merge pull request #68 from secureCodeBox/bugfix/scanner-process-arch…
J12934 Mar 15, 2019
86022e8
Merge pull request #76 from secureCodeBox/next-release
J12934 Mar 20, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ COPY --from=builder ./scb-scanprocesses/nikto-process/target/nikto-process-0.0.1
COPY --from=builder ./scb-scanprocesses/nmap-process/target/nmap-process-0.0.1-SNAPSHOT.jar /scb-engine/lib/
COPY --from=builder ./scb-scanprocesses/zap-process/target/zap-process-0.0.1-SNAPSHOT.jar /scb-engine/lib/
COPY --from=builder ./scb-scanprocesses/combined-amass-nmap-process/target/combined-amass-nmap-process-0.0.1-SNAPSHOT.jar /scb-engine/lib/
COPY --from=builder ./scb-scanprocesses/combined-nmap-nikto-scanprocess/target/combined-nmap-nikto-scanprocess-0.0.1-SNAPSHOT.jar /scb-engine/lib/
COPY --from=builder ./scb-scanprocesses/combined-nmap-nikto-process/target/combined-nmap-nikto-process-0.0.1-SNAPSHOT.jar /scb-engine/lib/
COPY --from=builder ./scb-scanprocesses/sslyze-process/target/sslyze-process-0.0.1-SNAPSHOT.jar /scb-engine/lib/
COPY --from=builder ./scb-scanprocesses/arachni-process/target/arachni-process-1.0-SNAPSHOT.jar /scb-engine/lib/
COPY --from=builder ./scb-scanprocesses/subdomain-scanner-process/target/subdomain-scanner-process-1.0-SNAPSHOT.jar /scb-engine/lib/
COPY --from=builder ./scb-scanprocesses/amass-process/target/amass-process-1.0-SNAPSHOT.jar /scb-engine/lib/

COPY --from=builder ./scb-persistenceproviders/elasticsearch-persistenceprovider/target/elasticsearch-persistenceprovider-0.0.1-SNAPSHOT-jar-with-dependencies.jar /scb-engine/lib/
COPY --from=builder ./scb-persistenceproviders/s3-persistenceprovider/target/s3-persistenceprovider-0.0.1-SNAPSHOT-jar-with-dependencies.jar /scb-engine/lib/
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
<camunda.spring.boot.starter.version>3.2.0</camunda.spring.boot.starter.version>
<!-- END IMPORTANT -->

<spring-boot.version>2.1.1.RELEASE</spring-boot.version>
<spring-boot.version>2.1.2.RELEASE</spring-boot.version>
<swagger-version>2.9.0</swagger-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
Expand Down
4 changes: 2 additions & 2 deletions scb-engine/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -179,13 +179,13 @@
</dependency>
<dependency>
<groupId>io.securecodebox.scanprocesses</groupId>
<artifactId>subdomain-scanner-process</artifactId>
<artifactId>amass-process</artifactId>
<version>1.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>io.securecodebox.scanprocesses</groupId>
<artifactId>combined-nmap-nikto-scanprocess</artifactId>
<artifactId>combined-nmap-nikto-process</artifactId>
<version>0.0.1-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
Expand Down
4 changes: 4 additions & 0 deletions scb-engine/src/main/resources/application-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,7 @@ logging.level.io.securecodebox: DEBUG
securecodebox.rest.user.scanner-default:
user-id: defaultScanner
password: scan

securecodebox.persistence.defectdojo.url:
securecodebox.persistence.defectdojo.auth.key:
securecodebox.persistence.defectdojo.auth.name:
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@ public void persist(SecurityTest securityTest) throws PersistenceException{
findingAsMap.put("type", indexTypeNameForFindings);
findingAsMap.put("security_test_id", securityTest.getId().toString());
findingAsMap.put("security_test_name", securityTest.getName());
findingAsMap.put("security_test_context", securityTest.getContext());
findingAsMap.put("@timestamp", new SimpleDateFormat(dateTimeFormatToPersist).format(new Date()));

IndexRequest findingIndexRequest = new IndexRequest(getElasticIndexName(), "_doc");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
</parent>

<groupId>io.securecodebox.scanprocesses</groupId>
<artifactId>subdomain-scanner-process</artifactId>
<artifactId>amass-process</artifactId>
<version>1.0-SNAPSHOT</version>

<dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
*/

@RunWith(SpringJUnit4ClassRunner.class)
@Deployment(resources = "bpmn/subdomain_scanner_process.bpmn")
@Deployment(resources = "bpmn/amass_process.bpmn")
@Ignore("Ignored until problems with camunda testing frameworks are handled. Introduces via update to camunda 7.10")
public class SubdomainScannerProcessTest {

Expand Down Expand Up @@ -127,7 +127,7 @@ If you have the path to your executable code (the class for delegate) as delegat
then this guide is helpful:
https://blog.akquinet.de/2016/11/04/camunda-bpm-test-your-processes-based-on-plain-old-java-delegates/
*/
autoMock("bpmn/subdomain_scanner_process.bpmn");
autoMock("bpmn/amass_process.bpmn");

/*
Here we define a default behaviour for all the tasks in the BPMN model.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
name="scanprocess-quickstart">

<requiredProperties>
<requiredProperty key="processName" validationRegex="[a-zA-Z_-]*"/>
<requiredProperty key="processTopic" validationRegex="[a-zA-Z0-9_-]*"/>
<requiredProperty key="processName" validationRegex="[A-Z][a-zA-Z]*"/>
<requiredProperty key="processTopic" validationRegex="[a-z0-9-]*"/>
</requiredProperties>

<fileSets>
Expand All @@ -34,12 +34,6 @@
<include>io/securecodebox/scanprocess/ProcessInitConfiguration.java</include>
</includes>
</fileSet>
<fileSet filtered="true" packaged="true" encoding="UTF-8">
<directory>src/main/java/</directory>
<includes>
<include>SummaryGeneratorDelegate.java</include>
</includes>
</fileSet>
<fileSet filtered="true" packaged="false" encoding="UTF-8">
<directory>src/main/resources/</directory>
<excludes>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
<artifactId>${artifactId}</artifactId>
<version>${version}</version>


<dependencies>
<dependency>
<groupId>io.securecodebox.core</groupId>
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,19 +0,0 @@
<!--
~ /*
~ * SecureCodeBox (SCB)
~ * Copyright 2015-2018 iteratec GmbH
~ *
~ * Licensed under the Apache License, Version 2.0 (the "License");
~ * you may not use this file except in compliance with the License.
~ * You may obtain a copy of the License at
~ *
~ * http://www.apache.org/licenses/LICENSE-2.0
~ *
~ * Unless required by applicable law or agreed to in writing, software
~ * distributed under the License is distributed on an "AS IS" BASIS,
~ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ * See the License for the specific language governing permissions and
~ * limitations under the License.
~ */
-->

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.12.0">
<bpmn:process id="$processTopic" name="$processName Scan" isExecutable="true" camunda:versionTag="3" camunda:historyTimeToLive="30">
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.7.2">
<bpmn:process id="$processTopic" name="$processName" isExecutable="true" camunda:versionTag="1" camunda:historyTimeToLive="30">
<bpmn:startEvent id="StartEvent_Configure" name="target configured" camunda:formKey="embedded:app:forms/default/configure-target.html">
<bpmn:extensionElements>
<camunda:executionListener delegateExpression="${dollar}{checkForAutomatedRunListener}" event="start" />
Expand All @@ -14,10 +14,10 @@
<bpmn:outgoing>SequenceFlow_TargetConfigured</bpmn:outgoing>
</bpmn:startEvent>
<bpmn:sequenceFlow id="SequenceFlow_TargetConfigured" sourceRef="StartEvent_Configure" targetRef="ServiceTask_DoScan" />
<bpmn:endEvent id="EndEvent_FinishedPortscan" name="Port Scan finished">
<bpmn:endEvent id="EndEvent_FinishedScan" name="Scan finished">
<bpmn:incoming>SequenceFlow_SummaryCreated</bpmn:incoming>
</bpmn:endEvent>
<bpmn:sequenceFlow id="SequenceFlow_PortscanFinished" name="finished&#10;&#10;" sourceRef="ServiceTask_DoScan" targetRef="ExclusiveGateway_AutomatedFinish" />
<bpmn:sequenceFlow id="SequenceFlow_ScanFinished" name="finished&#10;&#10;" sourceRef="ServiceTask_DoScan" targetRef="ExclusiveGateway_AutomatedFinish" />
<bpmn:sequenceFlow id="SequenceFlow_ResultReviewed" name="result reviewed" sourceRef="UserTask_ApproveResults" targetRef="ExclusiveGateway_ResultApproved" />
<bpmn:userTask id="UserTask_ApproveResults" name="Review scan results" camunda:formKey="embedded:app:forms/default/approve-results.html" camunda:candidateGroups="_securebox_admin, _securebox_productowner, _securebox_developer, approver">
<bpmn:extensionElements>
Expand All @@ -35,7 +35,7 @@
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[${dollar}{PROCESS_RESULT_APPROVED == 'approved'}]]></bpmn:conditionExpression>
</bpmn:sequenceFlow>
<bpmn:exclusiveGateway id="ExclusiveGateway_AutomatedFinish" name="is automated run?">
<bpmn:incoming>SequenceFlow_PortscanFinished</bpmn:incoming>
<bpmn:incoming>SequenceFlow_ScanFinished</bpmn:incoming>
<bpmn:outgoing>SequenceFlow_ManualFinish</bpmn:outgoing>
<bpmn:outgoing>SequenceFlow_AutomatedFinish</bpmn:outgoing>
</bpmn:exclusiveGateway>
Expand All @@ -48,10 +48,10 @@
<bpmn:serviceTask id="ServiceTask_DoScan" name="Run the scan" camunda:asyncBefore="true" camunda:type="external" camunda:topic="$processTopic">
<bpmn:extensionElements />
<bpmn:incoming>SequenceFlow_TargetConfigured</bpmn:incoming>
<bpmn:outgoing>SequenceFlow_PortscanFinished</bpmn:outgoing>
<bpmn:outgoing>SequenceFlow_ScanFinished</bpmn:outgoing>
</bpmn:serviceTask>
<bpmn:sequenceFlow id="SequenceFlow_SummaryCreated" name="summary created" sourceRef="ServiceTask_CreateSummary" targetRef="EndEvent_FinishedPortscan" />
<bpmn:serviceTask id="ServiceTask_CreateSummary" name="Create Report Summary" camunda:asyncBefore="true" camunda:delegateExpression="${dollar}{${component}_SummaryGeneratorDelegate}">
<bpmn:sequenceFlow id="SequenceFlow_SummaryCreated" name="summary created" sourceRef="ServiceTask_CreateSummary" targetRef="EndEvent_FinishedScan" />
<bpmn:serviceTask id="ServiceTask_CreateSummary" name="Create Report Summary" camunda:asyncBefore="true" camunda:delegateExpression="${summaryGeneratorDelegate}">
<bpmn:extensionElements />
<bpmn:incoming>SequenceFlow_ResultApproved</bpmn:incoming>
<bpmn:incoming>SequenceFlow_1i44eck</bpmn:incoming>
Expand All @@ -68,9 +68,8 @@
<bpmn:outgoing>SequenceFlow_1i44eck</bpmn:outgoing>
</bpmn:task>
<bpmn:sequenceFlow id="SequenceFlow_1i44eck" sourceRef="DoesNothingTask" targetRef="ServiceTask_CreateSummary" />
<bpmn:textAnnotation id="TextAnnotation_0lm3esn">
<bpmn:text>results in a generic format</bpmn:text>
</bpmn:textAnnotation>
<bpmn:textAnnotation id="TextAnnotation_0lm3esn"> <bpmn:text>results in a generic format</bpmn:text>
</bpmn:textAnnotation>
<bpmn:association id="Association_16qrr9w" sourceRef="DataObjectReference_0vhjx0n" targetRef="TextAnnotation_0lm3esn" />
</bpmn:process>
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
Expand All @@ -82,28 +81,28 @@
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_093mevy_di" bpmnElement="SequenceFlow_TargetConfigured">
<di:waypoint x="64" y="328" />
<di:waypoint x="142" y="328" />
<di:waypoint xsi:type="dc:Point" x="64" y="328" />
<di:waypoint xsi:type="dc:Point" x="142" y="328" />
<bpmndi:BPMNLabel>
<dc:Bounds x="58" y="303" width="90" height="20" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="EndEvent_07weexy_di" bpmnElement="EndEvent_FinishedPortscan">
<bpmndi:BPMNShape id="EndEvent_07weexy_di" bpmnElement="EndEvent_FinishedScan">
<dc:Bounds x="1309" y="186" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1357" y="197" width="90" height="12" />
<dc:Bounds x="1369" y="197" width="67" height="12" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_0kjlgbs_di" bpmnElement="SequenceFlow_PortscanFinished">
<di:waypoint x="242" y="328" />
<di:waypoint x="437" y="328" />
<bpmndi:BPMNEdge id="SequenceFlow_0kjlgbs_di" bpmnElement="SequenceFlow_ScanFinished">
<di:waypoint xsi:type="dc:Point" x="242" y="328" />
<di:waypoint xsi:type="dc:Point" x="437" y="328" />
<bpmndi:BPMNLabel>
<dc:Bounds x="316" y="420" width="38" height="37" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_00fmvcb_di" bpmnElement="SequenceFlow_ResultReviewed">
<di:waypoint x="673" y="202" />
<di:waypoint x="760" y="204" />
<di:waypoint xsi:type="dc:Point" x="673" y="202" />
<di:waypoint xsi:type="dc:Point" x="760" y="204" />
<bpmndi:BPMNLabel>
<dc:Bounds x="794" y="176" width="74" height="12" />
</bpmndi:BPMNLabel>
Expand All @@ -118,8 +117,8 @@
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_0gjifhk_di" bpmnElement="SequenceFlow_ResultApproved">
<di:waypoint x="810" y="204" />
<di:waypoint x="1077" y="204" />
<di:waypoint xsi:type="dc:Point" x="810" y="204" />
<di:waypoint xsi:type="dc:Point" x="1077" y="204" />
<bpmndi:BPMNLabel>
<dc:Bounds x="999" y="150" width="76" height="13" />
</bpmndi:BPMNLabel>
Expand All @@ -131,18 +130,18 @@
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_17bwrf0_di" bpmnElement="SequenceFlow_ManualFinish">
<di:waypoint x="462" y="303" />
<di:waypoint x="462" y="204" />
<di:waypoint x="573" y="204" />
<di:waypoint xsi:type="dc:Point" x="462" y="303" />
<di:waypoint xsi:type="dc:Point" x="462" y="204" />
<di:waypoint xsi:type="dc:Point" x="573" y="204" />
<bpmndi:BPMNLabel>
<dc:Bounds x="379" y="246" width="65" height="37" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_0s3limw_di" bpmnElement="SequenceFlow_AutomatedFinish">
<di:waypoint x="462" y="353" />
<di:waypoint x="462" y="456" />
<di:waypoint x="1127" y="456" />
<di:waypoint x="1127" y="244" />
<di:waypoint xsi:type="dc:Point" x="462" y="353" />
<di:waypoint xsi:type="dc:Point" x="462" y="456" />
<di:waypoint xsi:type="dc:Point" x="1127" y="456" />
<di:waypoint xsi:type="dc:Point" x="1127" y="244" />
<bpmndi:BPMNLabel>
<dc:Bounds x="803" y="503" width="81" height="12" />
</bpmndi:BPMNLabel>
Expand All @@ -151,8 +150,8 @@
<dc:Bounds x="142" y="288" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_150f8k2_di" bpmnElement="SequenceFlow_SummaryCreated">
<di:waypoint x="1177" y="204" />
<di:waypoint x="1309" y="204" />
<di:waypoint xsi:type="dc:Point" x="1177" y="204" />
<di:waypoint xsi:type="dc:Point" x="1309" y="204" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1187" y="209" width="85" height="13" />
</bpmndi:BPMNLabel>
Expand All @@ -170,13 +169,13 @@
<dc:Bounds x="379" y="420" width="102" height="50" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="Association_16qrr9w_di" bpmnElement="Association_16qrr9w">
<di:waypoint x="324" y="394" />
<di:waypoint x="379" y="420" />
<di:waypoint xsi:type="dc:Point" x="324" y="394" />
<di:waypoint xsi:type="dc:Point" x="379" y="420" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_1z0e6c0_di" bpmnElement="SequenceFlow_ResultRejected">
<di:waypoint x="785" y="179" />
<di:waypoint x="785" y="65" />
<di:waypoint x="995" y="65" />
<di:waypoint xsi:type="dc:Point" x="785" y="179" />
<di:waypoint xsi:type="dc:Point" x="785" y="65" />
<di:waypoint xsi:type="dc:Point" x="995" y="65" />
<bpmndi:BPMNLabel>
<dc:Bounds x="849" y="96" width="70" height="13" />
</bpmndi:BPMNLabel>
Expand All @@ -185,9 +184,9 @@
<dc:Bounds x="995" y="25" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_1i44eck_di" bpmnElement="SequenceFlow_1i44eck">
<di:waypoint x="1095" y="65" />
<di:waypoint x="1127" y="65" />
<di:waypoint x="1127" y="164" />
<di:waypoint xsi:type="dc:Point" x="1095" y="65" />
<di:waypoint xsi:type="dc:Point" x="1127" y="65" />
<di:waypoint xsi:type="dc:Point" x="1127" y="164" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1066" y="43.5" width="90" height="13" />
</bpmndi:BPMNLabel>
Expand Down
Loading