kubernetes
/
git-sync
mirror of https://github.com/kubernetes/git-sync.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #616 from thockin/user-provided-GIT_SSH_COMMAND 

Retain user-provided GIT_SSH_COMMAND
This commit is contained in:
Kubernetes Prow Robot 2022-08-29 04:42:36 -07:00 committed by GitHub
parent 791ae83d8d e047848966
commit d76d3e6088
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
cmd/git-sync/main.go
View File

@ -1417,23 +1417,28 @@ func (git *repoSync) StoreCredentials(ctx context.Context, username, password st
func (git *repoSync) SetupGitSSH(setupKnownHosts bool, pathToSSHSecret, pathToSSHKnownHosts string) error { func (git *repoSync) SetupGitSSH(setupKnownHosts bool, pathToSSHSecret, pathToSSHKnownHosts string) error {
git.log.V(1).Info("setting up git SSH credentials") git.log.V(1).Info("setting up git SSH credentials")
_, err := os.Stat(pathToSSHSecret) // If the user sets GIT_SSH_COMMAND we try to respect it.
if err != nil { sshCmd := os.Getenv("GIT_SSH_COMMAND")
return fmt.Errorf("can't access SSH key: %w", err) if sshCmd == "" {
sshCmd = "ssh"
} }
if _, err := os.Stat(pathToSSHSecret); err != nil {
return fmt.Errorf("can't access SSH key file %s: %w", pathToSSHSecret, err)
}
sshCmd += fmt.Sprintf(" -i %s", pathToSSHSecret)
if setupKnownHosts { if setupKnownHosts {
_, err = os.Stat(pathToSSHKnownHosts) if _, err := os.Stat(pathToSSHKnownHosts); err != nil {
if err != nil { return fmt.Errorf("can't access SSH known_hosts file %s: %w", pathToSSHKnownHosts, err)
return fmt.Errorf("can't access SSH known_hosts: %w", err)
} }
err = os.Setenv("GIT_SSH_COMMAND", fmt.Sprintf("ssh -o UserKnownHostsFile=%s -i %s", pathToSSHKnownHosts, pathToSSHSecret)) sshCmd += fmt.Sprintf(" -o StrictHostKeyChecking=yes -o UserKnownHostsFile=%s", pathToSSHKnownHosts)
} else { } else {
err = os.Setenv("GIT_SSH_COMMAND", fmt.Sprintf("ssh -o StrictHostKeyChecking=no -i %s", pathToSSHSecret)) sshCmd += fmt.Sprintf(" -o StrictHostKeyChecking=no")
} }
// set env variable GIT_SSH_COMMAND to force git use customized ssh command git.log.V(9).Info("setting GIT_SSH_COMMAND", "value", sshCmd)
if err != nil { if err := os.Setenv("GIT_SSH_COMMAND", sshCmd); err != nil {
return fmt.Errorf("can't set $GIT_SSH_COMMAND: %w", err) return fmt.Errorf("can't set $GIT_SSH_COMMAND: %w", err)
} }