Skip to content

Commit

Permalink
More tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@vanitasvitae
vanitasvitae committed Jan 21, 2023
1 parent d096267 commit 9cf6301
Show file tree
Hide file tree
Showing 9 changed files with 317 additions and 132 deletions.
14 changes: 7 additions & 7 deletions external-sop/src/test/java/sop/external/ExternalArmorDearmorRoundTripTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public class ExternalArmorDearmorRoundTripTest extends AbstractExternalSOPTest {

@Test
public void dearmorArmorAliceKey() throws IOException {
byte[] aliceKey = TestKeys.ALICE_KEY.getBytes(StandardCharsets.UTF_8);
byte[] aliceKey = TestData.ALICE_KEY.getBytes(StandardCharsets.UTF_8);

byte[] dearmored = getSop().dearmor()
.data(aliceKey)
Expand All @@ -48,7 +48,7 @@ public void dearmorArmorAliceKey() throws IOException {

@Test
public void dearmorArmorAliceCert() throws IOException {
byte[] aliceCert = TestKeys.ALICE_CERT.getBytes(StandardCharsets.UTF_8);
byte[] aliceCert = TestData.ALICE_CERT.getBytes(StandardCharsets.UTF_8);

byte[] dearmored = getSop().dearmor()
.data(aliceCert)
Expand All @@ -66,7 +66,7 @@ public void dearmorArmorAliceCert() throws IOException {

@Test
public void dearmorArmorBobKey() throws IOException {
byte[] bobKey = TestKeys.BOB_KEY.getBytes(StandardCharsets.UTF_8);
byte[] bobKey = TestData.BOB_KEY.getBytes(StandardCharsets.UTF_8);

byte[] dearmored = getSop().dearmor()
.data(bobKey)
Expand All @@ -84,7 +84,7 @@ public void dearmorArmorBobKey() throws IOException {

@Test
public void dearmorArmorBobCert() throws IOException {
byte[] bobCert = TestKeys.BOB_CERT.getBytes(StandardCharsets.UTF_8);
byte[] bobCert = TestData.BOB_CERT.getBytes(StandardCharsets.UTF_8);

byte[] dearmored = getSop().dearmor()
.data(bobCert)
Expand All @@ -102,7 +102,7 @@ public void dearmorArmorBobCert() throws IOException {

@Test
public void dearmorArmorCarolKey() throws IOException {
byte[] carolKey = TestKeys.CAROL_KEY.getBytes(StandardCharsets.UTF_8);
byte[] carolKey = TestData.CAROL_KEY.getBytes(StandardCharsets.UTF_8);

byte[] dearmored = getSop().dearmor()
.data(carolKey)
Expand All @@ -120,7 +120,7 @@ public void dearmorArmorCarolKey() throws IOException {

@Test
public void dearmorArmorCarolCert() throws IOException {
byte[] carolCert = TestKeys.CAROL_CERT.getBytes(StandardCharsets.UTF_8);
byte[] carolCert = TestData.CAROL_CERT.getBytes(StandardCharsets.UTF_8);

byte[] dearmored = getSop().dearmor()
.data(carolCert)
Expand Down Expand Up @@ -191,7 +191,7 @@ public void testDearmoringTwiceIsIdempotent() throws IOException {
ignoreIf("sqop", Is.eq, "0.27.2"); // IO error because: EOF

byte[] dearmored = getSop().dearmor()
.data(TestKeys.ALICE_KEY.getBytes(StandardCharsets.UTF_8))
.data(TestData.ALICE_KEY.getBytes(StandardCharsets.UTF_8))
.getBytes();

byte[] dearmoredAgain = getSop().dearmor()
Expand Down
2 changes: 1 addition & 1 deletion external-sop/src/test/java/sop/external/ExternalDecryptWithSessionKeyTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public class ExternalDecryptWithSessionKeyTest extends AbstractExternalSOPTest {
@Test
public void testDecryptAndExtractSessionKey() throws IOException {
ByteArrayAndResult<DecryptionResult> bytesAndResult = getSop().decrypt()
.withKey(TestKeys.ALICE_KEY.getBytes(StandardCharsets.UTF_8))
.withKey(TestData.ALICE_KEY.getBytes(StandardCharsets.UTF_8))
.ciphertext(CIPHERTEXT.getBytes(StandardCharsets.UTF_8))
.toByteArrayAndResult();

Expand Down
127 changes: 83 additions & 44 deletions external-sop/src/test/java/sop/external/ExternalDetachedSignVerifyRoundTripTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import sop.Verification;
import sop.enums.SignAs;
import sop.exception.SOPGPException;
import sop.util.UTCUtil;

import java.io.IOException;
import java.nio.charset.StandardCharsets;
Expand All @@ -18,8 +17,8 @@

import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static sop.external.JUtils.assertArrayStartsWith;
import static sop.external.JUtils.assertSignedBy;

@EnabledIf("sop.external.AbstractExternalSOPTest#isExternalSopInstalled")
public class ExternalDetachedSignVerifyRoundTripTest extends AbstractExternalSOPTest {
Expand All @@ -29,58 +28,110 @@ public class ExternalDetachedSignVerifyRoundTripTest extends AbstractExternalSOP

@Test
public void signVerifyWithAliceKey() throws IOException {
byte[] message = "Hello, World!\n".getBytes(StandardCharsets.UTF_8);
byte[] message = TestData.PLAINTEXT.getBytes(StandardCharsets.UTF_8);

byte[] signature = getSop().detachedSign()
.key(TestKeys.ALICE_KEY.getBytes(StandardCharsets.UTF_8))
.key(TestData.ALICE_KEY.getBytes(StandardCharsets.UTF_8))
.data(message)
.toByteArrayAndResult()
.getBytes();

List<Verification> verificationList = getSop().detachedVerify()
.cert(TestKeys.ALICE_CERT.getBytes(StandardCharsets.UTF_8))
.cert(TestData.ALICE_CERT.getBytes(StandardCharsets.UTF_8))
.signatures(signature)
.data(message);

assertFalse(verificationList.isEmpty());
assertTrue(verificationList.get(0).toString().contains("EB85BB5FA33A75E15E944E63F231550C4F47E38E EB85BB5FA33A75E15E944E63F231550C4F47E38E"));
assertSignedBy(verificationList, TestData.ALICE_SIGNING_FINGERPRINT, TestData.ALICE_PRIMARY_FINGERPRINT);
}

@Test
public void signVerifyTextModeWithAliceKey() throws IOException {
byte[] message = "Hello, World!\n".getBytes(StandardCharsets.UTF_8);
byte[] message = TestData.PLAINTEXT.getBytes(StandardCharsets.UTF_8);

byte[] signature = getSop().detachedSign()
.key(TestKeys.ALICE_KEY.getBytes(StandardCharsets.UTF_8))
.key(TestData.ALICE_KEY.getBytes(StandardCharsets.UTF_8))
.mode(SignAs.Text)
.data(message)
.toByteArrayAndResult()
.getBytes();

List<Verification> verificationList = getSop().detachedVerify()
.cert(TestKeys.ALICE_CERT.getBytes(StandardCharsets.UTF_8))
.cert(TestData.ALICE_CERT.getBytes(StandardCharsets.UTF_8))
.signatures(signature)
.data(message);

assertFalse(verificationList.isEmpty());
assertTrue(verificationList.get(0).toString().contains("EB85BB5FA33A75E15E944E63F231550C4F47E38E EB85BB5FA33A75E15E944E63F231550C4F47E38E"));
assertSignedBy(verificationList, TestData.ALICE_SIGNING_FINGERPRINT, TestData.ALICE_PRIMARY_FINGERPRINT);
}

@Test
public void verifyKnownMessageWithAliceCert() throws IOException {
byte[] message = TestData.PLAINTEXT.getBytes(StandardCharsets.UTF_8);
byte[] signature = TestData.ALICE_DETACHED_SIGNED_MESSAGE.getBytes(StandardCharsets.UTF_8);

List<Verification> verificationList = getSop().detachedVerify()
.cert(TestData.ALICE_CERT.getBytes(StandardCharsets.UTF_8))
.signatures(signature)
.data(message);

assertFalse(verificationList.isEmpty());
assertSignedBy(verificationList, TestData.ALICE_SIGNING_FINGERPRINT, TestData.ALICE_PRIMARY_FINGERPRINT, TestData.ALICE_DETACHED_SIGNED_MESSAGE_DATE);
}

@Test
public void signVerifyWithBobKey() throws IOException {
byte[] message = TestData.PLAINTEXT.getBytes(StandardCharsets.UTF_8);

byte[] signature = getSop().detachedSign()
.key(TestData.BOB_KEY.getBytes(StandardCharsets.UTF_8))
.data(message)
.toByteArrayAndResult()
.getBytes();

List<Verification> verificationList = getSop().detachedVerify()
.cert(TestData.BOB_CERT.getBytes(StandardCharsets.UTF_8))
.signatures(signature)
.data(message);

assertFalse(verificationList.isEmpty());
assertSignedBy(verificationList, TestData.BOB_SIGNING_FINGERPRINT, TestData.BOB_PRIMARY_FINGERPRINT);
}

@Test
public void signVerifyWithCarolKey() throws IOException {
byte[] message = TestData.PLAINTEXT.getBytes(StandardCharsets.UTF_8);

byte[] signature = getSop().detachedSign()
.key(TestData.CAROL_KEY.getBytes(StandardCharsets.UTF_8))
.data(message)
.toByteArrayAndResult()
.getBytes();

List<Verification> verificationList = getSop().detachedVerify()
.cert(TestData.CAROL_CERT.getBytes(StandardCharsets.UTF_8))
.signatures(signature)
.data(message);

assertFalse(verificationList.isEmpty());
assertSignedBy(verificationList, TestData.CAROL_SIGNING_FINGERPRINT, TestData.CAROL_PRIMARY_FINGERPRINT);
}

@Test
public void signVerifyWithEncryptedKey() throws IOException {
byte[] message = "Hello, World!\n".getBytes(StandardCharsets.UTF_8);
byte[] message = TestData.PLAINTEXT.getBytes(StandardCharsets.UTF_8);

byte[] signature = getSop().detachedSign()
.key(TestKeys.PASSWORD_PROTECTED_KEY.getBytes(StandardCharsets.UTF_8))
.withKeyPassword(TestKeys.PASSWORD)
.key(TestData.PASSWORD_PROTECTED_KEY.getBytes(StandardCharsets.UTF_8))
.withKeyPassword(TestData.PASSWORD)
.data(message)
.toByteArrayAndResult()
.getBytes();

assertArrayStartsWith(signature, BEGIN_PGP_SIGNATURE_BYTES);

List<Verification> verificationList = getSop().detachedVerify()
.cert(TestKeys.PASSWORD_PROTECTED_CERT.getBytes(StandardCharsets.UTF_8))
.cert(TestData.PASSWORD_PROTECTED_CERT.getBytes(StandardCharsets.UTF_8))
.signatures(signature)
.data(message);

Expand All @@ -89,10 +140,10 @@ public void signVerifyWithEncryptedKey() throws IOException {

@Test
public void signArmorVerifyWithBobKey() throws IOException {
byte[] message = "Hello, World!\n".getBytes(StandardCharsets.UTF_8);
byte[] message = TestData.PLAINTEXT.getBytes(StandardCharsets.UTF_8);

byte[] signature = getSop().detachedSign()
.key(TestKeys.BOB_KEY.getBytes(StandardCharsets.UTF_8))
.key(TestData.BOB_KEY.getBytes(StandardCharsets.UTF_8))
.noArmor()
.data(message)
.toByteArrayAndResult()
Expand All @@ -103,31 +154,25 @@ public void signArmorVerifyWithBobKey() throws IOException {
.getBytes();

List<Verification> verificationList = getSop().detachedVerify()
.cert(TestKeys.BOB_CERT.getBytes(StandardCharsets.UTF_8))
.cert(TestData.BOB_CERT.getBytes(StandardCharsets.UTF_8))
.signatures(armored)
.data(message);

assertFalse(verificationList.isEmpty());
assertTrue(verificationList.get(0).toString().contains("D1A66E1A23B182C9980F788CFBFCC82A015E7330 D1A66E1A23B182C9980F788CFBFCC82A015E7330"));
assertSignedBy(verificationList, TestData.BOB_SIGNING_FINGERPRINT, TestData.BOB_PRIMARY_FINGERPRINT);
}

@Test
public void verifyNotAfterThrowsNoSignature() {
ignoreIf("sqop", Is.leq, "0.27.2"); // returns 1 instead of 3 (NO_SIGNATURE)

byte[] message = "Hello, World!\n".getBytes(StandardCharsets.UTF_8);
byte[] signature = ("-----BEGIN PGP SIGNATURE-----\n" +
"\n" +
"iHUEABYKACcFAmPBjZUJEPIxVQxPR+OOFiEE64W7X6M6deFelE5j8jFVDE9H444A\n" +
"ADI/AQC6Bux6WpGYf7HO+QPV/D5iIrqZt9xPLgfUVoNJBmMZZwD+Ib+tn5pSyWUw\n" +
"0K1UgT5roym9Fln8U5W8R03TSbfNiwE=\n" +
"=bxPN\n" +
"-----END PGP SIGNATURE-----").getBytes(StandardCharsets.UTF_8);
Date signatureDate = UTCUtil.parseUTCDate("2023-01-13T16:57:57Z");
byte[] message = TestData.PLAINTEXT.getBytes(StandardCharsets.UTF_8);
byte[] signature = TestData.ALICE_DETACHED_SIGNED_MESSAGE.getBytes(StandardCharsets.UTF_8);
Date signatureDate = TestData.ALICE_DETACHED_SIGNED_MESSAGE_DATE;
Date beforeSignature = new Date(signatureDate.getTime() - 1000); // 1 sec before sig

assertThrows(SOPGPException.NoSignature.class, () -> getSop().detachedVerify()
.cert(TestKeys.ALICE_CERT.getBytes(StandardCharsets.UTF_8))
.cert(TestData.ALICE_CERT.getBytes(StandardCharsets.UTF_8))
.notAfter(beforeSignature)
.signatures(signature)
.data(message));
Expand All @@ -137,19 +182,13 @@ public void verifyNotAfterThrowsNoSignature() {
public void verifyNotBeforeThrowsNoSignature() {
ignoreIf("sqop", Is.leq, "0.27.2"); // returns 1 instead of 3 (NO_SIGNATURE)

byte[] message = "Hello, World!\n".getBytes(StandardCharsets.UTF_8);
byte[] signature = ("-----BEGIN PGP SIGNATURE-----\n" +
"\n" +
"iHUEABYKACcFAmPBjZUJEPIxVQxPR+OOFiEE64W7X6M6deFelE5j8jFVDE9H444A\n" +
"ADI/AQC6Bux6WpGYf7HO+QPV/D5iIrqZt9xPLgfUVoNJBmMZZwD+Ib+tn5pSyWUw\n" +
"0K1UgT5roym9Fln8U5W8R03TSbfNiwE=\n" +
"=bxPN\n" +
"-----END PGP SIGNATURE-----").getBytes(StandardCharsets.UTF_8);
Date signatureDate = UTCUtil.parseUTCDate("2023-01-13T16:57:57Z");
byte[] message = TestData.PLAINTEXT.getBytes(StandardCharsets.UTF_8);
byte[] signature = TestData.ALICE_DETACHED_SIGNED_MESSAGE.getBytes(StandardCharsets.UTF_8);
Date signatureDate = TestData.ALICE_DETACHED_SIGNED_MESSAGE_DATE;
Date afterSignature = new Date(signatureDate.getTime() + 1000); // 1 sec after sig

assertThrows(SOPGPException.NoSignature.class, () -> getSop().detachedVerify()
.cert(TestKeys.ALICE_CERT.getBytes(StandardCharsets.UTF_8))
.cert(TestData.ALICE_CERT.getBytes(StandardCharsets.UTF_8))
.notBefore(afterSignature)
.signatures(signature)
.data(message));
Expand All @@ -162,28 +201,28 @@ public void signVerifyWithEncryptedKeyWithoutPassphraseFails() {

assertThrows(SOPGPException.KeyIsProtected.class, () ->
getSop().detachedSign()
.key(TestKeys.PASSWORD_PROTECTED_KEY.getBytes(StandardCharsets.UTF_8))
.data("Hello, World!\n".getBytes(StandardCharsets.UTF_8))
.key(TestData.PASSWORD_PROTECTED_KEY.getBytes(StandardCharsets.UTF_8))
.data(TestData.PLAINTEXT.getBytes(StandardCharsets.UTF_8))
.toByteArrayAndResult()
.getBytes());
}

@Test
public void signWithProtectedKeyAndMultiplePassphrasesTest()
throws IOException {
byte[] message = "Hello, World!\n".getBytes(StandardCharsets.UTF_8);
byte[] message = TestData.PLAINTEXT.getBytes(StandardCharsets.UTF_8);

byte[] signature = getSop().sign()
.key(TestKeys.PASSWORD_PROTECTED_KEY.getBytes(StandardCharsets.UTF_8))
.key(TestData.PASSWORD_PROTECTED_KEY.getBytes(StandardCharsets.UTF_8))
.withKeyPassword("wrong")
.withKeyPassword(TestKeys.PASSWORD) // correct
.withKeyPassword(TestData.PASSWORD) // correct
.withKeyPassword("wrong2")
.data(message)
.toByteArrayAndResult()
.getBytes();

assertFalse(getSop().verify()
.cert(TestKeys.PASSWORD_PROTECTED_CERT.getBytes(StandardCharsets.UTF_8))
.cert(TestData.PASSWORD_PROTECTED_CERT.getBytes(StandardCharsets.UTF_8))
.signatures(signature)
.data(message)
.isEmpty());
Expand Down

0 comments on commit 9cf6301

Please sign in to comment.