PGPainless/sop-java
1
0
Fork 0
mirror of https://codeberg.org/PGPainless/sop-java.git synced 2024-11-22 07:12:04 +01:00
Code Issues Projects Releases Packages Wiki Activity

revoke-key command: Allow for multiple '--with-key-password' options

Browse source
This commit is contained in:
Paul Schaub 2024-09-19 20:13:12 +02:00
parent ffb8d297d3
commit 19818f6e9d
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sop-java-picocli/src/main/kotlin/sop/cli/picocli/commands/RevokeKeyCmd.kt
View file

@ -19,8 +19,8 @@ class RevokeKeyCmd : AbstractSopCmd() {
@Option(names = ["--no-armor"], negatable = true) var armor = true @Option(names = ["--no-armor"], negatable = true) var armor = true
@Option(names = ["--with-key-password"], paramLabel = "PASSWORD") @Option(names = ["--with-key-password"], paramLabel = "PASSWORD", arity = "0..*")
var withKeyPassword: String? = null var withKeyPassword: List<String> = listOf()
override fun run() { override fun run() {
val revokeKey = throwIfUnsupportedSubcommand(SopCLI.getSop().revokeKey(), "revoke-key") val revokeKey = throwIfUnsupportedSubcommand(SopCLI.getSop().revokeKey(), "revoke-key")
@ -29,9 +29,9 @@ class RevokeKeyCmd : AbstractSopCmd() {
revokeKey.noArmor() revokeKey.noArmor()
} }
withKeyPassword?.let { for (passwordIn in withKeyPassword) {
try { try {
val password = stringFromInputStream(getInput(it)) val password = stringFromInputStream(getInput(passwordIn))
revokeKey.withKeyPassword(password) revokeKey.withKeyPassword(password)
} catch (e: SOPGPException.UnsupportedOption) { } catch (e: SOPGPException.UnsupportedOption) {
val errorMsg = val errorMsg =