Merge pull request #8 from minvws/chore/update-gradle

update gradle
minvws · Aug 6, 2023 · 765ebd7 · 765ebd7
2 parents 549e907 + f515f05
commit 765ebd7
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 13 deletions.
diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
@@ -9,7 +9,7 @@ runs:
     - name: Set up JDK
       uses: actions/setup-java@v3
       with:
-        java-version: 11
+        java-version: 17
         distribution: 'temurin'
     - name: Show java version
       shell: bash

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Fri Oct 21 14:50:24 CEST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/...c/main/java/nl/rijksoverheid/rdo/modules/httpsecurity/cms/CMSSignatureValidatorBuilder.kt b/...c/main/java/nl/rijksoverheid/rdo/modules/httpsecurity/cms/CMSSignatureValidatorBuilder.kt
@@ -12,7 +12,6 @@ object CMSSignatureValidatorBuilder {
         cnMatchingString: String? = null,
         clock: Clock
     ): CMSSignatureValidatorImpl {
-
         return CMSSignatureValidatorImpl(
             signingCertificates = emptyList(),
             trustAnchors = trustCertificates(certificatesPem),
@@ -55,7 +54,6 @@ object CMSSignatureValidatorBuilder {
         certificatesPem: List<String>,
         signingCertificates: List<X509Certificate>
     ): CMSSignatureValidatorImpl {
-
         return CMSSignatureValidatorImpl(
             signingCertificates = signingCertificates,
             trustAnchors = trustCertificates(certificatesPem),

diff --git a/.../src/main/java/nl/rijksoverheid/rdo/modules/httpsecurity/cms/CMSSignatureValidatorImpl.kt b/.../src/main/java/nl/rijksoverheid/rdo/modules/httpsecurity/cms/CMSSignatureValidatorImpl.kt
@@ -45,7 +45,8 @@ class CMSSignatureValidatorImpl internal constructor(
             val sp = CMSSignedDataParser(
                 JcaDigestCalculatorProviderBuilder().setProvider(provider)
                     .build(),
-                CMSTypedStream(BufferedInputStream(content)), signature
+                CMSTypedStream(BufferedInputStream(content)),
+                signature
             )
 
             sp.signedContent.drain()
@@ -71,7 +72,8 @@ class CMSSignatureValidatorImpl internal constructor(
                 if (this.signingCertificates.all {
                         val expiringTime = it.notAfter.time
                         nowMs > expiringTime
-                    }) {
+                    }
+                ) {
                     throw SignatureValidationException("Expired certificate")
                 }
             }
@@ -89,7 +91,8 @@ class CMSSignatureValidatorImpl internal constructor(
                         .map { IETFUtils.valueToString(it.first.value) }
                 if (!subjectRDNs.any {
                         it.endsWith(matchingString)
-                    }) {
+                    }
+                ) {
                     throw SignatureValidationException("Signing certificate does not match expected CN")
                 }
             }