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

refactor gopass, change gopass config to latest format, omit configureGopass if config already in place

Browse source
This commit is contained in:
ansgarz 2022-02-21 22:58:31 +01:00
parent 94bb87ce0a
commit 2a30cad76a
2 changed files with 36 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
src/main/kotlin/org/domaindrivenarchitecture/provs/desktop/infrastructure/Gopass.kt
View file

@ -2,10 +2,7 @@ package org.domaindrivenarchitecture.provs.desktop.infrastructure
import org.domaindrivenarchitecture.provs.framework.core.Prov import org.domaindrivenarchitecture.provs.framework.core.Prov
import org.domaindrivenarchitecture.provs.framework.core.ProvResult import org.domaindrivenarchitecture.provs.framework.core.ProvResult
import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createDir import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.*
import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createDirs
import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.createFile
import org.domaindrivenarchitecture.provs.framework.ubuntu.filesystem.base.userHome
import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.aptInstall
import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.isPackageInstalled import org.domaindrivenarchitecture.provs.framework.ubuntu.install.base.isPackageInstalled
import org.domaindrivenarchitecture.provs.framework.ubuntu.web.base.downloadFromURL import org.domaindrivenarchitecture.provs.framework.ubuntu.web.base.downloadFromURL
@ -44,16 +41,22 @@ fun Prov.installGopass(
} }
fun Prov.configureGopass(gopassRootFolder: String? = null) = def { fun Prov.configureGopass(gopassRootFolder: String? = null) = task {
if ((gopassRootFolder != null) && (gopassRootFolder.trim().length > 0) && ("~" == gopassRootFolder.trim().substring(0, 1))) { val configFile = ".config/gopass/config.yml"
return@def ProvResult(false, err = "Gopass cannot be initialized with folders starting with ~")
}
val defaultRootFolder = userHome() + ".password-store" val defaultRootFolder = userHome() + ".password-store"
val rootFolder = gopassRootFolder ?: defaultRootFolder val rootFolder = gopassRootFolder ?: defaultRootFolder
if (fileExists(configFile)) {
return@task ProvResult(true, out = "Gopass already configured in file $configFile")
}
if ((gopassRootFolder != null) && (!gopassRootFolder.startsWith("/"))) {
return@task ProvResult(false, err = "Gopass cannot be initialized with a relative path or path starting with ~")
}
// use default // use default
createDir(rootFolder) createDir(rootFolder)
createDirs(".config/gopass") createDirs(".config/gopass")
createFile("~/.config/gopass/config.yml", gopassConfig(rootFolder)) createFile(configFile, gopassConfig(rootFolder))
// auto-completion // auto-completion
configureBashForUser() configureBashForUser()
@ -61,35 +64,31 @@ fun Prov.configureGopass(gopassRootFolder: String? = null) = def {
} }
fun Prov.gopassMountStore(storeName: String, path: String, indexOfRecepientKey: Int = 0) = def { fun Prov.gopassMountStore(storeName: String, path: String) = def {
cmd("printf \"$indexOfRecepientKey\\n\" | gopass mounts add $storeName $path") cmd("gopass mounts add $storeName $path")
}
@Suppress("unused")
fun Prov.gopassInitStore(storeName: String, indexOfRecepientKey: Int = 0) = def {
cmd("printf \"$indexOfRecepientKey\\n\" | gopass init --store=$storeName")
} }
internal fun gopassConfig(gopassRoot: String): String { internal fun gopassConfig(gopassRoot: String): String {
return """ return """
root: autoclip: true
askformore: false autoimport: true
autoclip: true cliptimeout: 45
autoprint: false exportkeys: false
autoimport: true nocolor: false
autosync: false nopager: false
check_recipient_hash: false notifications: true
cliptimeout: 45 parsing: true
concurrency: 1 path: $gopassRoot
editrecipients: false safecontent: false
exportkeys: true mounts: {}
nocolor: false """.trimIndent() + "\n"
noconfirm: true
nopager: false
notifications: true
path: gpgcli-gitcli-fs+file://$gopassRoot
recipient_hash:
.gpg-id: 3078303637343130344341383141343930350aa69f73cca23a9ac5c8b567dc185a756e97c982164fe25859e0d1dcc1475c80a615b2123af1f5f94c11e3e9402c3ac558f500199d95b6d3e301758586281dcd26
safecontent: false
usesymbols: false
mounts: {}
""".trim() + "\n"
} }

5
src/test/kotlin/org/domaindrivenarchitecture/provs/framework/extensions/workplace/base/GopassKtTest.kt
View file

@ -25,7 +25,10 @@ internal class GopassKtTest {
@Test @Test
fun test_configureGopass_fails_with_path_starting_with_tilde() { fun test_configureGopass_fails_with_path_starting_with_tilde() {
// when // when
val res = defaultTestContainer().configureGopass("~/somedir") val res = defaultTestContainer().task {
deleteFile(".config/gopass/config.yml")
configureGopass("~/somedir")
}
// then // then
assertFalse(res.success) assertFalse(res.success)