From 6fdce5b63f7e8707c95884efe022e0bf1f3f3961 Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Fri, 29 Apr 2022 17:28:45 +0200 Subject: [PATCH 01/12] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a40aa7e..5b56905 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ SPDX-License-Identifier: Apache-2.0 ## 0.1.1 - Bump `pgpainless-core` to `1.2.1` +- Bump `cert-d-pgpainless` to `0.1.2` - Bump `pgp-certificate-store` to `0.1.1` - Bump `slf4j` to `1.7.36` - Bump `logback` to `1.2.11` From 5a8c886409db9d327b1a6ff3a3e8ab38d1db4485 Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Mon, 1 Aug 2022 17:17:21 +0200 Subject: [PATCH 02/12] Add woodpecker CI --- .reuse/dep5 | 5 +++++ .woodpecker/.build.yml | 12 ++++++++++++ .woodpecker/.reuse.yml | 7 +++++++ 3 files changed, 24 insertions(+) create mode 100644 .woodpecker/.build.yml create mode 100644 .woodpecker/.reuse.yml diff --git a/.reuse/dep5 b/.reuse/dep5 index b8bb6be..b613adc 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -13,3 +13,8 @@ Source: https://pgpainless.org Files: gradle* Copyright: 2015 the original author or authors. License: Apache-2.0 + +# Woodpecker build files +Files: .woodpecker/* +Copyright: 2022 the original author or authors. +License: Apache-2.0 diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml new file mode 100644 index 0000000..f504b44 --- /dev/null +++ b/.woodpecker/.build.yml @@ -0,0 +1,12 @@ +pipeline: + run: + image: gradle:7.5-jdk8 + commands: + - git checkout $CI_COMMIT_BRANCH + # Code works + - gradle test + # Code is clean + - gradle check javadocAll + # Code has coverage + - gradle jacocoRootReport coveralls + secrets: [COVERALLS_REPO_TOKEN] diff --git a/.woodpecker/.reuse.yml b/.woodpecker/.reuse.yml new file mode 100644 index 0000000..58f17e6 --- /dev/null +++ b/.woodpecker/.reuse.yml @@ -0,0 +1,7 @@ +# Code is licensed properly +# See https://reuse.software/ +pipeline: + reuse: + image: fsfe/reuse:latest + commands: + - reuse lint \ No newline at end of file From 55b08bcb258657a808fad125c715eb4521108359 Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Mon, 1 Aug 2022 17:22:45 +0200 Subject: [PATCH 03/12] Add badges for CI and Coveralls --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 90e6132..98d25c6 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,10 @@ SPDX-License-Identifier: Apache-2.0 # Web Key Directory for Java +[![status-badge](https://ci.codeberg.org/api/badges/PGPainless/wkd-java/status.svg)](https://ci.codeberg.org/PGPainless/wkd-java) +[![Coverage Status](https://coveralls.io/repos/github/pgpainless/wkd-java/badge.svg?branch=main)](https://coveralls.io/github/pgpainless/wkd-java?branch=main) +[![REUSE status](https://api.reuse.software/badge/github.com/pgpainless/wkd-java)](https://api.reuse.software/info/github.com/pgpainless/wkd-java) + Client-side API for fetching OpenPGP certificates via the [Web Key Directory](https://www.ietf.org/archive/id/draft-koch-openpgp-webkey-service-13.html) protocol. ## Modules From 607518f94571154160e88f5e9913ca95a0b737df Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Thu, 4 Aug 2022 13:26:22 +0200 Subject: [PATCH 04/12] Add support for i18n using resource bundles --- wkd-java-cli/src/main/java/pgp/wkd/cli/WKDCLI.java | 2 +- .../src/main/java/pgp/wkd/cli/command/GetCmd.java | 10 +++------- wkd-java-cli/src/main/resources/msg_get.properties | 12 ++++++++++++ .../src/main/resources/msg_get_de.properties | 12 ++++++++++++ wkd-java-cli/src/main/resources/msg_wkd.properties | 10 ++++++++++ .../src/main/resources/msg_wkd_de.properties | 10 ++++++++++ 6 files changed, 48 insertions(+), 8 deletions(-) create mode 100644 wkd-java-cli/src/main/resources/msg_get.properties create mode 100644 wkd-java-cli/src/main/resources/msg_get_de.properties create mode 100644 wkd-java-cli/src/main/resources/msg_wkd.properties create mode 100644 wkd-java-cli/src/main/resources/msg_wkd_de.properties diff --git a/wkd-java-cli/src/main/java/pgp/wkd/cli/WKDCLI.java b/wkd-java-cli/src/main/java/pgp/wkd/cli/WKDCLI.java index 4fed57d..9615cc4 100644 --- a/wkd-java-cli/src/main/java/pgp/wkd/cli/WKDCLI.java +++ b/wkd-java-cli/src/main/java/pgp/wkd/cli/WKDCLI.java @@ -11,7 +11,7 @@ import picocli.CommandLine; @CommandLine.Command( name = "wkd", - description = "Interact with the Web Key Directory", + resourceBundle = "msg_wkd", subcommands = { CommandLine.HelpCommand.class, GetCmd.class diff --git a/wkd-java-cli/src/main/java/pgp/wkd/cli/command/GetCmd.java b/wkd-java-cli/src/main/java/pgp/wkd/cli/command/GetCmd.java index b5d7c05..1606897 100644 --- a/wkd-java-cli/src/main/java/pgp/wkd/cli/command/GetCmd.java +++ b/wkd-java-cli/src/main/java/pgp/wkd/cli/command/GetCmd.java @@ -21,22 +21,18 @@ import java.io.OutputStream; @CommandLine.Command( name = "get", - description = "Get an OpenPGP Certificate via the Web Key Directory" + resourceBundle = "msg_get" ) public class GetCmd implements Runnable { @CommandLine.Parameters( index = "0", arity = "1", - paramLabel = "USERID", - description = "Certificate User-ID" - ) + paramLabel = "USERID") String userId; @CommandLine.Option( - names = {"-a", "--armor"}, - description = "ASCII Armor the output" - ) + names = {"-a", "--armor"}) boolean armor = false; public static final CertificateDiscoverer DEFAULT_DISCOVERER = new ValidatingCertificateDiscoverer( diff --git a/wkd-java-cli/src/main/resources/msg_get.properties b/wkd-java-cli/src/main/resources/msg_get.properties new file mode 100644 index 0000000..e3d5714 --- /dev/null +++ b/wkd-java-cli/src/main/resources/msg_get.properties @@ -0,0 +1,12 @@ +# SPDX-FileCopyrightText: 2022 Paul Schaub +# +# SPDX-License-Identifier: Apache-2.0 +usage.header=Get an OpenPGP Certificate via the Web Key Directory +USERID[0]=Certificate User-ID +armor=ASCII Armor the output + +# Generic TODO: Remove when bumping picocli to 4.7.0 +usage.synopsisHeading=Usage:\u0020 +usage.commandListHeading = %nCommands:%n +usage.optionListHeading = %nOptions:%n +usage.footerHeading=Powered by picocli%n diff --git a/wkd-java-cli/src/main/resources/msg_get_de.properties b/wkd-java-cli/src/main/resources/msg_get_de.properties new file mode 100644 index 0000000..dc1e396 --- /dev/null +++ b/wkd-java-cli/src/main/resources/msg_get_de.properties @@ -0,0 +1,12 @@ +# SPDX-FileCopyrightText: 2022 Paul Schaub +# +# SPDX-License-Identifier: Apache-2.0 +usage.header=Empfange ein OpenPGP Zertifikat mithilfe des Web Key Directory +USERID[0]=Nutzeridentität des Zertifikats +armor=Schütze die Ausgabe mit ASCII Armor + +# Generic TODO: Remove when bumping picocli to 4.7.0 +usage.synopsisHeading=Aufruf:\u0020 +usage.commandListHeading=%nBefehle:%n +usage.optionListHeading = %nOptionen:%n +usage.footerHeading=Powered by Picocli%n diff --git a/wkd-java-cli/src/main/resources/msg_wkd.properties b/wkd-java-cli/src/main/resources/msg_wkd.properties new file mode 100644 index 0000000..cd73615 --- /dev/null +++ b/wkd-java-cli/src/main/resources/msg_wkd.properties @@ -0,0 +1,10 @@ +# SPDX-FileCopyrightText: 2022 Paul Schaub +# +# SPDX-License-Identifier: Apache-2.0 +usage.header=Interact with the Web Key Directory + +# Generic TODO: Remove when bumping picocli to 4.7.0 +usage.synopsisHeading=Usage:\u0020 +usage.commandListHeading = %nCommands:%n +usage.optionListHeading = %nOptions:%n +usage.footerHeading=Powered by picocli%n diff --git a/wkd-java-cli/src/main/resources/msg_wkd_de.properties b/wkd-java-cli/src/main/resources/msg_wkd_de.properties new file mode 100644 index 0000000..b87f2a8 --- /dev/null +++ b/wkd-java-cli/src/main/resources/msg_wkd_de.properties @@ -0,0 +1,10 @@ +# SPDX-FileCopyrightText: 2022 Paul Schaub +# +# SPDX-License-Identifier: Apache-2.0 +usage.header=Interagiere mit dem Web Key Directory + +# Generic TODO: Remove when bumping picocli to 4.7.0 +usage.synopsisHeading=Aufruf:\u0020 +usage.commandListHeading=%nBefehle:%n +usage.optionListHeading = %nOptionen:%n +usage.footerHeading=Powered by Picocli%n From 2a1676904f77fa9b0cd0bc6e9bb72c8467ac76a8 Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Thu, 4 Aug 2022 13:26:46 +0200 Subject: [PATCH 05/12] Fix user-id format on test key --- .../wkd/cli/online_test_vectors/TestGetKeysFromGithubPages.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wkd-java-cli/src/test/java/pgp/wkd/cli/online_test_vectors/TestGetKeysFromGithubPages.java b/wkd-java-cli/src/test/java/pgp/wkd/cli/online_test_vectors/TestGetKeysFromGithubPages.java index fa96e4a..25bcd55 100644 --- a/wkd-java-cli/src/test/java/pgp/wkd/cli/online_test_vectors/TestGetKeysFromGithubPages.java +++ b/wkd-java-cli/src/test/java/pgp/wkd/cli/online_test_vectors/TestGetKeysFromGithubPages.java @@ -16,7 +16,7 @@ public class TestGetKeysFromGithubPages extends RedirectSystemStreamsTest { // Valid WKD publication. // Cert is available at https://pgpainless.github.io/.well-known/openpgpkey/hu/eprjcbeppbna3f6xabhtpddzpn41nknw - private static final String USERID_BASE = "WKD Test [Base Case - Valid User-ID]"; + private static final String USERID_BASE = "WKD Test (Base Case - Valid User-ID) "; private static final String MAIL_BASE = "wkd-test-base@pgpainless.github.io"; @Test From f9543cddaed02c10c30dde4ef5db2db40bf8cbc2 Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Tue, 13 Sep 2022 12:31:26 +0200 Subject: [PATCH 06/12] Fix NPE when fetching unfetchable cert --- .../src/main/java/pgp/wkd/discovery/DiscoveryResponse.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/wkd-java/src/main/java/pgp/wkd/discovery/DiscoveryResponse.java b/wkd-java/src/main/java/pgp/wkd/discovery/DiscoveryResponse.java index e1b6ac1..dc2ab99 100644 --- a/wkd-java/src/main/java/pgp/wkd/discovery/DiscoveryResponse.java +++ b/wkd-java/src/main/java/pgp/wkd/discovery/DiscoveryResponse.java @@ -12,6 +12,7 @@ import pgp.wkd.exception.MissingPolicyFileException; import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.net.URI; +import java.util.ArrayList; import java.util.List; /** @@ -170,8 +171,8 @@ public final class DiscoveryResponse { private DiscoveryMethod discoveryMethod; private WKDAddress address; - private List acceptableCertificates; - private List rejectedCertificates; + private List acceptableCertificates = new ArrayList<>(); + private List rejectedCertificates = new ArrayList<>(); private Throwable fetchingFailure; private WKDPolicy policy; private MissingPolicyFileException missingPolicyFileException; From e9f2efd15a21dd64e288f32d1760ebd6aff165c0 Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Fri, 25 Nov 2022 16:17:24 +0100 Subject: [PATCH 07/12] Bump pgpainless-core to 1.3.12, pgpainless-cert-d to 0.2.1, cert-d-java to 0.2.1 --- version.gradle | 6 +++--- .../main/java/pgp/wkd/cli/PGPainlessCertificateParser.java | 4 ++-- wkd-java/src/main/java/pgp/wkd/CertificateAndUserIds.java | 2 +- wkd-java/src/main/java/pgp/wkd/RejectedCertificate.java | 3 ++- .../src/main/java/pgp/wkd/discovery/DiscoveryResponse.java | 2 +- .../src/main/java/pgp/wkd/discovery/DiscoveryResult.java | 2 +- .../pgp/wkd/discovery/ValidatingCertificateDiscoverer.java | 2 +- .../java/pgp/wkd/test_suite/AbstractTestSuiteGenerator.java | 2 +- 8 files changed, 12 insertions(+), 11 deletions(-) diff --git a/version.gradle b/version.gradle index 34b53bb..6e2a3c4 100644 --- a/version.gradle +++ b/version.gradle @@ -16,10 +16,10 @@ allprojects { slf4jVersion = '1.7.36' logbackVersion = '1.2.11' mockitoVersion = '4.5.1' - pgpainlessVersion = '1.2.1' - pgpainlessCertDVersion = '0.1.2' + pgpainlessVersion = '1.3.12' + pgpainlessCertDVersion = '0.2.1' picocliVersion = '4.6.3' - certDJavaVersion = '0.1.1' + certDJavaVersion = '0.2.1' zbase32Version = '1.0.0' } } diff --git a/wkd-java-cli/src/main/java/pgp/wkd/cli/PGPainlessCertificateParser.java b/wkd-java-cli/src/main/java/pgp/wkd/cli/PGPainlessCertificateParser.java index 8aeb723..15a89fa 100644 --- a/wkd-java-cli/src/main/java/pgp/wkd/cli/PGPainlessCertificateParser.java +++ b/wkd-java-cli/src/main/java/pgp/wkd/cli/PGPainlessCertificateParser.java @@ -10,7 +10,7 @@ import org.bouncycastle.openpgp.PGPPublicKeyRingCollection; import org.pgpainless.PGPainless; import org.pgpainless.certificate_store.CertificateFactory; import org.pgpainless.key.info.KeyRingInfo; -import pgp.certificate_store.Certificate; +import pgp.certificate_store.certificate.Certificate; import pgp.wkd.CertificateAndUserIds; import pgp.wkd.discovery.CertificateParser; @@ -27,7 +27,7 @@ public class PGPainlessCertificateParser implements CertificateParser { PGPPublicKeyRingCollection certificates = PGPainless.readKeyRing().publicKeyRingCollection(inputStream); for (PGPPublicKeyRing certificate : certificates) { KeyRingInfo info = PGPainless.inspectKeyRing(certificate); - Certificate parsedCert = CertificateFactory.certificateFromPublicKeyRing(certificate); + Certificate parsedCert = CertificateFactory.certificateFromPublicKeyRing(certificate, 0L); List userIds = info.getValidAndExpiredUserIds(); certificatesAndUserIds.add(new CertificateAndUserIds(parsedCert, userIds)); } diff --git a/wkd-java/src/main/java/pgp/wkd/CertificateAndUserIds.java b/wkd-java/src/main/java/pgp/wkd/CertificateAndUserIds.java index 5c0b606..f964805 100644 --- a/wkd-java/src/main/java/pgp/wkd/CertificateAndUserIds.java +++ b/wkd-java/src/main/java/pgp/wkd/CertificateAndUserIds.java @@ -4,7 +4,7 @@ package pgp.wkd; -import pgp.certificate_store.Certificate; +import pgp.certificate_store.certificate.Certificate; import java.util.ArrayList; import java.util.List; diff --git a/wkd-java/src/main/java/pgp/wkd/RejectedCertificate.java b/wkd-java/src/main/java/pgp/wkd/RejectedCertificate.java index 7a227b4..f96b85e 100644 --- a/wkd-java/src/main/java/pgp/wkd/RejectedCertificate.java +++ b/wkd-java/src/main/java/pgp/wkd/RejectedCertificate.java @@ -4,7 +4,8 @@ package pgp.wkd; -import pgp.certificate_store.Certificate; + +import pgp.certificate_store.certificate.Certificate; /** * A rejected OpenPGP certificate. diff --git a/wkd-java/src/main/java/pgp/wkd/discovery/DiscoveryResponse.java b/wkd-java/src/main/java/pgp/wkd/discovery/DiscoveryResponse.java index dc2ab99..d48a2ce 100644 --- a/wkd-java/src/main/java/pgp/wkd/discovery/DiscoveryResponse.java +++ b/wkd-java/src/main/java/pgp/wkd/discovery/DiscoveryResponse.java @@ -4,7 +4,7 @@ package pgp.wkd.discovery; -import pgp.certificate_store.Certificate; +import pgp.certificate_store.certificate.Certificate; import pgp.wkd.RejectedCertificate; import pgp.wkd.WKDAddress; import pgp.wkd.exception.MissingPolicyFileException; diff --git a/wkd-java/src/main/java/pgp/wkd/discovery/DiscoveryResult.java b/wkd-java/src/main/java/pgp/wkd/discovery/DiscoveryResult.java index 0030812..6946891 100644 --- a/wkd-java/src/main/java/pgp/wkd/discovery/DiscoveryResult.java +++ b/wkd-java/src/main/java/pgp/wkd/discovery/DiscoveryResult.java @@ -4,7 +4,7 @@ package pgp.wkd.discovery; -import pgp.certificate_store.Certificate; +import pgp.certificate_store.certificate.Certificate; import pgp.wkd.exception.CertNotFetchableException; import javax.annotation.Nonnull; diff --git a/wkd-java/src/main/java/pgp/wkd/discovery/ValidatingCertificateDiscoverer.java b/wkd-java/src/main/java/pgp/wkd/discovery/ValidatingCertificateDiscoverer.java index 2613ce8..09f6984 100644 --- a/wkd-java/src/main/java/pgp/wkd/discovery/ValidatingCertificateDiscoverer.java +++ b/wkd-java/src/main/java/pgp/wkd/discovery/ValidatingCertificateDiscoverer.java @@ -4,7 +4,7 @@ package pgp.wkd.discovery; -import pgp.certificate_store.Certificate; +import pgp.certificate_store.certificate.Certificate; import pgp.wkd.CertificateAndUserIds; import pgp.wkd.exception.MissingPolicyFileException; import pgp.wkd.exception.RejectedCertificateException; diff --git a/wkd-test-suite/src/main/java/pgp/wkd/test_suite/AbstractTestSuiteGenerator.java b/wkd-test-suite/src/main/java/pgp/wkd/test_suite/AbstractTestSuiteGenerator.java index a27af24..99ad9b5 100644 --- a/wkd-test-suite/src/main/java/pgp/wkd/test_suite/AbstractTestSuiteGenerator.java +++ b/wkd-test-suite/src/main/java/pgp/wkd/test_suite/AbstractTestSuiteGenerator.java @@ -38,7 +38,7 @@ public class AbstractTestSuiteGenerator { } protected PGPSecretKeyRing secretKey(String userId) throws PGPException, InvalidAlgorithmParameterException, NoSuchAlgorithmException { - PGPSecretKeyRing secretKeys = PGPainless.generateKeyRing().modernKeyRing(userId, null); + PGPSecretKeyRing secretKeys = PGPainless.generateKeyRing().modernKeyRing(userId); return secretKeys; } From df2e4fb61e38b71cf29bae1d9f41ed60ea6c785b Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Fri, 25 Nov 2022 16:19:40 +0100 Subject: [PATCH 08/12] Update CHANGELOG --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b56905..c04805c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,11 @@ SPDX-License-Identifier: Apache-2.0 # Changelog +## 0.1.2-SNAPSHOT +- Bump `pgpainless-core` to `1.13.2` +- Bump `cert-d-pgpainless` to `0.2.1` +- Bump `cert-d-java` to `0.2.1` + ## 0.1.1 - Bump `pgpainless-core` to `1.2.1` - Bump `cert-d-pgpainless` to `0.1.2` From 873ca84af8f1d4567f21d4ee098c439f3c83e194 Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Fri, 7 Jul 2023 12:34:16 +0200 Subject: [PATCH 09/12] Bump PGPainless dependencies Bump pgpainless-core to 1.5.6 Bump cert-d-pgpainless to 0.2.2 Bump cert-d-java to 0.2.2 --- CHANGELOG.md | 6 +++--- version.gradle | 6 +++--- .../java/pgp/wkd/cli/PGPainlessCertificateParser.java | 9 ++++++--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c04805c..82c97ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,9 +7,9 @@ SPDX-License-Identifier: Apache-2.0 # Changelog ## 0.1.2-SNAPSHOT -- Bump `pgpainless-core` to `1.13.2` -- Bump `cert-d-pgpainless` to `0.2.1` -- Bump `cert-d-java` to `0.2.1` +- Bump `pgpainless-core` to `1.5.6` +- Bump `cert-d-pgpainless` to `0.2.2` +- Bump `cert-d-java` to `0.2.2` ## 0.1.1 - Bump `pgpainless-core` to `1.2.1` diff --git a/version.gradle b/version.gradle index 6e2a3c4..204027e 100644 --- a/version.gradle +++ b/version.gradle @@ -16,10 +16,10 @@ allprojects { slf4jVersion = '1.7.36' logbackVersion = '1.2.11' mockitoVersion = '4.5.1' - pgpainlessVersion = '1.3.12' - pgpainlessCertDVersion = '0.2.1' + pgpainlessVersion = '1.5.6' + pgpainlessCertDVersion = '0.2.2' picocliVersion = '4.6.3' - certDJavaVersion = '0.2.1' + certDJavaVersion = '0.2.2' zbase32Version = '1.0.0' } } diff --git a/wkd-java-cli/src/main/java/pgp/wkd/cli/PGPainlessCertificateParser.java b/wkd-java-cli/src/main/java/pgp/wkd/cli/PGPainlessCertificateParser.java index 15a89fa..245ca33 100644 --- a/wkd-java-cli/src/main/java/pgp/wkd/cli/PGPainlessCertificateParser.java +++ b/wkd-java-cli/src/main/java/pgp/wkd/cli/PGPainlessCertificateParser.java @@ -6,9 +6,9 @@ package pgp.wkd.cli; import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPPublicKeyRing; -import org.bouncycastle.openpgp.PGPPublicKeyRingCollection; import org.pgpainless.PGPainless; import org.pgpainless.certificate_store.CertificateFactory; +import org.pgpainless.key.collection.PGPKeyRingCollection; import org.pgpainless.key.info.KeyRingInfo; import pgp.certificate_store.certificate.Certificate; import pgp.wkd.CertificateAndUserIds; @@ -24,8 +24,11 @@ public class PGPainlessCertificateParser implements CertificateParser { public List read(InputStream inputStream) throws IOException { List certificatesAndUserIds = new ArrayList<>(); try { - PGPPublicKeyRingCollection certificates = PGPainless.readKeyRing().publicKeyRingCollection(inputStream); - for (PGPPublicKeyRing certificate : certificates) { + PGPKeyRingCollection keyMaterial = PGPainless.readKeyRing().keyRingCollection(inputStream, true); + if (keyMaterial.getPGPSecretKeyRingCollection().size() != 0) { + throw new PGPException("Secret key material encountered!"); + } + for (PGPPublicKeyRing certificate : keyMaterial.getPgpPublicKeyRingCollection()) { KeyRingInfo info = PGPainless.inspectKeyRing(certificate); Certificate parsedCert = CertificateFactory.certificateFromPublicKeyRing(certificate, 0L); List userIds = info.getValidAndExpiredUserIds(); From 81d0c73adca5d0da8082225cf6f2a691c7edb4be Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Fri, 7 Jul 2023 12:35:49 +0200 Subject: [PATCH 10/12] Bump jackson-databind to 2.15.2 --- version.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.gradle b/version.gradle index 204027e..2938355 100644 --- a/version.gradle +++ b/version.gradle @@ -8,8 +8,8 @@ allprojects { isSnapshot = true minAndroidSdk = 10 javaSourceCompatibility = 1.8 - jacksonDataBindVersion = '2.13.2.2' - jacksonDataFormatXmlVersion = '2.13.2' + jacksonDataBindVersion = '2.15.2' + jacksonDataFormatXmlVersion = '2.15.2' junitVersion = '5.8.2' junitSysExitVersion = '1.1.2' jsrVersion = '3.0.2' From 2a21833b1919b4c1ea7d77fc13acf92c75201b17 Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Fri, 7 Jul 2023 12:38:07 +0200 Subject: [PATCH 11/12] WKD-Java 0.1.2 --- CHANGELOG.md | 2 +- version.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 82c97ae..ea017bc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ SPDX-License-Identifier: Apache-2.0 # Changelog -## 0.1.2-SNAPSHOT +## 0.1.2 - Bump `pgpainless-core` to `1.5.6` - Bump `cert-d-pgpainless` to `0.2.2` - Bump `cert-d-java` to `0.2.2` diff --git a/version.gradle b/version.gradle index 2938355..ba999aa 100644 --- a/version.gradle +++ b/version.gradle @@ -5,7 +5,7 @@ allprojects { ext { shortVersion = '0.1.2' - isSnapshot = true + isSnapshot = false minAndroidSdk = 10 javaSourceCompatibility = 1.8 jacksonDataBindVersion = '2.15.2' From 5b6b2f08468ae809a747aca27bc663b0ac22c39a Mon Sep 17 00:00:00 2001 From: Paul Schaub Date: Fri, 7 Jul 2023 12:40:36 +0200 Subject: [PATCH 12/12] WKD-Java 0.1.3-SNAPSHOT --- version.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.gradle b/version.gradle index ba999aa..b13e945 100644 --- a/version.gradle +++ b/version.gradle @@ -4,8 +4,8 @@ allprojects { ext { - shortVersion = '0.1.2' - isSnapshot = false + shortVersion = '0.1.3' + isSnapshot = true minAndroidSdk = 10 javaSourceCompatibility = 1.8 jacksonDataBindVersion = '2.15.2'