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

OpenPgpMessageInputStream: Return -1 instead of throwing MalformedOpenPgpMessageException when calling read() on drained stream

Browse source
This commit is contained in:
Paul Schaub 2023-05-01 09:35:28 +02:00
parent 558036c485
commit 52fa7e4d46
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
3 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pgpainless-core/src/main/java/org/pgpainless/decryption_verification/OpenPgpMessageInputStream.java
View file

@ -744,6 +744,7 @@ public class OpenPgpMessageInputStream extends DecryptionStream {
throws IOException { throws IOException {
if (nestedInputStream == null) { if (nestedInputStream == null) {
if (packetInputStream != null) { if (packetInputStream != null) {
syntaxVerifier.next(InputSymbol.EndOfSequence);
syntaxVerifier.assertValid(); syntaxVerifier.assertValid();
} }
return -1; return -1;
@ -774,6 +775,7 @@ public class OpenPgpMessageInputStream extends DecryptionStream {
super.close(); super.close();
if (closed) { if (closed) {
if (packetInputStream != null) { if (packetInputStream != null) {
syntaxVerifier.next(InputSymbol.EndOfSequence);
syntaxVerifier.assertValid(); syntaxVerifier.assertValid();
} }
return; return;

4
pgpainless-core/src/main/java/org/pgpainless/decryption_verification/syntax_check/OpenPgpMessageSyntax.java
View file

@ -132,6 +132,10 @@ public class OpenPgpMessageSyntax implements Syntax {
@Nonnull @Nonnull
Transition fromValid(@Nonnull InputSymbol input, @Nullable StackSymbol stackItem) Transition fromValid(@Nonnull InputSymbol input, @Nullable StackSymbol stackItem)
throws MalformedOpenPgpMessageException { throws MalformedOpenPgpMessageException {
if (input == InputSymbol.EndOfSequence) {
// allow subsequent read() calls.
return new Transition(State.Valid);
}
// There is no applicable transition rule out of Valid // There is no applicable transition rule out of Valid
throw new MalformedOpenPgpMessageException(State.Valid, input, stackItem); throw new MalformedOpenPgpMessageException(State.Valid, input, stackItem);
} }

17
pgpainless-core/src/test/java/org/pgpainless/decryption_verification/OpenPgpMessageInputStreamTest.java
View file

@ -34,6 +34,7 @@ import org.bouncycastle.openpgp.PGPSignature;
import org.bouncycastle.util.io.Streams; import org.bouncycastle.util.io.Streams;
import org.junit.JUtils; import org.junit.JUtils;
import org.junit.jupiter.api.Named; import org.junit.jupiter.api.Named;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource; import org.junit.jupiter.params.provider.MethodSource;
@ -652,6 +653,22 @@ public class OpenPgpMessageInputStreamTest {
assertTrue(metadata.getRejectedInlineSignatures().isEmpty()); assertTrue(metadata.getRejectedInlineSignatures().isEmpty());
} }
@Test
public void readAfterCloseTest() throws PGPException, IOException {
OpenPgpMessageInputStream pgpIn = get(SENC_LIT, ConsumerOptions.get()
.addDecryptionPassphrase(Passphrase.fromPassword(PASSPHRASE)));
Streams.drain(pgpIn); // read all
byte[] buf = new byte[1024];
assertEquals(-1, pgpIn.read(buf));
assertEquals(-1, pgpIn.read());
assertEquals(-1, pgpIn.read(buf));
assertEquals(-1, pgpIn.read());
pgpIn.close();
pgpIn.getMetadata();
}
private static Tuple<String, MessageMetadata> processReadBuffered(String armoredMessage, ConsumerOptions options) private static Tuple<String, MessageMetadata> processReadBuffered(String armoredMessage, ConsumerOptions options)
throws PGPException, IOException { throws PGPException, IOException {
OpenPgpMessageInputStream in = get(armoredMessage, options); OpenPgpMessageInputStream in = get(armoredMessage, options);