mirror of
https://codeberg.org/PGPainless/sop-java.git
synced 2024-12-06 14:02:07 +01:00
Allow for extension of test suite from 3rd party SOP implementations
This commit is contained in:
parent
fd426b533c
commit
0709bce35c
33 changed files with 731 additions and 547 deletions
|
@ -7,7 +7,7 @@ pipeline:
|
|||
# Checkout code
|
||||
- git checkout $CI_COMMIT_BRANCH
|
||||
# Prepare CI
|
||||
- cp external-sop/src/main/resources/sop/external/config.json.ci external-sop/src/main/resources/sop/external/config.json
|
||||
- cp external-sop/src/main/resources/sop/testsuite/external/config.json.ci external-sop/src/main/resources/sop/testsuite/external/config.json
|
||||
# Code works
|
||||
- gradle test
|
||||
# Code is clean
|
||||
|
|
|
@ -16,21 +16,27 @@ dependencies {
|
|||
testImplementation "org.junit.jupiter:junit-jupiter-api:$junitVersion"
|
||||
testImplementation "org.junit.jupiter:junit-jupiter-params:$junitVersion"
|
||||
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitVersion"
|
||||
// Read json config file
|
||||
testImplementation "com.google.code.gson:gson:2.10.1"
|
||||
|
||||
api project(":sop-java")
|
||||
testImplementation(testFixtures(project(":sop-java")))
|
||||
|
||||
api "org.slf4j:slf4j-api:$slf4jVersion"
|
||||
testImplementation "ch.qos.logback:logback-classic:$logbackVersion"
|
||||
|
||||
// @Nonnull, @Nullable...
|
||||
implementation "com.google.code.findbugs:jsr305:$jsrVersion"
|
||||
|
||||
// The ExternalTestSubjectFactory reads json config file to find configured SOP binaries...
|
||||
testImplementation "com.google.code.gson:gson:2.10.1"
|
||||
// ...and extends TestSubjectFactory
|
||||
testImplementation(testFixtures(project(":sop-java")))
|
||||
}
|
||||
|
||||
test {
|
||||
// Inject configured external SOP instances using our custom TestSubjectFactory
|
||||
environment("test.implementation", "sop.testsuite.external.ExternalSOPInstanceFactory")
|
||||
|
||||
useJUnitPlatform()
|
||||
|
||||
// since we test external backends, we ignore test failures in this module
|
||||
ignoreFailures = true
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1,263 +0,0 @@
|
|||
// SPDX-FileCopyrightText: 2023 Paul Schaub <vanitasvitae@fsfe.org>
|
||||
//
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package sop.external;
|
||||
|
||||
import org.junit.jupiter.api.condition.EnabledIf;
|
||||
import org.junit.jupiter.params.ParameterizedTest;
|
||||
import org.junit.jupiter.params.provider.MethodSource;
|
||||
import sop.SOP;
|
||||
import sop.Verification;
|
||||
import sop.enums.SignAs;
|
||||
import sop.exception.SOPGPException;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||
import static org.junit.jupiter.api.Assertions.assertThrows;
|
||||
import static sop.testing.JUtils.assertArrayStartsWith;
|
||||
import static sop.testing.JUtils.assertSignedBy;
|
||||
import static sop.testing.TestData.ALICE_CERT;
|
||||
import static sop.testing.TestData.ALICE_DETACHED_SIGNED_MESSAGE;
|
||||
import static sop.testing.TestData.ALICE_DETACHED_SIGNED_MESSAGE_DATE;
|
||||
import static sop.testing.TestData.ALICE_KEY;
|
||||
import static sop.testing.TestData.ALICE_PRIMARY_FINGERPRINT;
|
||||
import static sop.testing.TestData.ALICE_SIGNING_FINGERPRINT;
|
||||
import static sop.testing.TestData.BEGIN_PGP_SIGNATURE;
|
||||
import static sop.testing.TestData.BOB_CERT;
|
||||
import static sop.testing.TestData.BOB_KEY;
|
||||
import static sop.testing.TestData.BOB_PRIMARY_FINGERPRINT;
|
||||
import static sop.testing.TestData.BOB_SIGNING_FINGERPRINT;
|
||||
import static sop.testing.TestData.CAROL_CERT;
|
||||
import static sop.testing.TestData.CAROL_KEY;
|
||||
import static sop.testing.TestData.CAROL_PRIMARY_FINGERPRINT;
|
||||
import static sop.testing.TestData.CAROL_SIGNING_FINGERPRINT;
|
||||
import static sop.testing.TestData.PASSWORD;
|
||||
import static sop.testing.TestData.PASSWORD_PROTECTED_CERT;
|
||||
import static sop.testing.TestData.PASSWORD_PROTECTED_KEY;
|
||||
import static sop.testing.TestData.PLAINTEXT;
|
||||
|
||||
@EnabledIf("sop.external.AbstractExternalSOPTest#hasBackends")
|
||||
public class ExternalDetachedSignVerifyRoundTripTest extends AbstractExternalSOPTest {
|
||||
|
||||
@ParameterizedTest
|
||||
@MethodSource("sop.external.AbstractExternalSOPTest#provideBackends")
|
||||
public void signVerifyWithAliceKey(SOP sop) throws IOException {
|
||||
byte[] message = PLAINTEXT.getBytes(StandardCharsets.UTF_8);
|
||||
|
||||
byte[] signature = sop.detachedSign()
|
||||
.key(ALICE_KEY.getBytes(StandardCharsets.UTF_8))
|
||||
.data(message)
|
||||
.toByteArrayAndResult()
|
||||
.getBytes();
|
||||
|
||||
List<Verification> verificationList = sop.detachedVerify()
|
||||
.cert(ALICE_CERT.getBytes(StandardCharsets.UTF_8))
|
||||
.signatures(signature)
|
||||
.data(message);
|
||||
|
||||
assertFalse(verificationList.isEmpty());
|
||||
assertSignedBy(verificationList, ALICE_SIGNING_FINGERPRINT, ALICE_PRIMARY_FINGERPRINT);
|
||||
}
|
||||
|
||||
@ParameterizedTest
|
||||
@MethodSource("sop.external.AbstractExternalSOPTest#provideBackends")
|
||||
public void signVerifyTextModeWithAliceKey(SOP sop) throws IOException {
|
||||
byte[] message = PLAINTEXT.getBytes(StandardCharsets.UTF_8);
|
||||
|
||||
byte[] signature = sop.detachedSign()
|
||||
.key(ALICE_KEY.getBytes(StandardCharsets.UTF_8))
|
||||
.mode(SignAs.Text)
|
||||
.data(message)
|
||||
.toByteArrayAndResult()
|
||||
.getBytes();
|
||||
|
||||
List<Verification> verificationList = sop.detachedVerify()
|
||||
.cert(ALICE_CERT.getBytes(StandardCharsets.UTF_8))
|
||||
.signatures(signature)
|
||||
.data(message);
|
||||
|
||||
assertFalse(verificationList.isEmpty());
|
||||
assertSignedBy(verificationList, ALICE_SIGNING_FINGERPRINT, ALICE_PRIMARY_FINGERPRINT);
|
||||
}
|
||||
|
||||
@ParameterizedTest
|
||||
@MethodSource("sop.external.AbstractExternalSOPTest#provideBackends")
|
||||
public void verifyKnownMessageWithAliceCert(SOP sop) throws IOException {
|
||||
byte[] message = PLAINTEXT.getBytes(StandardCharsets.UTF_8);
|
||||
byte[] signature = ALICE_DETACHED_SIGNED_MESSAGE.getBytes(StandardCharsets.UTF_8);
|
||||
|
||||
List<Verification> verificationList = sop.detachedVerify()
|
||||
.cert(ALICE_CERT.getBytes(StandardCharsets.UTF_8))
|
||||
.signatures(signature)
|
||||
.data(message);
|
||||
|
||||
assertFalse(verificationList.isEmpty());
|
||||
assertSignedBy(verificationList, ALICE_SIGNING_FINGERPRINT, ALICE_PRIMARY_FINGERPRINT, ALICE_DETACHED_SIGNED_MESSAGE_DATE);
|
||||
}
|
||||
|
||||
@ParameterizedTest
|
||||
@MethodSource("sop.external.AbstractExternalSOPTest#provideBackends")
|
||||
public void signVerifyWithBobKey(SOP sop) throws IOException {
|
||||
byte[] message = PLAINTEXT.getBytes(StandardCharsets.UTF_8);
|
||||
|
||||
byte[] signature = sop.detachedSign()
|
||||
.key(BOB_KEY.getBytes(StandardCharsets.UTF_8))
|
||||
.data(message)
|
||||
.toByteArrayAndResult()
|
||||
.getBytes();
|
||||
|
||||
List<Verification> verificationList = sop.detachedVerify()
|
||||
.cert(BOB_CERT.getBytes(StandardCharsets.UTF_8))
|
||||
.signatures(signature)
|
||||
.data(message);
|
||||
|
||||
assertFalse(verificationList.isEmpty());
|
||||
assertSignedBy(verificationList, BOB_SIGNING_FINGERPRINT, BOB_PRIMARY_FINGERPRINT);
|
||||
}
|
||||
|
||||
@ParameterizedTest
|
||||
@MethodSource("sop.external.AbstractExternalSOPTest#provideBackends")
|
||||
public void signVerifyWithCarolKey(SOP sop) throws IOException {
|
||||
byte[] message = PLAINTEXT.getBytes(StandardCharsets.UTF_8);
|
||||
|
||||
byte[] signature = sop.detachedSign()
|
||||
.key(CAROL_KEY.getBytes(StandardCharsets.UTF_8))
|
||||
.data(message)
|
||||
.toByteArrayAndResult()
|
||||
.getBytes();
|
||||
|
||||
List<Verification> verificationList = sop.detachedVerify()
|
||||
.cert(CAROL_CERT.getBytes(StandardCharsets.UTF_8))
|
||||
.signatures(signature)
|
||||
.data(message);
|
||||
|
||||
assertFalse(verificationList.isEmpty());
|
||||
assertSignedBy(verificationList, CAROL_SIGNING_FINGERPRINT, CAROL_PRIMARY_FINGERPRINT);
|
||||
}
|
||||
|
||||
@ParameterizedTest
|
||||
@MethodSource("sop.external.AbstractExternalSOPTest#provideBackends")
|
||||
public void signVerifyWithEncryptedKey(SOP sop) throws IOException {
|
||||
byte[] message = PLAINTEXT.getBytes(StandardCharsets.UTF_8);
|
||||
|
||||
byte[] signature = sop.detachedSign()
|
||||
.key(PASSWORD_PROTECTED_KEY.getBytes(StandardCharsets.UTF_8))
|
||||
.withKeyPassword(PASSWORD)
|
||||
.data(message)
|
||||
.toByteArrayAndResult()
|
||||
.getBytes();
|
||||
|
||||
assertArrayStartsWith(signature, BEGIN_PGP_SIGNATURE);
|
||||
|
||||
List<Verification> verificationList = sop.detachedVerify()
|
||||
.cert(PASSWORD_PROTECTED_CERT.getBytes(StandardCharsets.UTF_8))
|
||||
.signatures(signature)
|
||||
.data(message);
|
||||
|
||||
assertFalse(verificationList.isEmpty());
|
||||
}
|
||||
|
||||
@ParameterizedTest
|
||||
@MethodSource("sop.external.AbstractExternalSOPTest#provideBackends")
|
||||
public void signArmorVerifyWithBobKey(SOP sop) throws IOException {
|
||||
byte[] message = PLAINTEXT.getBytes(StandardCharsets.UTF_8);
|
||||
|
||||
byte[] signature = sop.detachedSign()
|
||||
.key(BOB_KEY.getBytes(StandardCharsets.UTF_8))
|
||||
.noArmor()
|
||||
.data(message)
|
||||
.toByteArrayAndResult()
|
||||
.getBytes();
|
||||
|
||||
byte[] armored = sop.armor()
|
||||
.data(signature)
|
||||
.getBytes();
|
||||
|
||||
List<Verification> verificationList = sop.detachedVerify()
|
||||
.cert(BOB_CERT.getBytes(StandardCharsets.UTF_8))
|
||||
.signatures(armored)
|
||||
.data(message);
|
||||
|
||||
assertFalse(verificationList.isEmpty());
|
||||
assertSignedBy(verificationList, BOB_SIGNING_FINGERPRINT, BOB_PRIMARY_FINGERPRINT);
|
||||
}
|
||||
|
||||
@ParameterizedTest
|
||||
@MethodSource("sop.external.AbstractExternalSOPTest#provideBackends")
|
||||
public void verifyNotAfterThrowsNoSignature(SOP sop) {
|
||||
byte[] message = PLAINTEXT.getBytes(StandardCharsets.UTF_8);
|
||||
byte[] signature = ALICE_DETACHED_SIGNED_MESSAGE.getBytes(StandardCharsets.UTF_8);
|
||||
Date beforeSignature = new Date(ALICE_DETACHED_SIGNED_MESSAGE_DATE.getTime() - 1000); // 1 sec before sig
|
||||
|
||||
assertThrows(SOPGPException.NoSignature.class, () -> sop.detachedVerify()
|
||||
.cert(ALICE_CERT.getBytes(StandardCharsets.UTF_8))
|
||||
.notAfter(beforeSignature)
|
||||
.signatures(signature)
|
||||
.data(message));
|
||||
}
|
||||
|
||||
@ParameterizedTest
|
||||
@MethodSource("sop.external.AbstractExternalSOPTest#provideBackends")
|
||||
public void verifyNotBeforeThrowsNoSignature(SOP sop) {
|
||||
byte[] message = PLAINTEXT.getBytes(StandardCharsets.UTF_8);
|
||||
byte[] signature = ALICE_DETACHED_SIGNED_MESSAGE.getBytes(StandardCharsets.UTF_8);
|
||||
Date afterSignature = new Date(ALICE_DETACHED_SIGNED_MESSAGE_DATE.getTime() + 1000); // 1 sec after sig
|
||||
|
||||
assertThrows(SOPGPException.NoSignature.class, () -> sop.detachedVerify()
|
||||
.cert(ALICE_CERT.getBytes(StandardCharsets.UTF_8))
|
||||
.notBefore(afterSignature)
|
||||
.signatures(signature)
|
||||
.data(message));
|
||||
}
|
||||
|
||||
|
||||
@ParameterizedTest
|
||||
@MethodSource("sop.external.AbstractExternalSOPTest#provideBackends")
|
||||
public void signVerifyWithEncryptedKeyWithoutPassphraseFails(SOP sop) {
|
||||
assertThrows(SOPGPException.KeyIsProtected.class, () ->
|
||||
sop.detachedSign()
|
||||
.key(PASSWORD_PROTECTED_KEY.getBytes(StandardCharsets.UTF_8))
|
||||
.data(PLAINTEXT.getBytes(StandardCharsets.UTF_8))
|
||||
.toByteArrayAndResult()
|
||||
.getBytes());
|
||||
}
|
||||
|
||||
@ParameterizedTest
|
||||
@MethodSource("sop.external.AbstractExternalSOPTest#provideBackends")
|
||||
public void signWithProtectedKeyAndMultiplePassphrasesTest(SOP sop)
|
||||
throws IOException {
|
||||
byte[] message = PLAINTEXT.getBytes(StandardCharsets.UTF_8);
|
||||
|
||||
byte[] signature = sop.sign()
|
||||
.key(PASSWORD_PROTECTED_KEY.getBytes(StandardCharsets.UTF_8))
|
||||
.withKeyPassword("wrong")
|
||||
.withKeyPassword(PASSWORD) // correct
|
||||
.withKeyPassword("wrong2")
|
||||
.data(message)
|
||||
.toByteArrayAndResult()
|
||||
.getBytes();
|
||||
|
||||
assertFalse(sop.verify()
|
||||
.cert(PASSWORD_PROTECTED_CERT.getBytes(StandardCharsets.UTF_8))
|
||||
.signatures(signature)
|
||||
.data(message)
|
||||
.isEmpty());
|
||||
}
|
||||
|
||||
@ParameterizedTest
|
||||
@MethodSource("sop.external.AbstractExternalSOPTest#provideBackends")
|
||||
public void verifyMissingCertCausesMissingArg(SOP sop) {
|
||||
byte[] message = PLAINTEXT.getBytes(StandardCharsets.UTF_8);
|
||||
|
||||
assertThrows(SOPGPException.MissingArg.class, () ->
|
||||
sop.verify()
|
||||
.signatures(ALICE_DETACHED_SIGNED_MESSAGE.getBytes(StandardCharsets.UTF_8))
|
||||
.data(message));
|
||||
}
|
||||
|
||||
}
|
|
@ -2,26 +2,26 @@
|
|||
//
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package sop.external;
|
||||
package sop.testsuite.external;
|
||||
|
||||
import com.google.gson.Gson;
|
||||
import org.junit.jupiter.api.Named;
|
||||
import org.junit.jupiter.params.provider.Arguments;
|
||||
import sop.SOP;
|
||||
import sop.external.ExternalSOP;
|
||||
import sop.testsuite.SOPInstanceFactory;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.InputStream;
|
||||
import java.io.InputStreamReader;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Properties;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
public abstract class AbstractExternalSOPTest {
|
||||
public class ExternalSOPInstanceFactory extends SOPInstanceFactory {
|
||||
|
||||
private static final List<Arguments> backends = new ArrayList<>();
|
||||
|
||||
static {
|
||||
@Override
|
||||
public Map<String, SOP> provideSOPInstances() {
|
||||
Map<String, SOP> backends = new HashMap<>();
|
||||
TestSuite suite = readConfiguration();
|
||||
if (suite != null && !suite.backends.isEmpty()) {
|
||||
for (TestSubject subject : suite.backends) {
|
||||
|
@ -37,30 +37,24 @@ public abstract class AbstractExternalSOPTest {
|
|||
}
|
||||
|
||||
SOP sop = new ExternalSOP(subject.sop, env);
|
||||
backends.add(Arguments.of(Named.of(subject.name, sop)));
|
||||
backends.put(subject.name, sop);
|
||||
}
|
||||
}
|
||||
return backends;
|
||||
}
|
||||
|
||||
public static Stream<Arguments> provideBackends() {
|
||||
return backends.stream();
|
||||
}
|
||||
|
||||
public static TestSuite readConfiguration() {
|
||||
Gson gson = new Gson();
|
||||
InputStream inputStream = AbstractExternalSOPTest.class.getResourceAsStream("config.json");
|
||||
InputStream inputStream = ExternalSOPInstanceFactory.class.getResourceAsStream("config.json");
|
||||
if (inputStream == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
InputStreamReader reader = new InputStreamReader(inputStream);
|
||||
TestSuite suite = gson.fromJson(reader, TestSuite.class);
|
||||
return suite;
|
||||
return gson.fromJson(reader, TestSuite.class);
|
||||
}
|
||||
|
||||
public static boolean hasBackends() {
|
||||
return !backends.isEmpty();
|
||||
}
|
||||
|
||||
// JSON DTOs
|
||||
|
11
external-sop/src/test/java/sop/testsuite/external/operation/ExternalArmorDearmorTest.java
vendored
Normal file
11
external-sop/src/test/java/sop/testsuite/external/operation/ExternalArmorDearmorTest.java
vendored
Normal file
|
@ -0,0 +1,11 @@
|
|||
// SPDX-FileCopyrightText: 2023 Paul Schaub <vanitasvitae@fsfe.org>
|
||||
//
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package sop.testsuite.external.operation;
|
||||
|
||||
import sop.testsuite.operation.ArmorDearmorTest;
|
||||
|
||||
public class ExternalArmorDearmorTest extends ArmorDearmorTest {
|
||||
|
||||
}
|
|
@ -0,0 +1,11 @@
|
|||
// SPDX-FileCopyrightText: 2023 Paul Schaub <vanitasvitae@fsfe.org>
|
||||
//
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package sop.testsuite.external.operation;
|
||||
|
||||
import sop.testsuite.operation.DecryptWithSessionKeyTest;
|
||||
|
||||
public class ExternalDecryptWithSessionKeyTest extends DecryptWithSessionKeyTest {
|
||||
|
||||
}
|
|
@ -0,0 +1,10 @@
|
|||
// SPDX-FileCopyrightText: 2023 Paul Schaub <vanitasvitae@fsfe.org>
|
||||
//
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package sop.testsuite.external.operation;
|
||||
|
||||
import sop.testsuite.operation.DetachedSignDetachedVerifyTest;
|
||||
|
||||
public class ExternalDetachedSignDetachedVerifyTest extends DetachedSignDetachedVerifyTest {
|
||||
}
|
11
external-sop/src/test/java/sop/testsuite/external/operation/ExternalEncryptDecryptTest.java
vendored
Normal file
11
external-sop/src/test/java/sop/testsuite/external/operation/ExternalEncryptDecryptTest.java
vendored
Normal file
|
@ -0,0 +1,11 @@
|
|||
// SPDX-FileCopyrightText: 2023 Paul Schaub <vanitasvitae@fsfe.org>
|
||||
//
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package sop.testsuite.external.operation;
|
||||
|
||||
import sop.testsuite.operation.EncryptDecryptTest;
|
||||
|
||||
public class ExternalEncryptDecryptTest extends EncryptDecryptTest {
|
||||
|
||||
}
|
11
external-sop/src/test/java/sop/testsuite/external/operation/ExternalExtractCertTest.java
vendored
Normal file
11
external-sop/src/test/java/sop/testsuite/external/operation/ExternalExtractCertTest.java
vendored
Normal file
|
@ -0,0 +1,11 @@
|
|||
// SPDX-FileCopyrightText: 2023 Paul Schaub <vanitasvitae@fsfe.org>
|
||||
//
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package sop.testsuite.external.operation;
|
||||
|
||||
import sop.testsuite.operation.ExtractCertTest;
|
||||
|
||||
public class ExternalExtractCertTest extends ExtractCertTest {
|
||||
|
||||
}
|
11
external-sop/src/test/java/sop/testsuite/external/operation/ExternalGenerateKeyTest.java
vendored
Normal file
11
external-sop/src/test/java/sop/testsuite/external/operation/ExternalGenerateKeyTest.java
vendored
Normal file
|
@ -0,0 +1,11 @@
|
|||
// SPDX-FileCopyrightText: 2023 Paul Schaub <vanitasvitae@fsfe.org>
|
||||
//
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package sop.testsuite.external.operation;
|
||||
|
||||
import sop.testsuite.operation.GenerateKeyTest;
|
||||
|
||||
public class ExternalGenerateKeyTest extends GenerateKeyTest {
|
||||
|
||||
}
|
|
@ -0,0 +1,12 @@
|
|||
// SPDX-FileCopyrightText: 2023 Paul Schaub <vanitasvitae@fsfe.org>
|
||||
//
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package sop.testsuite.external.operation;
|
||||
|
||||
import sop.testsuite.operation.InlineSignInlineDetachDetachedVerifyTest;
|
||||
|
||||
public class ExternalInlineSignInlineDetachDetachedVerifyTest
|
||||
extends InlineSignInlineDetachDetachedVerifyTest {
|
||||
|
||||
}
|
|
@ -0,0 +1,11 @@
|
|||
// SPDX-FileCopyrightText: 2023 Paul Schaub <vanitasvitae@fsfe.org>
|
||||
//
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package sop.testsuite.external.operation;
|
||||
|
||||
import sop.testsuite.operation.InlineSignInlineVerifyTest;
|
||||
|
||||
public class ExternalInlineSignInlineVerifyTest extends InlineSignInlineVerifyTest {
|
||||
|
||||
}
|
11
external-sop/src/test/java/sop/testsuite/external/operation/ExternalVersionTest.java
vendored
Normal file
11
external-sop/src/test/java/sop/testsuite/external/operation/ExternalVersionTest.java
vendored
Normal file
|
@ -0,0 +1,11 @@
|
|||
// SPDX-FileCopyrightText: 2023 Paul Schaub <vanitasvitae@fsfe.org>
|
||||
//
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package sop.testsuite.external.operation;
|
||||
|
||||
import sop.testsuite.operation.VersionTest;
|
||||
|
||||
public class ExternalVersionTest extends VersionTest {
|
||||
|
||||
}
|
|
@ -15,10 +15,12 @@ repositories {
|
|||
|
||||
dependencies {
|
||||
testImplementation "org.junit.jupiter:junit-jupiter-api:$junitVersion"
|
||||
testImplementation "org.junit.jupiter:junit-jupiter-params:$junitVersion"
|
||||
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:$junitVersion"
|
||||
testFixturesImplementation "org.junit.jupiter:junit-jupiter-api:$junitVersion"
|
||||
testFixturesImplementation "org.junit.jupiter:junit-jupiter-params:$junitVersion"
|
||||
}
|
||||
|
||||
test {
|
||||
useJUnitPlatform()
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,8 +0,0 @@
|
|||
// SPDX-FileCopyrightText: 2021 Paul Schaub <vanitasvitae@fsfe.org>
|
||||
//
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
/**
|
||||
* Stateless OpenPGP Interface for Java.
|
||||
*/
|
||||
package sop.testing;
|
|
@ -2,7 +2,7 @@
|
|||
//
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package sop.testing;
|
||||
package sop.testsuite;
|
||||
|
||||
import sop.Verification;
|
||||
import sop.util.UTCUtil;
|
|
@ -0,0 +1,30 @@
|
|||
// SPDX-FileCopyrightText: 2023 Paul Schaub <vanitasvitae@fsfe.org>
|
||||
//
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package sop.testsuite;
|
||||
|
||||
import sop.SOP;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* Factory class to instantiate SOP implementations for testing.
|
||||
* Overwrite this class and the {@link #provideSOPInstances()} method to return the SOP instances you want
|
||||
* to test.
|
||||
* Then, add the following line to your <pre>build.gradle</pre> files <pre>dependencies</pre> section:
|
||||
* <pre>{@code
|
||||
* testImplementation(testFixtures("org.pgpainless:sop-java:<version>"))
|
||||
* }</pre>
|
||||
* To inject the factory class into the test suite, add the following line to your modules <pre>test</pre> task:
|
||||
* <pre>{@code
|
||||
* environment("test.implementation", "org.example.YourTestSubjectFactory")
|
||||
* }</pre>
|
||||
* Next, in your <pre>test</pre> sources, extend all test classes from the <pre>testFixtures</pre>
|
||||
* <pre>sop.operation</pre> package.
|
||||
* Take a look at the <pre>external-sop</pre> module for an example.
|
||||
*/
|
||||
public abstract class SOPInstanceFactory {
|
||||
|
||||
public abstract Map<String, SOP> provideSOPInstances();
|
||||
}
|
|
@ -2,7 +2,7 @@
|
|||
//
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package sop.testing;
|
||||
package sop.testsuite;
|
||||
|
||||
import sop.util.UTCUtil;
|
||||
|
|
@ -0,0 +1,51 @@
|
|||
// SPDX-FileCopyrightText: 2023 Paul Schaub <vanitasvitae@fsfe.org>
|
||||
//
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package sop.testsuite.operation;
|
||||
|
||||
import org.junit.jupiter.api.Named;
|
||||
import org.junit.jupiter.params.provider.Arguments;
|
||||
import sop.SOP;
|
||||
import sop.testsuite.SOPInstanceFactory;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
public abstract class AbstractSOPTest {
|
||||
|
||||
private static final List<Arguments> backends = new ArrayList<>();
|
||||
|
||||
static {
|
||||
// populate instances list via configured test subject factory
|
||||
String factoryName = System.getenv("test.implementation");
|
||||
if (factoryName != null) {
|
||||
try {
|
||||
Class testSubjectFactoryClass = Class.forName(factoryName);
|
||||
SOPInstanceFactory factory = (SOPInstanceFactory) testSubjectFactoryClass.newInstance();
|
||||
Map<String, SOP> testSubjects = factory.provideSOPInstances();
|
||||
|
||||
for (String key : testSubjects.keySet()) {
|
||||
backends.add(Arguments.of(Named.of(key, testSubjects.get(key))));
|
||||
}
|
||||
} catch (ClassNotFoundException e) {
|
||||
throw new RuntimeException(e);
|
||||
} catch (InstantiationException e) {
|
||||
throw new RuntimeException(e);
|
||||
} catch (IllegalAccessException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static Stream<Arguments> provideBackends() {
|
||||
return backends.stream();
|
||||
}
|
||||
|
||||
public static boolean hasBackends() {
|
||||
return !backends.isEmpty();
|
||||
}
|
||||
|
||||
}
|
|
@ -2,37 +2,32 @@
|
|||
//
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package sop.external;
|
||||
package sop.testsuite.operation;
|
||||
|
||||
import org.junit.jupiter.api.Assertions;
|
||||
import org.junit.jupiter.api.condition.EnabledIf;
|
||||
import org.junit.jupiter.params.ParameterizedTest;
|
||||
import org.junit.jupiter.params.provider.Arguments;
|
||||
import org.junit.jupiter.params.provider.MethodSource;
|
||||
import sop.SOP;
|
||||
import sop.testing.TestData;
|
||||
import sop.testsuite.JUtils;
|
||||
import sop.testsuite.TestData;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||
import static sop.testing.JUtils.arrayStartsWith;
|
||||
import static sop.testing.JUtils.assertArrayEndsWithIgnoreNewlines;
|
||||
import static sop.testing.JUtils.assertArrayStartsWith;
|
||||
import static sop.testing.JUtils.assertAsciiArmorEquals;
|
||||
import static sop.testing.TestData.BEGIN_PGP_MESSAGE;
|
||||
import static sop.testing.TestData.BEGIN_PGP_PRIVATE_KEY_BLOCK;
|
||||
import static sop.testing.TestData.BEGIN_PGP_PUBLIC_KEY_BLOCK;
|
||||
import static sop.testing.TestData.BEGIN_PGP_SIGNATURE;
|
||||
import static sop.testing.TestData.END_PGP_MESSAGE;
|
||||
import static sop.testing.TestData.END_PGP_PRIVATE_KEY_BLOCK;
|
||||
import static sop.testing.TestData.END_PGP_PUBLIC_KEY_BLOCK;
|
||||
import static sop.testing.TestData.END_PGP_SIGNATURE;
|
||||
|
||||
@EnabledIf("sop.external.AbstractExternalSOPTest#hasBackends")
|
||||
public class ExternalArmorDearmorRoundTripTest extends AbstractExternalSOPTest {
|
||||
@EnabledIf("sop.operation.AbstractSOPTest#hasBackends")
|
||||
public class ArmorDearmorTest {
|
||||
|
||||
static Stream<Arguments> provideInstances() {
|
||||
return AbstractSOPTest.provideBackends();
|
||||
}
|
||||
|
||||
@ParameterizedTest
|
||||
@MethodSource("sop.external.AbstractExternalSOPTest#provideBackends")
|
||||
@MethodSource("provideInstances")
|
||||
public void dearmorArmorAliceKey(SOP sop) throws IOException {
|
||||
byte[] aliceKey = TestData.ALICE_KEY.getBytes(StandardCharsets.UTF_8);
|
||||
|
||||
|
@ -40,20 +35,20 @@ public class ExternalArmorDearmorRoundTripTest extends AbstractExternalSOPTest {
|
|||
.data(aliceKey)
|
||||
.getBytes();
|
||||
|
||||
assertFalse(arrayStartsWith(dearmored, BEGIN_PGP_PRIVATE_KEY_BLOCK));
|
||||
Assertions.assertFalse(JUtils.arrayStartsWith(dearmored, TestData.BEGIN_PGP_PRIVATE_KEY_BLOCK));
|
||||
|
||||
byte[] armored = sop.armor()
|
||||
.data(dearmored)
|
||||
.getBytes();
|
||||
|
||||
assertArrayStartsWith(armored, BEGIN_PGP_PRIVATE_KEY_BLOCK);
|
||||
assertArrayEndsWithIgnoreNewlines(armored, END_PGP_PRIVATE_KEY_BLOCK);
|
||||
JUtils.assertArrayStartsWith(armored, TestData.BEGIN_PGP_PRIVATE_KEY_BLOCK);
|
||||
JUtils.assertArrayEndsWithIgnoreNewlines(armored, TestData.END_PGP_PRIVATE_KEY_BLOCK);
|
||||
|
||||
// assertAsciiArmorEquals(aliceKey, armored);
|
||||
}
|
||||
|
||||
@ParameterizedTest
|
||||
@MethodSource("sop.external.AbstractExternalSOPTest#provideBackends")
|
||||
@MethodSource("provideInstances")
|
||||
public void dearmorArmorAliceCert(SOP sop) throws IOException {
|
||||
byte[] aliceCert = TestData.ALICE_CERT.getBytes(StandardCharsets.UTF_8);
|
||||
|
||||
|
@ -61,20 +56,20 @@ public class ExternalArmorDearmorRoundTripTest extends AbstractExternalSOPTest {
|
|||
.data(aliceCert)
|
||||
.getBytes();
|
||||
|
||||
assertFalse(arrayStartsWith(dearmored, BEGIN_PGP_PUBLIC_KEY_BLOCK));
|
||||
Assertions.assertFalse(JUtils.arrayStartsWith(dearmored, TestData.BEGIN_PGP_PUBLIC_KEY_BLOCK));
|
||||
|
||||
byte[] armored = sop.armor()
|
||||
.data(dearmored)
|
||||
.getBytes();
|
||||
|
||||
assertArrayStartsWith(armored, BEGIN_PGP_PUBLIC_KEY_BLOCK);
|
||||
assertArrayEndsWithIgnoreNewlines(armored, END_PGP_PUBLIC_KEY_BLOCK);
|
||||
JUtils.assertArrayStartsWith(armored, TestData.BEGIN_PGP_PUBLIC_KEY_BLOCK);
|
||||
JUtils.assertArrayEndsWithIgnoreNewlines(armored, TestData.END_PGP_PUBLIC_KEY_BLOCK);
|
||||
|
||||
// assertAsciiArmorEquals(aliceCert, armored);
|
||||
}
|
||||
|
||||
@ParameterizedTest
|
||||
@MethodSource("sop.external.AbstractExternalSOPTest#provideBackends")
|
||||
@MethodSource("provideInstances")
|
||||
public void dearmorArmorBobKey(SOP sop) throws IOException {
|
||||
byte[] bobKey = TestData.BOB_KEY.getBytes(StandardCharsets.UTF_8);
|
||||
|
||||
|
@ -82,20 +77,20 @@ public class ExternalArmorDearmorRoundTripTest extends AbstractExternalSOPTest {
|
|||
.data(bobKey)
|
||||
.getBytes();
|
||||
|
||||
assertFalse(arrayStartsWith(dearmored, BEGIN_PGP_PRIVATE_KEY_BLOCK));
|
||||
Assertions.assertFalse(JUtils.arrayStartsWith(dearmored, TestData.BEGIN_PGP_PRIVATE_KEY_BLOCK));
|
||||
|
||||
byte[] armored = sop.armor()
|
||||
.data(dearmored)
|
||||
.getBytes();
|
||||
|
||||
assertArrayStartsWith(armored, BEGIN_PGP_PRIVATE_KEY_BLOCK);
|
||||
assertArrayEndsWithIgnoreNewlines(armored, END_PGP_PRIVATE_KEY_BLOCK);
|
||||
JUtils.assertArrayStartsWith(armored, TestData.BEGIN_PGP_PRIVATE_KEY_BLOCK);
|
||||
JUtils.assertArrayEndsWithIgnoreNewlines(armored, TestData.END_PGP_PRIVATE_KEY_BLOCK);
|
||||
|
||||
// assertAsciiArmorEquals(bobKey, armored);
|
||||
}
|
||||
|
||||
@ParameterizedTest
|
||||
@MethodSource("sop.external.AbstractExternalSOPTest#provideBackends")
|
||||
@MethodSource("provideInstances")
|
||||
public void dearmorArmorBobCert(SOP sop) throws IOException {
|
||||
byte[] bobCert = TestData.BOB_CERT.getBytes(StandardCharsets.UTF_8);
|
||||
|
||||
|
@ -103,20 +98,20 @@ public class ExternalArmorDearmorRoundTripTest extends AbstractExternalSOPTest {
|
|||
.data(bobCert)
|
||||
.getBytes();
|
||||
|
||||
assertFalse(arrayStartsWith(dearmored, BEGIN_PGP_PUBLIC_KEY_BLOCK));
|
||||
Assertions.assertFalse(JUtils.arrayStartsWith(dearmored, TestData.BEGIN_PGP_PUBLIC_KEY_BLOCK));
|
||||
|
||||
byte[] armored = sop.armor()
|
||||
.data(dearmored)
|
||||
.getBytes();
|
||||
|
||||
assertArrayStartsWith(armored, BEGIN_PGP_PUBLIC_KEY_BLOCK);
|
||||
assertArrayEndsWithIgnoreNewlines(armored, END_PGP_PUBLIC_KEY_BLOCK);
|
||||
JUtils.assertArrayStartsWith(armored, TestData.BEGIN_PGP_PUBLIC_KEY_BLOCK);
|
||||
JUtils.assertArrayEndsWithIgnoreNewlines(armored, TestData.END_PGP_PUBLIC_KEY_BLOCK);
|
||||
|
||||
// assertAsciiArmorEquals(bobCert, armored);
|
||||
}
|
||||
|
||||
@ParameterizedTest
|
||||
@MethodSource("sop.external.AbstractExternalSOPTest#provideBackends")
|
||||
@MethodSource("provideInstances")
|
||||
public void dearmorArmorCarolKey(SOP sop) throws IOException {
|
||||
byte[] carolKey = TestData.CAROL_KEY.getBytes(StandardCharsets.UTF_8);
|
||||
|
||||
|
@ -124,20 +119,20 @@ public class ExternalArmorDearmorRoundTripTest extends AbstractExternalSOPTest {
|
|||
.data(carolKey)
|
||||
.getBytes();
|
||||
|
||||
assertFalse(arrayStartsWith(dearmored, BEGIN_PGP_PRIVATE_KEY_BLOCK));
|
||||
Assertions.assertFalse(JUtils.arrayStartsWith(dearmored, TestData.BEGIN_PGP_PRIVATE_KEY_BLOCK));
|
||||
|
||||
byte[] armored = sop.armor()
|
||||
.data(dearmored)
|
||||
.getBytes();
|
||||
|
||||
assertArrayStartsWith(armored, BEGIN_PGP_PRIVATE_KEY_BLOCK);
|
||||
assertArrayEndsWithIgnoreNewlines(armored, END_PGP_PRIVATE_KEY_BLOCK);
|
||||
JUtils.assertArrayStartsWith(armored, TestData.BEGIN_PGP_PRIVATE_KEY_BLOCK);
|
||||
JUtils.assertArrayEndsWithIgnoreNewlines(armored, TestData.END_PGP_PRIVATE_KEY_BLOCK);
|
||||
|
||||
// assertAsciiArmorEquals(carolKey, armored);
|
||||
}
|
||||
|
||||
@ParameterizedTest
|
||||
@MethodSource("sop.external.AbstractExternalSOPTest#provideBackends")
|
||||
@MethodSource("provideInstances")
|
||||
public void dearmorArmorCarolCert(SOP sop) throws IOException {
|
||||
byte[] carolCert = TestData.CAROL_CERT.getBytes(StandardCharsets.UTF_8);
|
||||
|
||||
|
@ -145,20 +140,20 @@ public class ExternalArmorDearmorRoundTripTest extends AbstractExternalSOPTest {
|
|||
.data(carolCert)
|
||||
.getBytes();
|
||||
|
||||
assertFalse(arrayStartsWith(dearmored, BEGIN_PGP_PUBLIC_KEY_BLOCK));
|
||||
Assertions.assertFalse(JUtils.arrayStartsWith(dearmored, TestData.BEGIN_PGP_PUBLIC_KEY_BLOCK));
|
||||
|
||||
byte[] armored = sop.armor()
|
||||
.data(dearmored)
|
||||
.getBytes();
|
||||
|
||||
assertArrayStartsWith(armored, BEGIN_PGP_PUBLIC_KEY_BLOCK);
|
||||
assertArrayEndsWithIgnoreNewlines(armored, END_PGP_PUBLIC_KEY_BLOCK);
|
||||
JUtils.assertArrayStartsWith(armored, TestData.BEGIN_PGP_PUBLIC_KEY_BLOCK);
|
||||
JUtils.assertArrayEndsWithIgnoreNewlines(armored, TestData.END_PGP_PUBLIC_KEY_BLOCK);
|
||||
|
||||
// assertAsciiArmorEquals(carolCert, armored);
|
||||
}
|
||||
|
||||
@ParameterizedTest
|
||||
@MethodSource("sop.external.AbstractExternalSOPTest#provideBackends")
|
||||
@MethodSource("provideInstances")
|
||||
public void dearmorArmorMessage(SOP sop) throws IOException {
|
||||
byte[] message = ("-----BEGIN PGP MESSAGE-----\n" +
|
||||
"\n" +
|
||||
|
@ -172,20 +167,20 @@ public class ExternalArmorDearmorRoundTripTest extends AbstractExternalSOPTest {
|
|||
.data(message)
|
||||
.getBytes();
|
||||
|
||||
assertFalse(arrayStartsWith(dearmored, BEGIN_PGP_MESSAGE));
|
||||
Assertions.assertFalse(JUtils.arrayStartsWith(dearmored, TestData.BEGIN_PGP_MESSAGE));
|
||||
|
||||
byte[] armored = sop.armor()
|
||||
.data(dearmored)
|
||||
.getBytes();
|
||||
|
||||
assertArrayStartsWith(armored, BEGIN_PGP_MESSAGE);
|
||||
assertArrayEndsWithIgnoreNewlines(armored, END_PGP_MESSAGE);
|
||||
JUtils.assertArrayStartsWith(armored, TestData.BEGIN_PGP_MESSAGE);
|
||||
JUtils.assertArrayEndsWithIgnoreNewlines(armored, TestData.END_PGP_MESSAGE);
|
||||
|
||||
// assertAsciiArmorEquals(message, armored);
|
||||
}
|
||||
|
||||
@ParameterizedTest
|
||||
@MethodSource("sop.external.AbstractExternalSOPTest#provideBackends")
|
||||
@MethodSource("provideInstances")
|
||||
public void dearmorArmorSignature(SOP sop) throws IOException {
|
||||
byte[] signature = ("-----BEGIN PGP SIGNATURE-----\n" +
|
||||
"\n" +
|
||||
|
@ -200,20 +195,20 @@ public class ExternalArmorDearmorRoundTripTest extends AbstractExternalSOPTest {
|
|||
.data(signature)
|
||||
.getBytes();
|
||||
|
||||
assertFalse(arrayStartsWith(dearmored, BEGIN_PGP_SIGNATURE));
|
||||
Assertions.assertFalse(JUtils.arrayStartsWith(dearmored, TestData.BEGIN_PGP_SIGNATURE));
|
||||
|
||||
byte[] armored = sop.armor()
|
||||
.data(dearmored)
|
||||
.getBytes();
|
||||
|
||||
assertArrayStartsWith(armored, BEGIN_PGP_SIGNATURE);
|
||||
assertArrayEndsWithIgnoreNewlines(armored, END_PGP_SIGNATURE);
|
||||
JUtils.assertArrayStartsWith(armored, TestData.BEGIN_PGP_SIGNATURE);
|
||||
JUtils.assertArrayEndsWithIgnoreNewlines(armored, TestData.END_PGP_SIGNATURE);
|
||||
|
||||
assertAsciiArmorEquals(signature, armored);
|
||||
JUtils.assertAsciiArmorEquals(signature, armored);
|
||||
}
|
||||
|
||||
@ParameterizedTest
|
||||
@MethodSource("sop.external.AbstractExternalSOPTest#provideBackends")
|
||||
@MethodSource("provideInstances")
|
||||
public void testDearmoringTwiceIsIdempotent(SOP sop) throws IOException {
|
||||
byte[] dearmored = sop.dearmor()
|
||||
.data(TestData.ALICE_KEY.getBytes(StandardCharsets.UTF_8))
|
||||
|
@ -227,7 +222,7 @@ public class ExternalArmorDearmorRoundTripTest extends AbstractExternalSOPTest {
|
|||
}
|
||||
|
||||
@ParameterizedTest
|
||||
@MethodSource("sop.external.AbstractExternalSOPTest#provideBackends")
|
||||
@MethodSource("provideInstances")
|
||||
public void testArmoringTwiceIsIdempotent(SOP sop) throws IOException {
|
||||
byte[] armored = ("-----BEGIN PGP SIGNATURE-----\n" +
|
||||
"\n" +
|
||||
|
@ -242,7 +237,7 @@ public class ExternalArmorDearmorRoundTripTest extends AbstractExternalSOPTest {
|
|||
.data(armored)
|
||||
.getBytes();
|
||||
|
||||
assertAsciiArmorEquals(armored, armoredAgain);
|
||||
JUtils.assertAsciiArmorEquals(armored, armoredAgain);
|
||||
}
|
||||
|
||||
}
|
|
@ -2,26 +2,27 @@
|
|||
//
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package sop.external;
|
||||
package sop.testsuite.operation;
|
||||
|
||||
import org.junit.jupiter.api.Assertions;
|
||||
import org.junit.jupiter.api.condition.EnabledIf;
|
||||
import org.junit.jupiter.params.ParameterizedTest;
|
||||
import org.junit.jupiter.params.provider.Arguments;
|
||||
import org.junit.jupiter.params.provider.MethodSource;
|
||||
import sop.ByteArrayAndResult;
|
||||
import sop.DecryptionResult;
|
||||
import sop.SOP;
|
||||
import sop.SessionKey;
|
||||
import sop.testsuite.TestData;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static sop.testing.TestData.ALICE_KEY;
|
||||
import static sop.testing.TestData.PLAINTEXT;
|
||||
|
||||
@EnabledIf("sop.external.AbstractExternalSOPTest#hasBackends")
|
||||
public class ExternalDecryptWithSessionKeyTest extends AbstractExternalSOPTest {
|
||||
@EnabledIf("sop.operation.AbstractSOPTest#hasBackends")
|
||||
public class DecryptWithSessionKeyTest extends AbstractSOPTest {
|
||||
|
||||
private static final String CIPHERTEXT = "-----BEGIN PGP MESSAGE-----\n" +
|
||||
"\n" +
|
||||
|
@ -33,21 +34,25 @@ public class ExternalDecryptWithSessionKeyTest extends AbstractExternalSOPTest {
|
|||
"-----END PGP MESSAGE-----\n";
|
||||
private static final String SESSION_KEY = "9:ED682800F5FEA829A82E8B7DDF8CE9CF4BF9BB45024B017764462EE53101C36A";
|
||||
|
||||
static Stream<Arguments> provideInstances() {
|
||||
return provideBackends();
|
||||
}
|
||||
|
||||
@ParameterizedTest
|
||||
@MethodSource("sop.external.AbstractExternalSOPTest#provideBackends")
|
||||
@MethodSource("provideInstances")
|
||||
public void testDecryptAndExtractSessionKey(SOP sop) throws IOException {
|
||||
ByteArrayAndResult<DecryptionResult> bytesAndResult = sop.decrypt()
|
||||
.withKey(ALICE_KEY.getBytes(StandardCharsets.UTF_8))
|
||||
.withKey(TestData.ALICE_KEY.getBytes(StandardCharsets.UTF_8))
|
||||
.ciphertext(CIPHERTEXT.getBytes(StandardCharsets.UTF_8))
|
||||
.toByteArrayAndResult();
|
||||
|
||||
assertEquals(SESSION_KEY, bytesAndResult.getResult().getSessionKey().get().toString());
|
||||
|
||||
assertArrayEquals(PLAINTEXT.getBytes(StandardCharsets.UTF_8), bytesAndResult.getBytes());
|
||||
Assertions.assertArrayEquals(TestData.PLAINTEXT.getBytes(StandardCharsets.UTF_8), bytesAndResult.getBytes());
|
||||
}
|
||||
|
||||
@ParameterizedTest
|
||||
@MethodSource("sop.external.AbstractExternalSOPTest#provideBackends")
|
||||
@MethodSource("provideInstances")
|
||||
public void testDecryptWithSessionKey(SOP sop) throws IOException {
|
||||
byte[] decrypted = sop.decrypt()
|
||||
.withSessionKey(SessionKey.fromString(SESSION_KEY))
|
||||
|
@ -55,6 +60,6 @@ public class ExternalDecryptWithSessionKeyTest extends AbstractExternalSOPTest {
|
|||
.toByteArrayAndResult()
|
||||
.getBytes();
|
||||
|
||||
assertArrayEquals(PLAINTEXT.getBytes(StandardCharsets.UTF_8), decrypted);
|
||||
Assertions.assertArrayEquals(TestData.PLAINTEXT.getBytes(StandardCharsets.UTF_8), decrypted);
|
||||
}
|
||||
}
|
|
@ -0,0 +1,250 @@
|
|||
// SPDX-FileCopyrightText: 2023 Paul Schaub <vanitasvitae@fsfe.org>
|
||||
//
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package sop.testsuite.operation;
|
||||
|
||||
import org.junit.jupiter.api.condition.EnabledIf;
|
||||
import org.junit.jupiter.params.ParameterizedTest;
|
||||
import org.junit.jupiter.params.provider.Arguments;
|
||||
import org.junit.jupiter.params.provider.MethodSource;
|
||||
import sop.SOP;
|
||||
import sop.Verification;
|
||||
import sop.enums.SignAs;
|
||||
import sop.exception.SOPGPException;
|
||||
import sop.testsuite.JUtils;
|
||||
import sop.testsuite.TestData;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||
import static org.junit.jupiter.api.Assertions.assertThrows;
|
||||
|
||||
@EnabledIf("sop.operation.AbstractSOPTest#hasBackends")
|
||||
public class DetachedSignDetachedVerifyTest extends AbstractSOPTest {
|
||||
|
||||
static Stream<Arguments> provideInstances() {
|
||||
return provideBackends();
|
||||
}
|
||||
|
||||
@ParameterizedTest
|
||||
@MethodSource("provideInstances")
|
||||
public void signVerifyWithAliceKey(SOP sop) throws IOException {
|
||||
byte[] message = TestData.PLAINTEXT.getBytes(StandardCharsets.UTF_8);
|
||||
|
||||
byte[] signature = sop.detachedSign()
|
||||
.key(TestData.ALICE_KEY.getBytes(StandardCharsets.UTF_8))
|
||||
.data(message)
|
||||
.toByteArrayAndResult()
|
||||
.getBytes();
|
||||
|
||||
List<Verification> verificationList = sop.detachedVerify()
|
||||
.cert(TestData.ALICE_CERT.getBytes(StandardCharsets.UTF_8))
|
||||
.signatures(signature)
|
||||
.data(message);
|
||||
|
||||
assertFalse(verificationList.isEmpty());
|
||||
JUtils.assertSignedBy(verificationList, TestData.ALICE_SIGNING_FINGERPRINT, TestData.ALICE_PRIMARY_FINGERPRINT);
|
||||
}
|
||||
|
||||
@ParameterizedTest
|
||||
@MethodSource("provideInstances")
|
||||
public void signVerifyTextModeWithAliceKey(SOP sop) throws IOException {
|
||||
byte[] message = TestData.PLAINTEXT.getBytes(StandardCharsets.UTF_8);
|
||||
|
||||
byte[] signature = sop.detachedSign()
|
||||
.key(TestData.ALICE_KEY.getBytes(StandardCharsets.UTF_8))
|
||||
.mode(SignAs.Text)
|
||||
.data(message)
|
||||
.toByteArrayAndResult()
|
||||
.getBytes();
|
||||
|
||||
List<Verification> verificationList = sop.detachedVerify()
|
||||
.cert(TestData.ALICE_CERT.getBytes(StandardCharsets.UTF_8))
|
||||
.signatures(signature)
|
||||
.data(message);
|
||||
|
||||
assertFalse(verificationList.isEmpty());
|
||||
JUtils.assertSignedBy(verificationList, TestData.ALICE_SIGNING_FINGERPRINT, TestData.ALICE_PRIMARY_FINGERPRINT);
|
||||
}
|
||||
|
||||
@ParameterizedTest
|
||||
@MethodSource("provideInstances")
|
||||
public void verifyKnownMessageWithAliceCert(SOP sop) throws IOException {
|
||||
byte[] message = TestData.PLAINTEXT.getBytes(StandardCharsets.UTF_8);
|
||||
byte[] signature = TestData.ALICE_DETACHED_SIGNED_MESSAGE.getBytes(StandardCharsets.UTF_8);
|
||||
|
||||
List<Verification> verificationList = sop.detachedVerify()
|
||||
.cert(TestData.ALICE_CERT.getBytes(StandardCharsets.UTF_8))
|
||||
.signatures(signature)
|
||||
.data(message);
|
||||
|
||||
assertFalse(verificationList.isEmpty());
|
||||
JUtils.assertSignedBy(verificationList, TestData.ALICE_SIGNING_FINGERPRINT, TestData.ALICE_PRIMARY_FINGERPRINT, TestData.ALICE_DETACHED_SIGNED_MESSAGE_DATE);
|
||||
}
|
||||
|
||||
@ParameterizedTest
|
||||
@MethodSource("provideInstances")
|
||||
public void signVerifyWithBobKey(SOP sop) throws IOException {
|
||||
byte[] message = TestData.PLAINTEXT.getBytes(StandardCharsets.UTF_8);
|
||||
|
||||
byte[] signature = sop.detachedSign()
|
||||
.key(TestData.BOB_KEY.getBytes(StandardCharsets.UTF_8))
|
||||
.data(message)
|
||||
.toByteArrayAndResult()
|
||||
.getBytes();
|
||||
|
||||
List<Verification> verificationList = sop.detachedVerify()
|
||||
.cert(TestData.BOB_CERT.getBytes(StandardCharsets.UTF_8))
|
||||
.signatures(signature)
|
||||
.data(message);
|
||||
|
||||
assertFalse(verificationList.isEmpty());
|
||||
JUtils.assertSignedBy(verificationList, TestData.BOB_SIGNING_FINGERPRINT, TestData.BOB_PRIMARY_FINGERPRINT);
|
||||
}
|
||||
|
||||
@ParameterizedTest
|
||||
@MethodSource("provideInstances")
|
||||
public void signVerifyWithCarolKey(SOP sop) throws IOException {
|
||||
byte[] message = TestData.PLAINTEXT.getBytes(StandardCharsets.UTF_8);
|
||||
|
||||
byte[] signature = sop.detachedSign()
|
||||
.key(TestData.CAROL_KEY.getBytes(StandardCharsets.UTF_8))
|
||||
.data(message)
|
||||
.toByteArrayAndResult()
|
||||
.getBytes();
|
||||
|
||||
List<Verification> verificationList = sop.detachedVerify()
|
||||
.cert(TestData.CAROL_CERT.getBytes(StandardCharsets.UTF_8))
|
||||
.signatures(signature)
|
||||
.data(message);
|
||||
|
||||
assertFalse(verificationList.isEmpty());
|
||||
JUtils.assertSignedBy(verificationList, TestData.CAROL_SIGNING_FINGERPRINT, TestData.CAROL_PRIMARY_FINGERPRINT);
|
||||
}
|
||||
|
||||
@ParameterizedTest
|
||||
@MethodSource("provideInstances")
|
||||
public void signVerifyWithEncryptedKey(SOP sop) throws IOException {
|
||||
byte[] message = TestData.PLAINTEXT.getBytes(StandardCharsets.UTF_8);
|
||||
|
||||
byte[] signature = sop.detachedSign()
|
||||
.key(TestData.PASSWORD_PROTECTED_KEY.getBytes(StandardCharsets.UTF_8))
|
||||
.withKeyPassword(TestData.PASSWORD)
|
||||
.data(message)
|
||||
.toByteArrayAndResult()
|
||||
.getBytes();
|
||||
|
||||
JUtils.assertArrayStartsWith(signature, TestData.BEGIN_PGP_SIGNATURE);
|
||||
|
||||
List<Verification> verificationList = sop.detachedVerify()
|
||||
.cert(TestData.PASSWORD_PROTECTED_CERT.getBytes(StandardCharsets.UTF_8))
|
||||
.signatures(signature)
|
||||
.data(message);
|
||||
|
||||
assertFalse(verificationList.isEmpty());
|
||||
}
|
||||
|
||||
@ParameterizedTest
|
||||
@MethodSource("provideInstances")
|
||||
public void signArmorVerifyWithBobKey(SOP sop) throws IOException {
|
||||
byte[] message = TestData.PLAINTEXT.getBytes(StandardCharsets.UTF_8);
|
||||
|
||||
byte[] signature = sop.detachedSign()
|
||||
.key(TestData.BOB_KEY.getBytes(StandardCharsets.UTF_8))
|
||||
.noArmor()
|
||||
.data(message)
|
||||
.toByteArrayAndResult()
|
||||
.getBytes();
|
||||
|
||||
byte[] armored = sop.armor()
|
||||
.data(signature)
|
||||
.getBytes();
|
||||
|
||||
List<Verification> verificationList = sop.detachedVerify()
|
||||
.cert(TestData.BOB_CERT.getBytes(StandardCharsets.UTF_8))
|
||||
.signatures(armored)
|
||||
.data(message);
|
||||
|
||||
assertFalse(verificationList.isEmpty());
|
||||
JUtils.assertSignedBy(verificationList, TestData.BOB_SIGNING_FINGERPRINT, TestData.BOB_PRIMARY_FINGERPRINT);
|
||||
}
|
||||
|
||||
@ParameterizedTest
|
||||
@MethodSource("provideInstances")
|
||||
public void verifyNotAfterThrowsNoSignature(SOP sop) {
|
||||
byte[] message = TestData.PLAINTEXT.getBytes(StandardCharsets.UTF_8);
|
||||
byte[] signature = TestData.ALICE_DETACHED_SIGNED_MESSAGE.getBytes(StandardCharsets.UTF_8);
|
||||
Date beforeSignature = new Date(TestData.ALICE_DETACHED_SIGNED_MESSAGE_DATE.getTime() - 1000); // 1 sec before sig
|
||||
|
||||
assertThrows(SOPGPException.NoSignature.class, () -> sop.detachedVerify()
|
||||
.cert(TestData.ALICE_CERT.getBytes(StandardCharsets.UTF_8))
|
||||
.notAfter(beforeSignature)
|
||||
.signatures(signature)
|
||||
.data(message));
|
||||
}
|
||||
|
||||
@ParameterizedTest
|
||||
@MethodSource("provideInstances")
|
||||
public void verifyNotBeforeThrowsNoSignature(SOP sop) {
|
||||
byte[] message = TestData.PLAINTEXT.getBytes(StandardCharsets.UTF_8);
|
||||
byte[] signature = TestData.ALICE_DETACHED_SIGNED_MESSAGE.getBytes(StandardCharsets.UTF_8);
|
||||
Date afterSignature = new Date(TestData.ALICE_DETACHED_SIGNED_MESSAGE_DATE.getTime() + 1000); // 1 sec after sig
|
||||
|
||||
assertThrows(SOPGPException.NoSignature.class, () -> sop.detachedVerify()
|
||||
.cert(TestData.ALICE_CERT.getBytes(StandardCharsets.UTF_8))
|
||||
.notBefore(afterSignature)
|
||||
.signatures(signature)
|
||||
.data(message));
|
||||
}
|
||||
|
||||
|
||||
@ParameterizedTest
|
||||
@MethodSource("provideInstances")
|
||||
public void signVerifyWithEncryptedKeyWithoutPassphraseFails(SOP sop) {
|
||||
assertThrows(SOPGPException.KeyIsProtected.class, () ->
|
||||
sop.detachedSign()
|
||||
.key(TestData.PASSWORD_PROTECTED_KEY.getBytes(StandardCharsets.UTF_8))
|
||||
.data(TestData.PLAINTEXT.getBytes(StandardCharsets.UTF_8))
|
||||
.toByteArrayAndResult()
|
||||
.getBytes());
|
||||
}
|
||||
|
||||
@ParameterizedTest
|
||||
@MethodSource("provideInstances")
|
||||
public void signWithProtectedKeyAndMultiplePassphrasesTest(SOP sop)
|
||||
throws IOException {
|
||||
byte[] message = TestData.PLAINTEXT.getBytes(StandardCharsets.UTF_8);
|
||||
|
||||
byte[] signature = sop.sign()
|
||||
.key(TestData.PASSWORD_PROTECTED_KEY.getBytes(StandardCharsets.UTF_8))
|
||||
.withKeyPassword("wrong")
|
||||
.withKeyPassword(TestData.PASSWORD) // correct
|
||||
.withKeyPassword("wrong2")
|
||||
.data(message)
|
||||
.toByteArrayAndResult()
|
||||
.getBytes();
|
||||
|
||||
assertFalse(sop.verify()
|
||||
.cert(TestData.PASSWORD_PROTECTED_CERT.getBytes(StandardCharsets.UTF_8))
|
||||
.signatures(signature)
|
||||
.data(message)
|
||||
.isEmpty());
|
||||
}
|
||||
|
||||
@ParameterizedTest
|
||||
@MethodSource("provideInstances")
|
||||
public void verifyMissingCertCausesMissingArg(SOP sop) {
|
||||
byte[] message = TestData.PLAINTEXT.getBytes(StandardCharsets.UTF_8);
|
||||
|
||||
assertThrows(SOPGPException.MissingArg.class, () ->
|
||||
sop.verify()
|
||||
.signatures(TestData.ALICE_DETACHED_SIGNED_MESSAGE.getBytes(StandardCharsets.UTF_8))
|
||||
.data(message));
|
||||
}
|
||||
|
||||
}
|
|
@ -2,10 +2,11 @@
|
|||
//
|
||||
// SPDX-License-Identifier: Apache-2.0
|
||||
|
||||
package sop.external;
|
||||
package sop.testsuite.operation;
|
||||
|
||||
import org.junit.jupiter.api.condition.EnabledIf;
|
||||
import org.junit.jupiter.params.ParameterizedTest;
|
||||
import org.junit.jupiter.params.provider.Arguments;
|
||||
import org.junit.jupiter.params.provider.MethodSource;
|
||||
import sop.ByteArrayAndResult;
|
||||
import sop.DecryptionResult;
|
||||
|
@ -13,36 +14,33 @@ import sop.SOP;
|
|||
import sop.Verification;
|
||||
import sop.enums.EncryptAs;
|
||||
import sop.exception.SOPGPException;
|
||||
import sop.testsuite.JUtils;
|
||||
import sop.testsuite.TestData;
|
||||
import sop.util.UTCUtil;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertArrayEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||
import static org.junit.jupiter.api.Assertions.assertNotNull;
|
||||
import static org.junit.jupiter.api.Assertions.assertThrows;
|
||||
import static sop.testing.JUtils.assertSignedBy;
|
||||
import static sop.testing.TestData.ALICE_CERT;
|
||||
import static sop.testing.TestData.ALICE_KEY;
|
||||
import static sop.testing.TestData.ALICE_PRIMARY_FINGERPRINT;
|
||||
import static sop.test |