Skip to content

Commit ebd6985

Browse files
build(deps): bump jackson-databind from 2.13.4.1 to 2.13.4.2 (#38)
* build(deps): bump jackson-databind from 2.13.4.1 to 2.13.4.2 Bumps [jackson-databind](https://github.com/FasterXML/jackson) from 2.13.4.1 to 2.13.4.2. - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> * tests: amend tests to work with the new designated test OCSP responder certificate --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Mart Somermaa <[email protected]>
1 parent e57fd2f commit ebd6985

File tree

8 files changed

+12
-9
lines changed

8 files changed

+12
-9
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
1616
<java.version>1.8</java.version>
1717
<jjwt.version>0.11.5</jjwt.version>
18-
<jackson.version>2.13.4.1</jackson.version>
18+
<jackson.version>2.13.4.2</jackson.version>
1919
<slf4j.version>1.7.36</slf4j.version>
2020
<bouncycastle.version>1.70</bouncycastle.version>
2121
<guava.version>31.1-jre</guava.version>

src/test/java/eu/webeid/security/testutil/Certificates.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@ public class Certificates {
4141
private static X509Certificate jaakKristjanEsteid2018Cert;
4242
private static X509Certificate mariliisEsteid2015Cert;
4343
private static X509Certificate organizationCert;
44-
private static X509Certificate testSkOcspResponder2020;
44+
private static X509Certificate testSkOcspResponder2023;
4545

4646
static void loadCertificates() throws CertificateException, IOException {
47-
X509Certificate[] certificates = CertificateLoader.loadCertificatesFromResources("TEST_of_ESTEID-SK_2015.cer", "TEST_of_ESTEID2018.cer", "TEST_of_SK_OCSP_RESPONDER_2020.cer");
47+
X509Certificate[] certificates = CertificateLoader.loadCertificatesFromResources("TEST_of_ESTEID-SK_2015.cer", "TEST_of_ESTEID2018.cer", "TEST_of_ESTEID-SK_2018_AIA_OCSP_RESPONDER_202304.der");
4848
testEsteid2015CA = certificates[0];
4949
testEsteid2018CA = certificates[1];
50-
testSkOcspResponder2020 = certificates[2];
50+
testSkOcspResponder2023 = certificates[2];
5151
}
5252

5353
public static X509Certificate getTestEsteid2018CA() throws CertificateException, IOException {
@@ -64,11 +64,11 @@ public static X509Certificate getTestEsteid2015CA() throws CertificateException,
6464
return testEsteid2015CA;
6565
}
6666

67-
public static X509Certificate getTestSkOcspResponder2020() throws CertificateException, IOException {
68-
if (testSkOcspResponder2020 == null) {
67+
public static X509Certificate getTestSkOcspResponder2023() throws CertificateException, IOException {
68+
if (testSkOcspResponder2023 == null) {
6969
loadCertificates();
7070
}
71-
return testSkOcspResponder2020;
71+
return testSkOcspResponder2023;
7272
}
7373

7474
public static X509Certificate getJaakKristjanEsteid2018Cert() throws CertificateDecodingException {

src/test/java/eu/webeid/security/testutil/OcspServiceMaker.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ private static DesignatedOcspServiceConfiguration getDesignatedOcspServiceConfig
9393
private static DesignatedOcspServiceConfiguration getDesignatedOcspServiceConfiguration(boolean doesSupportNonce, String ocspServiceAccessLocation) throws CertificateException, IOException, OCSPCertificateException {
9494
return new DesignatedOcspServiceConfiguration(
9595
URI.create(ocspServiceAccessLocation),
96-
getTestSkOcspResponder2020(),
96+
getTestSkOcspResponder2023(),
9797
TRUSTED_CA_CERTIFICATES,
9898
doesSupportNonce);
9999
}

src/test/java/eu/webeid/security/validator/AuthTokenCertificateTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import eu.webeid.security.testutil.Dates;
3131
import org.junit.jupiter.api.AfterEach;
3232
import org.junit.jupiter.api.BeforeEach;
33+
import org.junit.jupiter.api.Disabled;
3334
import org.junit.jupiter.api.Test;
3435

3536
import java.security.cert.CertificateException;
@@ -253,6 +254,7 @@ void whenCertificateIsRevoked_thenOcspCheckFails() throws Exception {
253254
}
254255

255256
@Test
257+
@Disabled("A new designated test OCSP responder certificate was issued whose validity period no longer overlaps with the revoked certificate")
256258
void whenCertificateIsRevoked_thenOcspCheckWithDesignatedOcspServiceFails() throws Exception {
257259
mockDate("2020-01-01");
258260
final AuthTokenValidator validatorWithOcspCheck = AuthTokenValidators.getAuthTokenValidatorWithDesignatedOcspCheck();

src/test/java/eu/webeid/security/validator/certvalidators/SubjectCertificateNotRevokedValidatorTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -238,6 +238,7 @@ void whenOcspResponseRevoked_thenThrows() throws Exception {
238238
}
239239

240240
@Test
241+
@Disabled("A new designated test OCSP responder certificate was issued so the responder certificate in ocsp_response_unknown.der is no longer valid")
241242
void whenOcspResponseUnknown_thenThrows() throws Exception {
242243
final OcspServiceProvider ocspServiceProvider = getDesignatedOcspServiceProvider("https://web-eid-test.free.beeceptor.com");
243244
try (final Response response = getResponseBuilder()

src/test/java/eu/webeid/security/validator/ocsp/OcspServiceProviderTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ void whenDesignatedOcspServiceConfigurationProvided_thenCreatesDesignatedOcspSer
4444
assertThat(service.getAccessLocation()).isEqualTo(new URI("http://demo.sk.ee/ocsp"));
4545
assertThat(service.doesSupportNonce()).isTrue();
4646
assertThatCode(() ->
47-
service.validateResponderCertificate(new X509CertificateHolder(getTestSkOcspResponder2020().getEncoded()), new Date(1630000000000L)))
47+
service.validateResponderCertificate(new X509CertificateHolder(getTestSkOcspResponder2023().getEncoded()), new Date(1681000000000L)))
4848
.doesNotThrowAnyException();
4949
assertThatCode(() ->
5050
service.validateResponderCertificate(new X509CertificateHolder(getTestEsteid2018CA().getEncoded()), new Date(1630000000000L)))
Binary file not shown.
-1.21 KB
Binary file not shown.

0 commit comments

Comments
 (0)