Skip to content

Commit 8c970b5

Browse files
stefanneuhausstefanneuhaus
committed
Update to dependency-check 10.0.1
1 parent 4f68be5 commit 8c970b5

File tree

5 files changed

+93
-24
lines changed

5 files changed

+93
-24
lines changed

‎README.md

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -71,17 +71,18 @@ Updates of the Database are triggered every 2 minutes. The initial update can ta
7171

7272
## Compatibility
7373

74-
| Client | Server |
75-
|-------------------:|--------:|
76-
| `>= 8.0.0` | `9.0.8` |
77-
| `>= 8.0.0` | `8.0.0` |
78-
| `7.4.4` | `7.4.4` |
79-
| `[6.3.0; 7.4.3]` | `6.5.3` |
80-
| `[6.1.3; 6.2.2]` | `6.2.0` |
81-
| `[6.0.0; 6.1.1]` | `6.0.2` |
82-
| `[5.0.0; 5.3.2.1]` | `5.0.0` |
83-
| `[1.4.1; 4.0.2]` | `4.0.2` |
84-
| `< 1.4.1` | n.a. |
74+
| Client | Server |
75+
|-------------------:|---------:|
76+
| `>= 6.3.0` | `10.0.1` |
77+
| `>= 6.3.0` | `9.0.8` |
78+
| `>= 6.3.0` | `8.0.0` |
79+
| `>= 6.3.0` | `7.4.4` |
80+
| `[6.3.0; 7.4.3]` | `6.5.3` |
81+
| `[6.1.3; 6.2.2]` | `6.2.0` |
82+
| `[6.0.0; 6.1.1]` | `6.0.2` |
83+
| `[5.0.0; 5.3.2.1]` | `5.0.0` |
84+
| `[1.4.1; 4.0.2]` | `4.0.2` |
85+
| `< 1.4.1` | n.a. |
8586

8687
The server is not designed for updating its database structure manually. If you update your client to a version which is incompatible with your server version,
8788
you should just throw away the old server container and start a new one from a compatible image from scratch.

‎overlays/dependencycheck/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ buildscript {
1818
mavenCentral()
1919
}
2020
dependencies {
21-
classpath 'org.owasp:dependency-check-gradle:9.0.8'
21+
classpath 'org.owasp:dependency-check-gradle:10.0.1'
2222
classpath 'com.mysql:mysql-connector-j:8.4.0'
2323
}
2424
}

‎overlays/dependencycheck/update.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/sh
22

3-
pgrep java && echo "INFO: Update already running." && exit 1
3+
pgrep -a java && echo "INFO: Update already running." && exit 1
44
touch /dependencycheck/update.log
5-
(cd /dependencycheck && ./gradlew update >>/dependencycheck/update.log 2>&1) || echo "ERROR: update failed."
5+
(cd /dependencycheck && ./gradlew -s update >>/dependencycheck/update.log 2>&1) || (echo "ERROR: update failed." && exit 2)

‎overlays/docker-entrypoint-initdb.d/initialize_schema.sql

Lines changed: 77 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,20 @@ CREATE TABLE vulnerability (id int auto_increment PRIMARY KEY, cve VARCHAR(20) U
3636
v3ImpactScore DECIMAL(3,1), v3AttackVector VARCHAR(20), v3AttackComplexity VARCHAR(20),
3737
v3PrivilegesRequired VARCHAR(20), v3UserInteraction VARCHAR(20), v3Scope VARCHAR(20),
3838
v3ConfidentialityImpact VARCHAR(20), v3IntegrityImpact VARCHAR(20), v3AvailabilityImpact VARCHAR(20),
39-
v3BaseScore DECIMAL(3,1), v3BaseSeverity VARCHAR(20), v3Version VARCHAR(5));
39+
v3BaseScore DECIMAL(3,1), v3BaseSeverity VARCHAR(20), v3Version VARCHAR(5),
40+
v4version VARCHAR(5), v4attackVector VARCHAR(15), v4attackComplexity VARCHAR(15),
41+
v4attackRequirements VARCHAR(15), v4privilegesRequired VARCHAR(15), v4userInteraction VARCHAR(15),
42+
v4vulnConfidentialityImpact VARCHAR(15), v4vulnIntegrityImpact VARCHAR(15), v4vulnAvailabilityImpact VARCHAR(15),
43+
v4subConfidentialityImpact VARCHAR(15), v4subIntegrityImpact VARCHAR(15),
44+
v4subAvailabilityImpact VARCHAR(15), v4exploitMaturity VARCHAR(20), v4confidentialityRequirement VARCHAR(15),
45+
v4integrityRequirement VARCHAR(15), v4availabilityRequirement VARCHAR(15), v4modifiedAttackVector VARCHAR(15),
46+
v4modifiedAttackComplexity VARCHAR(15), v4modifiedAttackRequirements VARCHAR(15), v4modifiedPrivilegesRequired VARCHAR(15),
47+
v4modifiedUserInteraction VARCHAR(15), v4modifiedVulnConfidentialityImpact VARCHAR(15), v4modifiedVulnIntegrityImpact VARCHAR(15),
48+
v4modifiedVulnAvailabilityImpact VARCHAR(15), v4modifiedSubConfidentialityImpact VARCHAR(15), v4modifiedSubIntegrityImpact VARCHAR(15),
49+
v4modifiedSubAvailabilityImpact VARCHAR(15), v4safety VARCHAR(15), v4automatable VARCHAR(15), v4recovery VARCHAR(15),
50+
v4valueDensity VARCHAR(15), v4vulnerabilityResponseEffort VARCHAR(15), v4providerUrgency VARCHAR(15),
51+
v4baseScore DECIMAL(3,1), v4baseSeverity VARCHAR(15), v4threatScore DECIMAL(3,1), v4threatSeverity VARCHAR(15),
52+
v4environmentalScore DECIMAL(3,1), v4environmentalSeverity VARCHAR(15), v4source VARCHAR(50), v4type VARCHAR(15));
4053

4154
CREATE TABLE `reference` (cveid INT, name VARCHAR(1000), url VARCHAR(1000), source VARCHAR(255),
4255
CONSTRAINT fkReference FOREIGN KEY (cveid) REFERENCES vulnerability(id) ON DELETE CASCADE);
@@ -118,8 +131,21 @@ CREATE PROCEDURE update_vulnerability (
118131
IN p_v3ExploitabilityScore DECIMAL(3,1), IN p_v3ImpactScore DECIMAL(3,1), IN p_v3AttackVector VARCHAR(20),
119132
IN p_v3AttackComplexity VARCHAR(20), IN p_v3PrivilegesRequired VARCHAR(20), IN p_v3UserInteraction VARCHAR(20),
120133
IN p_v3Scope VARCHAR(20), IN p_v3ConfidentialityImpact VARCHAR(20), IN p_v3IntegrityImpact VARCHAR(20),
121-
IN p_v3AvailabilityImpact VARCHAR(20), IN p_v3BaseScore DECIMAL(3,1), IN p_v3BaseSeverity VARCHAR(20),
122-
IN p_v3Version VARCHAR(5))
134+
IN p_v3AvailabilityImpact VARCHAR(20), IN p_v3BaseScore DECIMAL(3,1), IN p_v3BaseSeverity VARCHAR(20),
135+
IN p_v3Version VARCHAR(5), IN p_v4version VARCHAR(5), IN p_v4attackVector VARCHAR(15), IN p_v4attackComplexity VARCHAR(15),
136+
IN p_v4attackRequirements VARCHAR(15), IN p_v4privilegesRequired VARCHAR(15), IN p_v4userInteraction VARCHAR(15),
137+
IN p_v4vulnConfidentialityImpact VARCHAR(15), IN p_v4vulnIntegrityImpact VARCHAR(15), IN p_v4vulnAvailabilityImpact VARCHAR(15),
138+
IN p_v4subConfidentialityImpact VARCHAR(15), IN p_v4subIntegrityImpact VARCHAR(15), IN p_v4subAvailabilityImpact VARCHAR(15),
139+
IN p_v4exploitMaturity VARCHAR(20), IN p_v4confidentialityRequirement VARCHAR(15), IN p_v4integrityRequirement VARCHAR(15),
140+
IN p_v4availabilityRequirement VARCHAR(15), IN p_v4modifiedAttackVector VARCHAR(15), IN p_v4modifiedAttackComplexity VARCHAR(15),
141+
IN p_v4modifiedAttackRequirements VARCHAR(15), IN p_v4modifiedPrivilegesRequired VARCHAR(15), IN p_v4modifiedUserInteraction VARCHAR(15),
142+
IN p_v4modifiedVulnConfidentialityImpact VARCHAR(15), IN p_v4modifiedVulnIntegrityImpact VARCHAR(15),
143+
IN p_v4modifiedVulnAvailabilityImpact VARCHAR(15), IN p_v4modifiedSubConfidentialityImpact VARCHAR(15),
144+
IN p_v4modifiedSubIntegrityImpact VARCHAR(15), IN p_v4modifiedSubAvailabilityImpact VARCHAR(15), IN p_v4safety VARCHAR(15),
145+
IN p_v4automatable VARCHAR(15), IN p_v4recovery VARCHAR(15), IN p_v4valueDensity VARCHAR(15), IN p_v4vulnerabilityResponseEffort VARCHAR(15),
146+
IN p_v4providerUrgency VARCHAR(15), IN p_v4baseScore DECIMAL(3,1), IN p_v4baseSeverity VARCHAR(15), IN p_v4threatScore DECIMAL(3,1),
147+
IN p_v4threatSeverity VARCHAR(15), IN p_v4environmentalScore DECIMAL(3,1), IN p_v4environmentalSeverity VARCHAR(15),
148+
IN p_v4source VARCHAR(50), IN p_v4type VARCHAR(15))
123149
BEGIN
124150
DECLARE vulnerabilityId INT DEFAULT 0;
125151

@@ -146,7 +172,25 @@ IF vulnerabilityId > 0 THEN
146172
`v3ExploitabilityScore`=p_v3ExploitabilityScore, `v3ImpactScore`=p_v3ImpactScore, `v3AttackVector`=p_v3AttackVector,
147173
`v3AttackComplexity`=p_v3AttackComplexity, `v3PrivilegesRequired`=p_v3PrivilegesRequired, `v3UserInteraction`=p_v3UserInteraction,
148174
`v3Scope`=p_v3Scope, `v3ConfidentialityImpact`=p_v3ConfidentialityImpact, `v3IntegrityImpact`=p_v3IntegrityImpact,
149-
`v3AvailabilityImpact`=p_v3AvailabilityImpact, `v3BaseScore`=p_v3BaseScore, `v3BaseSeverity`=p_v3BaseSeverity, `v3Version`=p_v3Version
175+
`v3AvailabilityImpact`=p_v3AvailabilityImpact, `v3BaseScore`=p_v3BaseScore, `v3BaseSeverity`=p_v3BaseSeverity, `v3Version`=p_v3Version,
176+
`v4version`=p_v4version, `v4attackVector`=p_v4attackVector, `v4attackComplexity`=p_v4attackComplexity,
177+
`v4attackRequirements`=p_v4attackRequirements, `v4privilegesRequired`=p_v4privilegesRequired,
178+
`v4userInteraction`=p_v4userInteraction, `v4vulnConfidentialityImpact`=p_v4vulnConfidentialityImpact,
179+
`v4vulnIntegrityImpact`=p_v4vulnIntegrityImpact, `v4vulnAvailabilityImpact`=p_v4vulnAvailabilityImpact,
180+
`v4subConfidentialityImpact`=p_v4subConfidentialityImpact, `v4subIntegrityImpact`=p_v4subIntegrityImpact,
181+
`v4subAvailabilityImpact`=p_v4subAvailabilityImpact, `v4exploitMaturity`=p_v4exploitMaturity,
182+
`v4confidentialityRequirement`=p_v4confidentialityRequirement, `v4integrityRequirement`=p_v4integrityRequirement,
183+
`v4availabilityRequirement`=p_v4availabilityRequirement, `v4modifiedAttackVector`=p_v4modifiedAttackVector,
184+
`v4modifiedAttackComplexity`=p_v4modifiedAttackComplexity, `v4modifiedAttackRequirements`=p_v4modifiedAttackRequirements,
185+
`v4modifiedPrivilegesRequired`=p_v4modifiedPrivilegesRequired, `v4modifiedUserInteraction`=p_v4modifiedUserInteraction,
186+
`v4modifiedVulnConfidentialityImpact`=p_v4modifiedVulnConfidentialityImpact, `v4modifiedVulnIntegrityImpact`=p_v4modifiedVulnIntegrityImpact,
187+
`v4modifiedVulnAvailabilityImpact`=p_v4modifiedVulnAvailabilityImpact, `v4modifiedSubConfidentialityImpact`=p_v4modifiedSubConfidentialityImpact,
188+
`v4modifiedSubIntegrityImpact`=p_v4modifiedSubIntegrityImpact, `v4modifiedSubAvailabilityImpact`=p_v4modifiedSubAvailabilityImpact,
189+
`v4safety`=p_v4safety, `v4automatable`=p_v4automatable, `v4recovery`=p_v4recovery, `v4valueDensity`=p_v4valueDensity,
190+
`v4vulnerabilityResponseEffort`=p_v4vulnerabilityResponseEffort, `v4providerUrgency`=p_v4providerUrgency,
191+
`v4baseScore`=p_v4baseScore, `v4baseSeverity`=p_v4baseSeverity, `v4threatScore`=p_v4threatScore,
192+
`v4threatSeverity`=p_v4threatSeverity, `v4environmentalScore`=p_v4environmentalScore, `v4environmentalSeverity`=p_v4environmentalSeverity,
193+
`v4source`=p_v4source, `v4type`=p_v4type
150194
WHERE id=vulnerabilityId;
151195
ELSE
152196
INSERT INTO vulnerability (`cve`, `description`,
@@ -159,8 +203,21 @@ ELSE
159203
`v3ImpactScore`, `v3AttackVector`, `v3AttackComplexity`,
160204
`v3PrivilegesRequired`, `v3UserInteraction`, `v3Scope`,
161205
`v3ConfidentialityImpact`, `v3IntegrityImpact`, `v3AvailabilityImpact`,
162-
`v3BaseScore`, `v3BaseSeverity`, `v3Version`)
163-
VALUES (p_cveId, p_description,
206+
`v3BaseScore`, `v3BaseSeverity`, `v3Version`, `v4version`, `v4attackVector`,
207+
`v4attackComplexity`, `v4attackRequirements`, `v4privilegesRequired`, `v4userInteraction`,
208+
`v4vulnConfidentialityImpact`, `v4vulnIntegrityImpact`, `v4vulnAvailabilityImpact`,
209+
`v4subConfidentialityImpact`, `v4subIntegrityImpact`, `v4subAvailabilityImpact`,
210+
`v4exploitMaturity`, `v4confidentialityRequirement`, `v4integrityRequirement`,
211+
`v4availabilityRequirement`, `v4modifiedAttackVector`, `v4modifiedAttackComplexity`,
212+
`v4modifiedAttackRequirements`, `v4modifiedPrivilegesRequired`, `v4modifiedUserInteraction`,
213+
`v4modifiedVulnConfidentialityImpact`, `v4modifiedVulnIntegrityImpact`,
214+
`v4modifiedVulnAvailabilityImpact`, `v4modifiedSubConfidentialityImpact`,
215+
`v4modifiedSubIntegrityImpact`, `v4modifiedSubAvailabilityImpact`, `v4safety`,
216+
`v4automatable`, `v4recovery`, `v4valueDensity`, `v4vulnerabilityResponseEffort`,
217+
`v4providerUrgency`, `v4baseScore`, `v4baseSeverity`, `v4threatScore`,
218+
`v4threatSeverity`, `v4environmentalScore`, `v4environmentalSeverity`,
219+
`v4source`, `v4type`)
220+
VALUES (p_cveId, p_description,
164221
p_v2Severity, p_v2ExploitabilityScore,
165222
p_v2ImpactScore, p_v2AcInsufInfo, p_v2ObtainAllPrivilege,
166223
p_v2ObtainUserPrivilege, p_v2ObtainOtherPrivilege, p_v2UserInteractionRequired,
@@ -170,8 +227,19 @@ ELSE
170227
p_v3ImpactScore, p_v3AttackVector, p_v3AttackComplexity,
171228
p_v3PrivilegesRequired, p_v3UserInteraction, p_v3Scope,
172229
p_v3ConfidentialityImpact, p_v3IntegrityImpact, p_v3AvailabilityImpact,
173-
p_v3BaseScore, p_v3BaseSeverity, p_v3Version);
174-
230+
p_v3BaseScore, p_v3BaseSeverity, p_v3Version, p_v4version,
231+
p_v4attackVector, p_v4attackComplexity, p_v4attackRequirements, p_v4privilegesRequired,
232+
p_v4userInteraction, p_v4vulnConfidentialityImpact, p_v4vulnIntegrityImpact, p_v4vulnAvailabilityImpact,
233+
p_v4subConfidentialityImpact, p_v4subIntegrityImpact, p_v4subAvailabilityImpact, p_v4exploitMaturity,
234+
p_v4confidentialityRequirement, p_v4integrityRequirement, p_v4availabilityRequirement,
235+
p_v4modifiedAttackVector, p_v4modifiedAttackComplexity, p_v4modifiedAttackRequirements,
236+
p_v4modifiedPrivilegesRequired, p_v4modifiedUserInteraction, p_v4modifiedVulnConfidentialityImpact,
237+
p_v4modifiedVulnIntegrityImpact, p_v4modifiedVulnAvailabilityImpact, p_v4modifiedSubConfidentialityImpact,
238+
p_v4modifiedSubIntegrityImpact, p_v4modifiedSubAvailabilityImpact, p_v4safety, p_v4automatable, p_v4recovery,
239+
p_v4valueDensity, p_v4vulnerabilityResponseEffort, p_v4providerUrgency, p_v4baseScore, p_v4baseSeverity,
240+
p_v4threatScore, p_v4threatSeverity, p_v4environmentalScore, p_v4environmentalSeverity,
241+
p_v4source, p_v4type);
242+
175243
SET vulnerabilityId = LAST_INSERT_ID();
176244
END IF;
177245
SET SQL_SAFE_UPDATES = @OLD_SQL_SAFE_UPDATES;
@@ -283,4 +351,4 @@ END //
283351

284352
DELIMITER ;
285353

286-
INSERT INTO properties(id, value) VALUES ('version', '5.4');
354+
INSERT INTO properties(id, value) VALUES ('version', '5.5');

‎test/project_uptodate/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ buildscript {
33
mavenCentral()
44
}
55
dependencies {
6-
classpath 'org.owasp:dependency-check-gradle:9.0.8'
6+
classpath 'org.owasp:dependency-check-gradle:10.0.1'
77
classpath 'com.mysql:mysql-connector-j:8.4.0'
88
}
99
}

0 commit comments

Comments
 (0)