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

Commit ba66ca9

Browse files
J12934J12934
authored
Merge pull request #68 from secureCodeBox/bugfix/scanner-process-archetype
Bugfix/scanner process archetype
2 parents 537ff73 + 22cf01a commit ba66ca9

File tree

10 files changed

+76
-170
lines changed

10 files changed

+76
-170
lines changed

‎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-scanprocesses/archetype-process/src/main/resources/META-INF/maven/archetype-metadata.xml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
name="scanprocess-quickstart">
2424

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

3030
<fileSets>
@@ -34,12 +34,6 @@
3434
<include>io/securecodebox/scanprocess/ProcessInitConfiguration.java</include>
3535
</includes>
3636
</fileSet>
37-
<fileSet filtered="true" packaged="true" encoding="UTF-8">
38-
<directory>src/main/java/</directory>
39-
<includes>
40-
<include>SummaryGeneratorDelegate.java</include>
41-
</includes>
42-
</fileSet>
4337
<fileSet filtered="true" packaged="false" encoding="UTF-8">
4438
<directory>src/main/resources/</directory>
4539
<excludes>

‎scb-scanprocesses/archetype-process/src/main/resources/archetype-resources/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<artifactId>${artifactId}</artifactId>
3434
<version>${version}</version>
3535

36+
3637
<dependencies>
3738
<dependency>
3839
<groupId>io.securecodebox.core</groupId>

‎scb-scanprocesses/archetype-process/src/main/resources/archetype-resources/src/main/java/SummaryGeneratorDelegate.java‎

Lines changed: 0 additions & 75 deletions
This file was deleted.

‎scb-scanprocesses/archetype-process/src/main/resources/archetype-resources/src/main/resources/META-INF/processes.xml‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +0,0 @@
1-
<!--
2-
~ /*
3-
~ * SecureCodeBox (SCB)
4-
~ * Copyright 2015-2018 iteratec GmbH
5-
~ *
6-
~ * Licensed under the Apache License, Version 2.0 (the "License");
7-
~ * you may not use this file except in compliance with the License.
8-
~ * You may obtain a copy of the License at
9-
~ *
10-
~ * http://www.apache.org/licenses/LICENSE-2.0
11-
~ *
12-
~ * Unless required by applicable law or agreed to in writing, software
13-
~ * distributed under the License is distributed on an "AS IS" BASIS,
14-
~ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15-
~ * See the License for the specific language governing permissions and
16-
~ * limitations under the License.
17-
~ */
18-
-->
19-

scb-scanprocesses/archetype-process/src/main/resources/archetype-resources/src/main/resources/bpmn/default_process.bpmn renamed to scb-scanprocesses/archetype-process/src/main/resources/archetype-resources/src/main/resources/bpmn/__artifactId__.bpmn

Lines changed: 38 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<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">
3-
<bpmn:process id="$processTopic" name="$processName Scan" isExecutable="true" camunda:versionTag="3" camunda:historyTimeToLive="30">
2+
<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">
3+
<bpmn:process id="$processTopic" name="$processName" isExecutable="true" camunda:versionTag="1" camunda:historyTimeToLive="30">
44
<bpmn:startEvent id="StartEvent_Configure" name="target configured" camunda:formKey="embedded:app:forms/default/configure-target.html">
55
<bpmn:extensionElements>
66
<camunda:executionListener delegateExpression="${dollar}{checkForAutomatedRunListener}" event="start" />
@@ -14,10 +14,10 @@
1414
<bpmn:outgoing>SequenceFlow_TargetConfigured</bpmn:outgoing>
1515
</bpmn:startEvent>
1616
<bpmn:sequenceFlow id="SequenceFlow_TargetConfigured" sourceRef="StartEvent_Configure" targetRef="ServiceTask_DoScan" />
17-
<bpmn:endEvent id="EndEvent_FinishedPortscan" name="Port Scan finished">
17+
<bpmn:endEvent id="EndEvent_FinishedScan" name="Scan finished">
1818
<bpmn:incoming>SequenceFlow_SummaryCreated</bpmn:incoming>
1919
</bpmn:endEvent>
20-
<bpmn:sequenceFlow id="SequenceFlow_PortscanFinished" name="finished&#10;&#10;" sourceRef="ServiceTask_DoScan" targetRef="ExclusiveGateway_AutomatedFinish" />
20+
<bpmn:sequenceFlow id="SequenceFlow_ScanFinished" name="finished&#10;&#10;" sourceRef="ServiceTask_DoScan" targetRef="ExclusiveGateway_AutomatedFinish" />
2121
<bpmn:sequenceFlow id="SequenceFlow_ResultReviewed" name="result reviewed" sourceRef="UserTask_ApproveResults" targetRef="ExclusiveGateway_ResultApproved" />
2222
<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">
2323
<bpmn:extensionElements>
@@ -35,7 +35,7 @@
3535
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[${dollar}{PROCESS_RESULT_APPROVED == 'approved'}]]></bpmn:conditionExpression>
3636
</bpmn:sequenceFlow>
3737
<bpmn:exclusiveGateway id="ExclusiveGateway_AutomatedFinish" name="is automated run?">
38-
<bpmn:incoming>SequenceFlow_PortscanFinished</bpmn:incoming>
38+
<bpmn:incoming>SequenceFlow_ScanFinished</bpmn:incoming>
3939
<bpmn:outgoing>SequenceFlow_ManualFinish</bpmn:outgoing>
4040
<bpmn:outgoing>SequenceFlow_AutomatedFinish</bpmn:outgoing>
4141
</bpmn:exclusiveGateway>
@@ -48,10 +48,10 @@
4848
<bpmn:serviceTask id="ServiceTask_DoScan" name="Run the scan" camunda:asyncBefore="true" camunda:type="external" camunda:topic="$processTopic">
4949
<bpmn:extensionElements />
5050
<bpmn:incoming>SequenceFlow_TargetConfigured</bpmn:incoming>
51-
<bpmn:outgoing>SequenceFlow_PortscanFinished</bpmn:outgoing>
51+
<bpmn:outgoing>SequenceFlow_ScanFinished</bpmn:outgoing>
5252
</bpmn:serviceTask>
53-
<bpmn:sequenceFlow id="SequenceFlow_SummaryCreated" name="summary created" sourceRef="ServiceTask_CreateSummary" targetRef="EndEvent_FinishedPortscan" />
54-
<bpmn:serviceTask id="ServiceTask_CreateSummary" name="Create Report Summary" camunda:asyncBefore="true" camunda:delegateExpression="${dollar}{${component}_SummaryGeneratorDelegate}">
53+
<bpmn:sequenceFlow id="SequenceFlow_SummaryCreated" name="summary created" sourceRef="ServiceTask_CreateSummary" targetRef="EndEvent_FinishedScan" />
54+
<bpmn:serviceTask id="ServiceTask_CreateSummary" name="Create Report Summary" camunda:asyncBefore="true" camunda:delegateExpression="${summaryGeneratorDelegate}">
5555
<bpmn:extensionElements />
5656
<bpmn:incoming>SequenceFlow_ResultApproved</bpmn:incoming>
5757
<bpmn:incoming>SequenceFlow_1i44eck</bpmn:incoming>
@@ -68,9 +68,8 @@
6868
<bpmn:outgoing>SequenceFlow_1i44eck</bpmn:outgoing>
6969
</bpmn:task>
7070
<bpmn:sequenceFlow id="SequenceFlow_1i44eck" sourceRef="DoesNothingTask" targetRef="ServiceTask_CreateSummary" />
71-
<bpmn:textAnnotation id="TextAnnotation_0lm3esn">
72-
<bpmn:text>results in a generic format</bpmn:text>
73-
</bpmn:textAnnotation>
71+
<bpmn:textAnnotation id="TextAnnotation_0lm3esn"> <bpmn:text>results in a generic format</bpmn:text>
72+
</bpmn:textAnnotation>
7473
<bpmn:association id="Association_16qrr9w" sourceRef="DataObjectReference_0vhjx0n" targetRef="TextAnnotation_0lm3esn" />
7574
</bpmn:process>
7675
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
@@ -82,28 +81,28 @@
8281
</bpmndi:BPMNLabel>
8382
</bpmndi:BPMNShape>
8483
<bpmndi:BPMNEdge id="SequenceFlow_093mevy_di" bpmnElement="SequenceFlow_TargetConfigured">
85-
<di:waypoint x="64" y="328" />
86-
<di:waypoint x="142" y="328" />
84+
<di:waypoint xsi:type="dc:Point" x="64" y="328" />
85+
<di:waypoint xsi:type="dc:Point" x="142" y="328" />
8786
<bpmndi:BPMNLabel>
8887
<dc:Bounds x="58" y="303" width="90" height="20" />
8988
</bpmndi:BPMNLabel>
9089
</bpmndi:BPMNEdge>
91-
<bpmndi:BPMNShape id="EndEvent_07weexy_di" bpmnElement="EndEvent_FinishedPortscan">
90+
<bpmndi:BPMNShape id="EndEvent_07weexy_di" bpmnElement="EndEvent_FinishedScan">
9291
<dc:Bounds x="1309" y="186" width="36" height="36" />
9392
<bpmndi:BPMNLabel>
94-
<dc:Bounds x="1357" y="197" width="90" height="12" />
93+
<dc:Bounds x="1369" y="197" width="67" height="12" />
9594
</bpmndi:BPMNLabel>
9695
</bpmndi:BPMNShape>
97-
<bpmndi:BPMNEdge id="SequenceFlow_0kjlgbs_di" bpmnElement="SequenceFlow_PortscanFinished">
98-
<di:waypoint x="242" y="328" />
99-
<di:waypoint x="437" y="328" />
96+
<bpmndi:BPMNEdge id="SequenceFlow_0kjlgbs_di" bpmnElement="SequenceFlow_ScanFinished">
97+
<di:waypoint xsi:type="dc:Point" x="242" y="328" />
98+
<di:waypoint xsi:type="dc:Point" x="437" y="328" />
10099
<bpmndi:BPMNLabel>
101100
<dc:Bounds x="316" y="420" width="38" height="37" />
102101
</bpmndi:BPMNLabel>
103102
</bpmndi:BPMNEdge>
104103
<bpmndi:BPMNEdge id="SequenceFlow_00fmvcb_di" bpmnElement="SequenceFlow_ResultReviewed">
105-
<di:waypoint x="673" y="202" />
106-
<di:waypoint x="760" y="204" />
104+
<di:waypoint xsi:type="dc:Point" x="673" y="202" />
105+
<di:waypoint xsi:type="dc:Point" x="760" y="204" />
107106
<bpmndi:BPMNLabel>
108107
<dc:Bounds x="794" y="176" width="74" height="12" />
109108
</bpmndi:BPMNLabel>
@@ -118,8 +117,8 @@
118117
</bpmndi:BPMNLabel>
119118
</bpmndi:BPMNShape>
120119
<bpmndi:BPMNEdge id="SequenceFlow_0gjifhk_di" bpmnElement="SequenceFlow_ResultApproved">
121-
<di:waypoint x="810" y="204" />
122-
<di:waypoint x="1077" y="204" />
120+
<di:waypoint xsi:type="dc:Point" x="810" y="204" />
121+
<di:waypoint xsi:type="dc:Point" x="1077" y="204" />
123122
<bpmndi:BPMNLabel>
124123
<dc:Bounds x="999" y="150" width="76" height="13" />
125124
</bpmndi:BPMNLabel>
@@ -131,18 +130,18 @@
131130
</bpmndi:BPMNLabel>
132131
</bpmndi:BPMNShape>
133132
<bpmndi:BPMNEdge id="SequenceFlow_17bwrf0_di" bpmnElement="SequenceFlow_ManualFinish">
134-
<di:waypoint x="462" y="303" />
135-
<di:waypoint x="462" y="204" />
136-
<di:waypoint x="573" y="204" />
133+
<di:waypoint xsi:type="dc:Point" x="462" y="303" />
134+
<di:waypoint xsi:type="dc:Point" x="462" y="204" />
135+
<di:waypoint xsi:type="dc:Point" x="573" y="204" />
137136
<bpmndi:BPMNLabel>
138137
<dc:Bounds x="379" y="246" width="65" height="37" />
139138
</bpmndi:BPMNLabel>
140139
</bpmndi:BPMNEdge>
141140
<bpmndi:BPMNEdge id="SequenceFlow_0s3limw_di" bpmnElement="SequenceFlow_AutomatedFinish">
142-
<di:waypoint x="462" y="353" />
143-
<di:waypoint x="462" y="456" />
144-
<di:waypoint x="1127" y="456" />
145-
<di:waypoint x="1127" y="244" />
141+
<di:waypoint xsi:type="dc:Point" x="462" y="353" />
142+
<di:waypoint xsi:type="dc:Point" x="462" y="456" />
143+
<di:waypoint xsi:type="dc:Point" x="1127" y="456" />
144+
<di:waypoint xsi:type="dc:Point" x="1127" y="244" />
146145
<bpmndi:BPMNLabel>
147146
<dc:Bounds x="803" y="503" width="81" height="12" />
148147
</bpmndi:BPMNLabel>
@@ -151,8 +150,8 @@
151150
<dc:Bounds x="142" y="288" width="100" height="80" />
152151
</bpmndi:BPMNShape>
153152
<bpmndi:BPMNEdge id="SequenceFlow_150f8k2_di" bpmnElement="SequenceFlow_SummaryCreated">
154-
<di:waypoint x="1177" y="204" />
155-
<di:waypoint x="1309" y="204" />
153+
<di:waypoint xsi:type="dc:Point" x="1177" y="204" />
154+
<di:waypoint xsi:type="dc:Point" x="1309" y="204" />
156155
<bpmndi:BPMNLabel>
157156
<dc:Bounds x="1187" y="209" width="85" height="13" />
158157
</bpmndi:BPMNLabel>
@@ -170,13 +169,13 @@
170169
<dc:Bounds x="379" y="420" width="102" height="50" />
171170
</bpmndi:BPMNShape>
172171
<bpmndi:BPMNEdge id="Association_16qrr9w_di" bpmnElement="Association_16qrr9w">
173-
<di:waypoint x="324" y="394" />
174-
<di:waypoint x="379" y="420" />
172+
<di:waypoint xsi:type="dc:Point" x="324" y="394" />
173+
<di:waypoint xsi:type="dc:Point" x="379" y="420" />
175174
</bpmndi:BPMNEdge>
176175
<bpmndi:BPMNEdge id="SequenceFlow_1z0e6c0_di" bpmnElement="SequenceFlow_ResultRejected">
177-
<di:waypoint x="785" y="179" />
178-
<di:waypoint x="785" y="65" />
179-
<di:waypoint x="995" y="65" />
176+
<di:waypoint xsi:type="dc:Point" x="785" y="179" />
177+
<di:waypoint xsi:type="dc:Point" x="785" y="65" />
178+
<di:waypoint xsi:type="dc:Point" x="995" y="65" />
180179
<bpmndi:BPMNLabel>
181180
<dc:Bounds x="849" y="96" width="70" height="13" />
182181
</bpmndi:BPMNLabel>
@@ -185,9 +184,9 @@
185184
<dc:Bounds x="995" y="25" width="100" height="80" />
186185
</bpmndi:BPMNShape>
187186
<bpmndi:BPMNEdge id="SequenceFlow_1i44eck_di" bpmnElement="SequenceFlow_1i44eck">
188-
<di:waypoint x="1095" y="65" />
189-
<di:waypoint x="1127" y="65" />
190-
<di:waypoint x="1127" y="164" />
187+
<di:waypoint xsi:type="dc:Point" x="1095" y="65" />
188+
<di:waypoint xsi:type="dc:Point" x="1127" y="65" />
189+
<di:waypoint xsi:type="dc:Point" x="1127" y="164" />
191190
<bpmndi:BPMNLabel>
192191
<dc:Bounds x="1066" y="43.5" width="90" height="13" />
193192
</bpmndi:BPMNLabel>

‎scb-scanprocesses/archetype-process/src/main/resources/archetype-resources/src/main/resources/forms/default/approve-results.html‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
});
3838
</script>
3939
<div ng-repeat="target in scannerTargets">
40-
<h2>Portscan results for "{{ target.name }}"</h2>
40+
<h2>scan results for "{{ target.name }}"</h2>
4141

4242
<div class="row">
4343
<div class="col-xs-2"><label>Scanner Id:</label></div>
@@ -70,29 +70,30 @@ <h2>Portscan results for "{{ target.name }}"</h2>
7070
<td>{{ result.category }}</td>
7171
<td>
7272
<div ng-switch on="result.severity">
73-
<span class="label label-danger" ng-switch-when="HIGH">
74-
<i aria-hidden="true"
75-
class="glyphicon glyphicon-fire"></i>
76-
{{ result.severity }}
77-
</span>
73+
<span class="label label-danger" ng-switch-when="HIGH">
74+
<i aria-hidden="true"
75+
class="glyphicon glyphicon-fire"></i>
76+
{{ result.severity }}
77+
</span>
7878

79-
<span class="label label-warning" ng-switch-when="MEDIUM">
80-
<i aria-hidden="true"
81-
class="glyphicon glyphicon glyphicon-alert"></i>
82-
{{ result.severity }}
83-
</span>
79+
<span class="label label-warning" ng-switch-when="MEDIUM">
80+
<i aria-hidden="true"
81+
class="glyphicon glyphicon glyphicon-alert"></i>
82+
{{ result.severity }}
83+
</span>
8484

85-
<span class="label label-primary" ng-switch-when="LOW">
86-
<i aria-hidden="true"
87-
class="glyphicon glyphicon-warning-sign"></i>
88-
{{ result.severity }}
89-
</span>
85+
<span class="label label-primary" ng-switch-when="LOW">
86+
<i aria-hidden="true"
87+
class="glyphicon glyphicon-warning-sign"></i>
88+
{{ result.severity }}
89+
</span>
9090

91-
<span class="label label-default" ng-switch-default>
92-
<i aria-hidden="true"
93-
class="glyphicon glyphicon-education"></i>
94-
{{ result.severity }}
95-
</span>
91+
<span class="label label-default" ng-switch-default>
92+
<i aria-hidden="true"
93+
class="glyphicon glyphicon-education"></i>
94+
{{ result.severity }}
95+
</span>
96+
</div>
9697

9798
</td>
9899
<td> {{ result.reference.id }}

‎scb-scanprocesses/archetype-process/src/main/resources/archetype-resources/src/main/resources/forms/default/configure-target.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
~ */
1818
-->
1919

20-
<h2>Please configure the Port Scan</h2>
20+
<h2>Please configure the Scan</h2>
2121

2222
<form role="form" name="configure-target">
2323

@@ -68,7 +68,7 @@ <h2>Please configure the Port Scan</h2>
6868
<div class="row">
6969

7070
<div class="col-xs-12">
71-
<h3>Portscan Target</h3>
71+
<h3>Scan Target</h3>
7272

7373
<!-- Target Hosts -->
7474
<div class="form-group">

0 commit comments

Comments
 (0)