Skip to content
This repository has been archived by the owner on May 16, 2023. It is now read-only.

Chore: Update CWA-Parent to 1.7.1 #137

Merged
merged 4 commits into from
Nov 17, 2022
Merged

Chore: Update CWA-Parent to 1.7.1 #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
917f1b6
Update CWA-Parent to 1.7.1
invalid-email-address Oct 14, 2022
95576d0
Update Checkstyle Config to > 3.2.0
f11h Oct 14, 2022
004ad90
Update OWASP Supression File
f11h Oct 14, 2022
c070be9
Fix Checkstyle
f11h Oct 14, 2022
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
2 changes: 1 addition & 1 deletion codestyle/checkstyle.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@
value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
</module>
<module name="JavadocMethod">
<property name="scope" value="public"/>
<property name="accessModifiers" value="public"/>
<property name="allowMissingParamTags" value="true"/>
<property name="allowMissingReturnTag" value="true"/>
<property name="allowedAnnotations" value="Override, Test"/>
Expand Down
24 changes: 16 additions & 8 deletions owasp/suppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd">

<suppress>
<notes>Bug only affects not used features of embedded tomcat.</notes>
<cve>CVE-2022-23181</cve>
<notes>Updating of Keycloak Lib is not possible at the moment. Security risk is not affecting CWA components.</notes>
<cve>CVE-2022-1466</cve>
<cve>CVE-2022-1970</cve>
<cve>CVE-2021-20323</cve>
<cve>CVE-2020-14359</cve>
</suppress>

<suppress>
Expand All @@ -16,17 +20,21 @@
</suppress>

<suppress>
<notes>CVE warns about usage of sample code in Tomcat Repository. This code is not used by us.</notes>
<cve>CVE-2022-34305</cve>
<notes>False Positive matches</notes>
<cve>CVE-2022-31514</cve>
<cve>CVE-2022-2393</cve>
</suppress>

<suppress>
<notes>False Positive</notes>
<cve>CVE-2022-31514</cve>
<notes>Keycloak Update is currently not possible</notes>
<cve>CVE-2022-1245</cve>
<cve>CVE-2022-2668</cve>
<cve>CVE-2021-3827</cve>
</suppress>

<suppress>
<notes>False Positive (https://github.com/jeremylong/DependencyCheck/issues/4693)</notes>
<cve>CVE-2022-2393</cve>
<notes>SnakeYML False Positive Matcher (CVE is up to 1.32, but also matches for 1.33)</notes>
<cve>CVE-2022-38752</cve>
</suppress>

</suppressions>
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<parent>
<groupId>app.coronawarn</groupId>
<artifactId>cwa-parent</artifactId>
<version>1.6</version>
<version>1.7.1</version>
<relativePath/>
</parent>

Expand Down
13 changes: 6 additions & 7 deletions src/main/java/app/coronawarn/testresult/TestResultController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@

package app.coronawarn.testresult;

import app.coronawarn.testresult.model.PocNatResult;
import app.coronawarn.testresult.model.PocNatResultList;
import app.coronawarn.testresult.model.QuickTestResultList;
import app.coronawarn.testresult.model.TestResult;
Expand Down Expand Up @@ -69,7 +68,7 @@ public class TestResultController {
responseCode = "200",
description = "Content exists",
content = @Content(schema = @Schema(implementation = TestResultResponse.class))
)
)
}
)
@PostMapping(
Expand Down Expand Up @@ -103,7 +102,7 @@ public ResponseEntity<TestResultResponse> result(
@ApiResponse(
responseCode = "204",
description = "No content, testresult successfully inserted"
)
)
}
)
@PostMapping(
Expand Down Expand Up @@ -137,7 +136,7 @@ public ResponseEntity<Object> results(
@ApiResponse(
responseCode = "200",
description = "Ok, RAT result inserted successfully."
)
)
}
)
@PostMapping(
Expand Down Expand Up @@ -169,7 +168,7 @@ public ResponseEntity<TestResultResponse> quickTestResult(
@ApiResponse(
responseCode = "204",
description = "No content, RAT result(s) inserted successfully."
)
)
}
)
@PostMapping(
Expand Down Expand Up @@ -203,7 +202,7 @@ public ResponseEntity<Object> quicktestResults(
@ApiResponse(
responseCode = "200",
description = "Ok, PoC-NAT result inserted successfully."
)
)
}
)
@PostMapping(
Expand Down Expand Up @@ -235,7 +234,7 @@ public ResponseEntity<TestResultResponse> pocnatResult(
@ApiResponse(
responseCode = "204",
description = "No content, PoC-NAT result(s) inserted successfully."
)
)
}
)
@PostMapping(
Expand Down