mirror of
https://codeberg.org/PGPainless/sop-java.git
synced 2024-11-22 23:22:05 +01:00
Kotlin conversion: SignCmd
This commit is contained in:
parent
8246359a85
commit
256d1c5960
GPG key ID:
62BEE9264BF17311
2 changed files with 90 additions and 108 deletions
|
|
@ -1,108 +0,0 @@
|
||||||
// SPDX-FileCopyrightText: 2021 Paul Schaub <vanitasvitae@fsfe.org>
|
|
||||||
//
|
|
||||||
// SPDX-License-Identifier: Apache-2.0
|
|
||||||
|
|
||||||
package sop.cli.picocli.commands;
|
|
||||||
|
|
||||||
import picocli.CommandLine;
|
|
||||||
import sop.MicAlg;
|
|
||||||
import sop.ReadyWithResult;
|
|
||||||
import sop.SigningResult;
|
|
||||||
import sop.cli.picocli.SopCLI;
|
|
||||||
import sop.enums.SignAs;
|
|
||||||
import sop.exception.SOPGPException;
|
|
||||||
import sop.operation.DetachedSign;
|
|
||||||
|
|
||||||
import java.io.IOException;
|
|
||||||
import java.io.InputStream;
|
|
||||||
import java.io.OutputStream;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
|
|
||||||
@CommandLine.Command(name = "sign",
|
|
||||||
resourceBundle = "msg_detached-sign",
|
|
||||||
exitCodeOnInvalidInput = SOPGPException.UnsupportedOption.EXIT_CODE)
|
|
||||||
public class SignCmd extends AbstractSopCmd {
|
|
||||||
|
|
||||||
@CommandLine.Option(names = "--no-armor",
|
|
||||||
negatable = true)
|
|
||||||
boolean armor = true;
|
|
||||||
|
|
||||||
@CommandLine.Option(names = "--as",
|
|
||||||
paramLabel = "{binary|text}")
|
|
||||||
SignAs type;
|
|
||||||
|
|
||||||
@CommandLine.Parameters(paramLabel = "KEYS")
|
|
||||||
List<String> secretKeyFile = new ArrayList<>();
|
|
||||||
|
|
||||||
@CommandLine.Option(names = "--with-key-password",
|
|
||||||
paramLabel = "PASSWORD")
|
|
||||||
List<String> withKeyPassword = new ArrayList<>();
|
|
||||||
|
|
||||||
@CommandLine.Option(names = "--micalg-out",
|
|
||||||
paramLabel = "MICALG")
|
|
||||||
String micAlgOut;
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void run() {
|
|
||||||
DetachedSign detachedSign = throwIfUnsupportedSubcommand(
|
|
||||||
SopCLI.getSop().detachedSign(), "sign");
|
|
||||||
|
|
||||||
throwIfOutputExists(micAlgOut);
|
|
||||||
throwIfEmptyParameters(secretKeyFile, "KEYS");
|
|
||||||
|
|
||||||
if (type != null) {
|
|
||||||
try {
|
|
||||||
detachedSign.mode(type);
|
|
||||||
} catch (SOPGPException.UnsupportedOption unsupportedOption) {
|
|
||||||
String errorMsg = getMsg("sop.error.feature_support.option_not_supported", "--as");
|
|
||||||
throw new SOPGPException.UnsupportedOption(errorMsg, unsupportedOption);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
for (String passwordFile : withKeyPassword) {
|
|
||||||
try {
|
|
||||||
String password = stringFromInputStream(getInput(passwordFile));
|
|
||||||
detachedSign.withKeyPassword(password);
|
|
||||||
} catch (SOPGPException.UnsupportedOption unsupportedOption) {
|
|
||||||
String errorMsg = getMsg("sop.error.feature_support.option_not_supported", "--with-key-password");
|
|
||||||
throw new SOPGPException.UnsupportedOption(errorMsg, unsupportedOption);
|
|
||||||
} catch (IOException e) {
|
|
||||||
throw new RuntimeException(e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
for (String keyInput : secretKeyFile) {
|
|
||||||
try (InputStream keyIn = getInput(keyInput)) {
|
|
||||||
detachedSign.key(keyIn);
|
|
||||||
} catch (IOException e) {
|
|
||||||
throw new RuntimeException(e);
|
|
||||||
} catch (SOPGPException.KeyIsProtected keyIsProtected) {
|
|
||||||
String errorMsg = getMsg("sop.error.runtime.cannot_unlock_key", keyInput);
|
|
||||||
throw new SOPGPException.KeyIsProtected(errorMsg, keyIsProtected);
|
|
||||||
} catch (SOPGPException.BadData badData) {
|
|
||||||
String errorMsg = getMsg("sop.error.input.not_a_private_key", keyInput);
|
|
||||||
throw new SOPGPException.BadData(errorMsg, badData);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!armor) {
|
|
||||||
detachedSign.noArmor();
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
ReadyWithResult<SigningResult> ready = detachedSign.data(System.in);
|
|
||||||
SigningResult result = ready.writeTo(System.out);
|
|
||||||
|
|
||||||
MicAlg micAlg = result.getMicAlg();
|
|
||||||
if (micAlgOut != null) {
|
|
||||||
// Write micalg out
|
|
||||||
OutputStream outputStream = getOutput(micAlgOut);
|
|
||||||
micAlg.writeTo(outputStream);
|
|
||||||
outputStream.close();
|
|
||||||
}
|
|
||||||
} catch (IOException e) {
|
|
||||||
throw new RuntimeException(e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -0,0 +1,90 @@
|
||||||
|
// SPDX-FileCopyrightText: 2023 Paul Schaub <vanitasvitae@fsfe.org>
|
||||||
|
//
|
||||||
|
// SPDX-License-Identifier: Apache-2.0
|
||||||
|
|
||||||
|
package sop.cli.picocli.commands
|
||||||
|
|
||||||
|
import java.io.IOException
|
||||||
|
import picocli.CommandLine.*
|
||||||
|
import sop.cli.picocli.SopCLI
|
||||||
|
import sop.enums.SignAs
|
||||||
|
import sop.exception.SOPGPException
|
||||||
|
import sop.exception.SOPGPException.BadData
|
||||||
|
import sop.exception.SOPGPException.KeyIsProtected
|
||||||
|
|
||||||
|
@Command(
|
||||||
|
name = "sign",
|
||||||
|
resourceBundle = "msg_detached-sign",
|
||||||
|
exitCodeOnInvalidInput = SOPGPException.UnsupportedOption.EXIT_CODE)
|
||||||
|
class SignCmd : AbstractSopCmd() {
|
||||||
|
|
||||||
|
@Option(names = ["--no-armor"], negatable = true) var armor: Boolean = true
|
||||||
|
|
||||||
|
@Option(names = ["--as"], paramLabel = "{binary|text}") var type: SignAs? = null
|
||||||
|
|
||||||
|
@Parameters(paramLabel = "KEYS") var secretKeyFile: List<String> = listOf()
|
||||||
|
|
||||||
|
@Option(names = ["--with-key-password"], paramLabel = "PASSWORD")
|
||||||
|
var withKeyPassword: List<String> = listOf()
|
||||||
|
|
||||||
|
@Option(names = ["--micalg-out"], paramLabel = "MICALG") var micAlgOut: String? = null
|
||||||
|
|
||||||
|
override fun run() {
|
||||||
|
val detachedSign = throwIfUnsupportedSubcommand(SopCLI.getSop().detachedSign(), "sign")
|
||||||
|
|
||||||
|
throwIfOutputExists(micAlgOut)
|
||||||
|
throwIfEmptyParameters(secretKeyFile, "KEYS")
|
||||||
|
|
||||||
|
try {
|
||||||
|
type?.let { detachedSign.mode(it) }
|
||||||
|
} catch (unsupported: SOPGPException.UnsupportedOption) {
|
||||||
|
val errorMsg =
|
||||||
|
getMsg("sop.error.feature_support.option_not_supported", "--with-key-password")
|
||||||
|
throw SOPGPException.UnsupportedOption(errorMsg, unsupported)
|
||||||
|
} catch (ioe: IOException) {
|
||||||
|
throw RuntimeException(ioe)
|
||||||
|
}
|
||||||
|
|
||||||
|
withKeyPassword.forEach { passIn ->
|
||||||
|
try {
|
||||||
|
val password = stringFromInputStream(getInput(passIn))
|
||||||
|
detachedSign.withKeyPassword(password)
|
||||||
|
} catch (unsupported: SOPGPException.UnsupportedOption) {
|
||||||
|
val errorMsg =
|
||||||
|
getMsg("sop.error.feature_support.option_not_supported", "--with-key-password")
|
||||||
|
throw SOPGPException.UnsupportedOption(errorMsg, unsupported)
|
||||||
|
} catch (e: IOException) {
|
||||||
|
throw RuntimeException(e)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
secretKeyFile.forEach { keyIn ->
|
||||||
|
try {
|
||||||
|
getInput(keyIn).use { input -> detachedSign.key(input) }
|
||||||
|
} catch (ioe: IOException) {
|
||||||
|
throw RuntimeException(ioe)
|
||||||
|
} catch (keyIsProtected: KeyIsProtected) {
|
||||||
|
val errorMsg = getMsg("sop.error.runtime.cannot_unlock_key", keyIn)
|
||||||
|
throw KeyIsProtected(errorMsg, keyIsProtected)
|
||||||
|
} catch (badData: BadData) {
|
||||||
|
val errorMsg = getMsg("sop.error.input.not_a_private_key", keyIn)
|
||||||
|
throw BadData(errorMsg, badData)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!armor) {
|
||||||
|
detachedSign.noArmor()
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
val ready = detachedSign.data(System.`in`)
|
||||||
|
val result = ready.writeTo(System.out)
|
||||||
|
|
||||||
|
if (micAlgOut != null) {
|
||||||
|
getOutput(micAlgOut).use { result.micAlg.writeTo(it) }
|
||||||
|
}
|
||||||
|
} catch (e: IOException) {
|
||||||
|
throw java.lang.RuntimeException(e)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Reference in a new issue