chore(deps): upgrade ovm-ssh-agent to 3.0.0

go.mod

@@ -17,7 +17,7 @@ require (
 	github.com/go-playground/validator/v10 v10.25.0
 	github.com/gorilla/mux v1.8.1
 	github.com/json-iterator/go v1.1.12
-	github.com/oomol-lab/ovm-ssh-agent v1.1.1-0.20250319032115-b469155aff8d
+	github.com/oomol-lab/ovm-ssh-agent/v3 v3.0.0
 	github.com/oomol-lab/ssh-forward v0.0.0-20250319062521-6d0eb022abac
 	github.com/prashantgupta24/mac-sleep-notifier v1.0.1
 	github.com/shirou/gopsutil/v3 v3.24.5

go.sum

@@ -64,8 +64,8 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
-github.com/oomol-lab/ovm-ssh-agent v1.1.1-0.20250319032115-b469155aff8d h1:cjVNvVjTw/G3u1mJmZs7Nbo8v6rc6RkElLYdiaHGbes=
-github.com/oomol-lab/ovm-ssh-agent v1.1.1-0.20250319032115-b469155aff8d/go.mod h1:UiWnuQCSmt3Zta1LctVpp+ETEaJv08OA+Bkp45uyM/M=
+github.com/oomol-lab/ovm-ssh-agent/v3 v3.0.0 h1:QRRornLkmEhMXjKwspfBsSh23VnqpRc+MycqprK5JWU=
+github.com/oomol-lab/ovm-ssh-agent/v3 v3.0.0/go.mod h1:AiTDS3XP3+8HY8Y0e9bhE6xXeirtTKvZxdtNcI6ra7g=
 github.com/oomol-lab/ssh-forward v0.0.0-20250319062521-6d0eb022abac h1:h+hNzgc4DtmjzMC2Fw5I766RsMb9GjLLsGZfmg5rp/g=
 github.com/oomol-lab/ssh-forward v0.0.0-20250319062521-6d0eb022abac/go.mod h1:/X60uEwaCA1Bt0AJ+6VShkjErRBbkDbzmqwxR8jPpMI=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=

pkg/machine/shim/ssh_auth.go

@@ -4,21 +4,21 @@
 package shim
 
 import (
-	"bauklotze/pkg/machine/channel"
-	"bauklotze/pkg/machine/define"
-	"bauklotze/pkg/machine/vmconfig"
 	"context"
 	"fmt"
-	"net"
 	"os"
 	"path/filepath"
 
+	"bauklotze/pkg/machine/channel"
+	"bauklotze/pkg/machine/define"
+	"bauklotze/pkg/machine/vmconfig"
+
 	"golang.org/x/sync/errgroup"
 
-	"github.com/oomol-lab/ovm-ssh-agent/pkg/sshagent"
-	"github.com/oomol-lab/ovm-ssh-agent/pkg/system"
+	"github.com/oomol-lab/ovm-ssh-agent/v3/pkg/sshagent"
+	"github.com/oomol-lab/ovm-ssh-agent/v3/pkg/system"
 
-	"github.com/oomol-lab/ovm-ssh-agent/pkg/identity"
+	"github.com/oomol-lab/ovm-ssh-agent/v3/pkg/identity"
 	forwarder "github.com/oomol-lab/ssh-forward"
 
 	"github.com/sirupsen/logrus"
@@ -47,29 +47,20 @@ func startSSHAuthServiceAndForward(ctx context.Context, mc *vmconfig.MachineConf
 		return fmt.Errorf("failed to remove local ssh agent socket: %w", err)
 	}
 
-	listener, err := net.Listen("unix", localSocketFile)
-	if err != nil {
-		return fmt.Errorf("failed to listen unix socket: %w", err)
-	}
-	defer listener.Close()
-
 	upstreamSocket := system.GetSSHAgent()
 	if upstreamSocket == "" {
 		return fmt.Errorf("upstream SSH agent socket empty")
 	}
 	logrus.Infof("upstream ssh agent listened in: %q", upstreamSocket)
 
-	ooSSHAgent, err := sshagent.NewSSHAgent(ctx, upstreamSocket)
-	if err != nil {
-		return fmt.Errorf("failed to create oo ssh agent: %w", err)
-	}
+	ooSSHAgent := sshagent.NewSSHAgent(ctx, upstreamSocket, localSocketFile)
 	defer ooSSHAgent.Close()
 
 	// find local private keys ~/.ssh
 	ooSSHAgent.LoadLocalKeys(identity.FindPrivateKeys()...)
 
 	g.Go(func() error {
-		return ooSSHAgent.Serve(listener)
+		return ooSSHAgent.Serve()
 	})
 
 	remoteSocketFile := "/opt/ssh_auth/oo-ssh-agent.sock"
@@ -106,5 +97,9 @@ func startSSHAuthServiceAndForward(ctx context.Context, mc *vmconfig.MachineConf
 		return socketForwarder.Start(ctx)
 	})
 
-	return g.Wait() //nolint:wrapcheck
+	if err := g.Wait(); err != nil {
+		return fmt.Errorf("failed to start ssh auth service: %w", err)
+	}
+
+	return nil
 }