Merge pull request #571 from fluxcd/hostkey-callback

git/gogit: set `HostKeyCallback` for parent `PublicKeys` object

git/gogit/transport.go

@@ -114,14 +114,15 @@ func (a *CustomPublicKeys) String() string {
 }
 
 func (a *CustomPublicKeys) ClientConfig() (*gossh.ClientConfig, error) {
+	if a.callback != nil {
+		a.pk.HostKeyCallback = a.callback
+	}
+
 	config, err := a.pk.ClientConfig()
 	if err != nil {
 		return nil, err
 	}
 
-	if a.callback != nil {
-		config.HostKeyCallback = a.callback
-	}
 	if len(git.KexAlgos) > 0 {
 		config.Config.KeyExchanges = git.KexAlgos
 	}
@@ -149,7 +150,6 @@ func (a *DefaultAuth) ClientConfig() (*gossh.ClientConfig, error) {
 	if err != nil {
 		return nil, err
 	}
-	config.HostKeyCallback, err = ssh.NewKnownHostsCallback()
 	if err != nil {
 		return nil, err
 	}

git/gogit/transport_test.go

@@ -25,7 +25,9 @@ import (
 
 	"github.com/go-git/go-git/v5/plumbing/transport"
 	"github.com/go-git/go-git/v5/plumbing/transport/http"
+	"github.com/go-git/go-git/v5/plumbing/transport/ssh"
 	. "github.com/onsi/gomega"
+	gossh "golang.org/x/crypto/ssh"
 	"golang.org/x/crypto/ssh/agent"
 
 	"github.com/fluxcd/pkg/git"
@@ -284,6 +286,29 @@ func Test_transportAuth(t *testing.T) {
 	}
 }
 
+func TestCustomPublicKeys_ClientConfig(t *testing.T) {
+	g := NewWithT(t)
+	pk, err := ssh.NewPublicKeys("user", []byte(privateKeyFixture), "password")
+	g.Expect(err).ToNot(HaveOccurred())
+
+	var count int
+	customCallback := func(hostname string, remote net.Addr, key gossh.PublicKey) error {
+		count += 1
+		return nil
+	}
+	customPK := CustomPublicKeys{
+		pk:       pk,
+		callback: customCallback,
+	}
+	cfg, err := customPK.ClientConfig()
+	g.Expect(err).ToNot(HaveOccurred())
+	g.Expect(cfg.HostKeyCallback).ToNot(BeNil())
+
+	err = cfg.HostKeyCallback("", nil, nil)
+	g.Expect(err).ToNot(HaveOccurred())
+	g.Expect(count).To(Equal(1))
+}
+
 func Test_defaultKnownHosts(t *testing.T) {
 	g := NewWithT(t)
 	tmp, err := os.MkdirTemp("", "ssh_agent")