diff --git a/owasp-false-positive-warnings.xml b/owasp-false-positive-warnings.xml index 9974d484fc1e2f7ac5a71bc5f07149bda195a605..5ce76ba0da2776ee1fd28855bc212a157a84695f 100644 --- a/owasp-false-positive-warnings.xml +++ b/owasp-false-positive-warnings.xml @@ -2,16 +2,16 @@ <suppressions xmlns="https://jeremylong.github.io/DependencyCheck/dependency-suppression.1.3.xsd"> <suppress> <notes><![CDATA[ - file name: spring-security-crypto-5.7.2.jar - ]]></notes> - <packageUrl regex="true">^pkg:maven/org\.springframework\.security/spring\-security\-crypto@5.7.2$</packageUrl> + file name: spring-security-crypto-5.7.5.jar + ]]></notes> + <packageUrl regex="true">^pkg:maven/org\.springframework\.security/spring\-security\-crypto@.*$</packageUrl> <vulnerabilityName>CVE-2020-5408</vulnerabilityName> </suppress> <suppress> <notes><![CDATA[ - file names for spring framework: spring-*-5.3.21.jar + file name: spring-web-5.3.23.jar ]]></notes> - <packageUrl regex="true">^pkg:maven/org\.springframework/spring\-(core|web|oap)@5.3.21.*$</packageUrl> + <packageUrl regex="true">^pkg:maven/org\.springframework/spring\-web@.*$</packageUrl> <cve>CVE-2016-1000027</cve> </suppress> </suppressions> \ No newline at end of file diff --git a/pom.xml b/pom.xml index bfd53d569f83eb75e3ddc2dfec78a26521445ef9..365ec43944025055c445bb8ee7bc29d69d67b434 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ <maven.compiler.target>1.8</maven.compiler.target> <maven.compiler.source>1.8</maven.compiler.source> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <edelivery.ssl-auth.version>1.11</edelivery.ssl-auth.version> + <edelivery.ssl-auth.version>1.12-SNAPSHOT</edelivery.ssl-auth.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <ant-commons-net.version>1.6.5</ant-commons-net.version> @@ -59,8 +59,8 @@ <hibernate.validator.version>7.0.1.Final</hibernate.validator.version> <hibernate.version>5.6.9.Final</hibernate.version> <httpclient.version>4.5.13</httpclient.version> - <jackson-databind.version>2.13.3</jackson-databind.version> - <jackson.version>2.13.3</jackson.version> + <jackson-databind.version>2.13.4.2</jackson-databind.version> + <jackson.version>2.13.4</jackson.version> <javaee-api.version>7.0</javaee-api.version> <javax.annotation.version>1.3.2</javax.annotation.version> <javax.mail.version>1.6.2</javax.mail.version> @@ -78,8 +78,8 @@ <soapui.plugin.version>5.1.2</soapui.plugin.version> <spring-modules-jakarta-commons.version>0.8</spring-modules-jakarta-commons.version> <spring.boot.version>2.7.4</spring.boot.version> - <spring.security.version>5.7.2</spring.security.version> - <spring.version>5.3.21</spring.version> + <spring.security.version>5.7.5</spring.security.version> + <spring.version>5.3.23</spring.version> <xmlunit.version>2.9.0</xmlunit.version> <!-- plugins --> diff --git a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UITruststoreService.java b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UITruststoreService.java index 11d51b349379fabd5003d54d32aaf54c38f6ee8b..f074781cebab3b6c9f583a06f3547d3d1d027885 100644 --- a/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UITruststoreService.java +++ b/smp-server-library/src/main/java/eu/europa/ec/edelivery/smp/services/ui/UITruststoreService.java @@ -255,7 +255,7 @@ public class UITruststoreService { Pattern subjectRegExp = configurationService.getCertificateSubjectRegularExpression(); List<String> allowedCertificatePolicies = configurationService.getAllowedCertificatePolicies(); CertificateValidator certificateValidator = new CertificateValidator( - null, truststore, + Collections.emptyList(), truststore, subjectRegExp != null ? subjectRegExp.pattern() : null, allowedCertificatePolicies != null ? allowedCertificatePolicies : Collections.emptyList()); LOG.debug("Validate certificate with truststore, subject regexp [{}] and allowed certificate policies [{}]", subjectRegExp, allowedCertificatePolicies);