meissa/provs
7
1
Fork 0
Code Issues Pull requests Projects Releases 12 Packages Wiki Activity

trim newline suffix of gopass secret

Browse source
This commit is contained in:
az 2022-11-08 18:49:56 +01:00
parent fe83442708
commit 0d11749db1
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/kotlin/org/domaindrivenarchitecture/provs/framework/core/Prov.kt
View file

@ -195,11 +195,12 @@ open class Prov protected constructor(
* Retrieve a secret by executing the given command. * Retrieve a secret by executing the given command.
* Returns the result of the command as secret. * Returns the result of the command as secret.
*/ */
fun getSecret(command: String): Secret? { fun getSecret(command: String, removeNewlineSuffix: Boolean = false): Secret? {
val result = cmdNoLog(command) val result = cmdNoLog(command)
return if (result.success && result.out != null) { return if (result.success && result.out != null) {
addResultToEval(ProvResult(true, getCallingMethodName())) addResultToEval(ProvResult(true, getCallingMethodName()))
Secret(result.out) val plainSecret = if (removeNewlineSuffix && result.out.takeLast(1) == "\n") result.out.dropLast(1) else result.out
Secret(plainSecret)
} else { } else {
addResultToEval(ProvResult(false, getCallingMethodName(), err = result.err, exception = result.exception)) addResultToEval(ProvResult(false, getCallingMethodName(), err = result.err, exception = result.exception))
null null

2
src/main/kotlin/org/domaindrivenarchitecture/provs/framework/ubuntu/secret/secretSources/GopassSecretSource.kt
View file

@ -14,6 +14,6 @@ class GopassSecretSource(path: String) : SecretSource(path) {
} }
override fun secretNullable(): Secret? { override fun secretNullable(): Secret? {
val p = Prov.newInstance(name = "GopassSecretSource for $input") val p = Prov.newInstance(name = "GopassSecretSource for $input")
return p.getSecret("gopass show -f " + input) return p.getSecret("gopass show -f $input", true)
} }
} }