PGPainless/pgpainless
PGPainless/pgpainless
1
0
Fork 0
mirror of https://github.com/pgpainless/pgpainless.git synced 2024-11-22 12:22:06 +01:00
Code Issues Releases Wiki Activity

Throw BadData if KEYS are passed where CERTS are expected

Browse source
This commit is contained in:
Paul Schaub 2024-03-17 15:53:07 +01:00
parent 89038ebedf
commit fa5bdfcd82
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
pgpainless-sop/src/main/java/org/pgpainless/sop/KeyReader.java
View file

@ -6,8 +6,10 @@ package org.pgpainless.sop;
import org.bouncycastle.openpgp.PGPException; import org.bouncycastle.openpgp.PGPException;
import org.bouncycastle.openpgp.PGPPublicKeyRingCollection; import org.bouncycastle.openpgp.PGPPublicKeyRingCollection;
import org.bouncycastle.openpgp.PGPRuntimeOperationException;
import org.bouncycastle.openpgp.PGPSecretKeyRingCollection; import org.bouncycastle.openpgp.PGPSecretKeyRingCollection;
import org.pgpainless.PGPainless; import org.pgpainless.PGPainless;
import org.pgpainless.key.collection.PGPKeyRingCollection;
import sop.exception.SOPGPException; import sop.exception.SOPGPException;
import java.io.IOException; import java.io.IOException;
@ -44,19 +46,24 @@ class KeyReader {
static PGPPublicKeyRingCollection readPublicKeys(InputStream certIn, boolean requireContent) static PGPPublicKeyRingCollection readPublicKeys(InputStream certIn, boolean requireContent)
throws IOException { throws IOException {
PGPPublicKeyRingCollection certs; PGPKeyRingCollection certs;
try { try {
certs = PGPainless.readKeyRing().publicKeyRingCollection(certIn); certs = PGPainless.readKeyRing().keyRingCollection(certIn, false);
} catch (IOException e) { } catch (IOException e) {
String msg = e.getMessage(); String msg = e.getMessage();
if (msg != null && (msg.startsWith("unknown object in stream:") || msg.startsWith("invalid header encountered"))) { if (msg != null && (msg.startsWith("unknown object in stream:") || msg.startsWith("invalid header encountered"))) {
throw new SOPGPException.BadData(e); throw new SOPGPException.BadData(e);
} }
throw e; throw e;
} catch (PGPRuntimeOperationException e) {
throw new SOPGPException.BadData(e);
} }
if (requireContent && certs.size() == 0) { if (certs.getPgpSecretKeyRingCollection().size() != 0) {
throw new SOPGPException.BadData("Secret key components encountered, while certificates were expected.");
}
if (requireContent && certs.getPgpPublicKeyRingCollection().size() == 0) {
throw new SOPGPException.BadData(new PGPException("No cert data found.")); throw new SOPGPException.BadData(new PGPException("No cert data found."));
} }
return certs; return certs.getPgpPublicKeyRingCollection();
} }
} }