PGPainless/sop-java
1
0
Fork 0
mirror of https://codeberg.org/PGPainless/sop-java.git synced 2024-11-26 09:02:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Implement '--signing-only' option for 'generate-key' command

Browse source
This commit is contained in:
Paul Schaub 2023-07-12 01:06:41 +02:00
parent 7e1377a28c
commit 6afe6896d8
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
4 changed files with 41 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
external-sop/src/main/java/sop/external/operation/GenerateKeyExternal.java vendored
View file

@ -57,6 +57,12 @@ public class GenerateKeyExternal implements GenerateKey {
return this; return this;
} }
@Override
public GenerateKey signingOnly() {
commandList.add("--signing-only");
return this;
}
@Override @Override
public Ready generate() public Ready generate()
throws SOPGPException.MissingArg, SOPGPException.UnsupportedAsymmetricAlgo { throws SOPGPException.MissingArg, SOPGPException.UnsupportedAsymmetricAlgo {

7
sop-java-picocli/src/main/java/sop/cli/picocli/commands/GenerateKeyCmd.java
View file

@ -34,6 +34,9 @@ public class GenerateKeyCmd extends AbstractSopCmd {
paramLabel = "PROFILE") paramLabel = "PROFILE")
String profile; String profile;
@CommandLine.Option(names = "--signing-only")
boolean signingOnly = false;
@Override @Override
public void run() { public void run() {
GenerateKey generateKey = throwIfUnsupportedSubcommand( GenerateKey generateKey = throwIfUnsupportedSubcommand(
@ -48,6 +51,10 @@ public class GenerateKeyCmd extends AbstractSopCmd {
} }
} }
if (signingOnly) {
generateKey.signingOnly();
}
for (String userId : userId) { for (String userId : userId) {
generateKey.userId(userId); generateKey.userId(userId);
} }

7
sop-java/src/main/java/sop/operation/GenerateKey.java
View file

@ -80,6 +80,13 @@ public interface GenerateKey {
*/ */
GenerateKey profile(String profile); GenerateKey profile(String profile);
/**
* If this options is set, the generated key will not be capable of encryption / decryption.
*
* @return builder instance
*/
GenerateKey signingOnly();
/** /**
* Generate the OpenPGP key and return it encoded as an {@link InputStream}. * Generate the OpenPGP key and return it encoded as an {@link InputStream}.
* *

21
sop-java/src/testFixtures/java/sop/testsuite/operation/GenerateKeyTest.java
View file

@ -10,12 +10,16 @@ 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;
import sop.SOP; import sop.SOP;
import sop.exception.SOPGPException;
import sop.testsuite.JUtils; import sop.testsuite.JUtils;
import sop.testsuite.TestData; import sop.testsuite.TestData;
import java.io.IOException; import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.stream.Stream; import java.util.stream.Stream;
import static org.junit.jupiter.api.Assertions.assertThrows;
@EnabledIf("sop.testsuite.operation.AbstractSOPTest#hasBackends") @EnabledIf("sop.testsuite.operation.AbstractSOPTest#hasBackends")
public class GenerateKeyTest extends AbstractSOPTest { public class GenerateKeyTest extends AbstractSOPTest {
@ -97,4 +101,21 @@ public class GenerateKeyTest extends AbstractSOPTest {
JUtils.assertArrayStartsWith(key, TestData.BEGIN_PGP_PRIVATE_KEY_BLOCK); JUtils.assertArrayStartsWith(key, TestData.BEGIN_PGP_PRIVATE_KEY_BLOCK);
JUtils.assertArrayEndsWithIgnoreNewlines(key, TestData.END_PGP_PRIVATE_KEY_BLOCK); JUtils.assertArrayEndsWithIgnoreNewlines(key, TestData.END_PGP_PRIVATE_KEY_BLOCK);
} }
@ParameterizedTest
@MethodSource("provideInstances")
public void generateSigningOnlyKey(SOP sop) throws IOException {
byte[] signingOnlyKey = sop.generateKey()
.signingOnly()
.userId("Alice <alice@pgpainless.org>")
.generate()
.getBytes();
byte[] signingOnlyCert = sop.extractCert()
.key(signingOnlyKey)
.getBytes();
assertThrows(SOPGPException.CertCannotEncrypt.class, () ->
sop.encrypt().withCert(signingOnlyCert)
.plaintext(TestData.PLAINTEXT.getBytes(StandardCharsets.UTF_8)));
}
} }