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

fix trustHost

Browse source
This commit is contained in:
ansgarz 2022-01-06 20:34:10 +01:00
parent adc12d85ba
commit 186d8375e0
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/kotlin/org/domaindrivenarchitecture/provs/ubuntu/git/base/Git.kt
View file

@ -69,7 +69,7 @@ private fun Prov.trustHost(host: String, fingerprintsOfKeysToBeAdded: Set<String
} }
if (fingerprintsOfKeysToBeAdded == null) { if (fingerprintsOfKeysToBeAdded == null) {
// auto add keys // auto add keys
cmd("ssh-keyscan -H $host >> $knownHostsFile") cmd("ssh-keyscan $host >> $knownHostsFile")
} else { } else {
// logic based on https://serverfault.com/questions/447028/non-interactive-git-clone-ssh-fingerprint-prompt // logic based on https://serverfault.com/questions/447028/non-interactive-git-clone-ssh-fingerprint-prompt
val actualKeys = findSshKeys(host) val actualKeys = findSshKeys(host)
@ -93,7 +93,7 @@ private fun Prov.trustHost(host: String, fingerprintsOfKeysToBeAdded: Set<String
err = "Fingerprint ($fingerprintToBeAdded) could not be found in actual fingerprints: $actualFingerprints" err = "Fingerprint ($fingerprintToBeAdded) could not be found in actual fingerprints: $actualFingerprints"
) )
} }
cmd(echoCommandForText(actualKeys.get(indexOfKeyFound)) + " >> $knownHostsFile") cmd(echoCommandForText(actualKeys.get(indexOfKeyFound) + "\n") + " >> $knownHostsFile")
} }
ProvResult(true) ProvResult(true)
} }