fixes

mafredri · mafredri · commit 15587dc1c5c0 · 2023-11-22T17:09:39.000+02:00
diff --git a/agent/agentssh/agentssh.go b/agent/agentssh/agentssh.go
@@ -491,10 +491,10 @@ func (s *Server) handleSignal(logger slog.Logger, ssig ssh.Signal, signaler inte
 	ctx := context.Background()
 	sig := osSignalFrom(ssig)
 	logger = logger.With(slog.F("ssh_signal", ssig), slog.F("signal", sig.String()))
-	logger.Info(ctx, "received signal")
+	logger.Info(ctx, "received signal from client")
 	err := signaler.Signal(sig)
 	if err != nil {
-		logger.Warn(ctx, "signal failed", slog.Error(err))
+		logger.Warn(ctx, "signaling the process failed", slog.Error(err))
 		s.metrics.sessionErrors.WithLabelValues(magicTypeLabel, "yes", "signal").Add(1)
 	}
 }
diff --git a/agent/agentssh/agentssh_test.go b/agent/agentssh/agentssh_test.go
@@ -142,7 +142,7 @@ func TestNewServer_CloseActiveConnections(t *testing.T) {
 		defer wg.Done()
 		c := sshClient(t, ln.Addr().String())
 		sess, err := c.NewSession()
-		require.NoError(t, err)
+		assert.NoError(t, err)
 		sess.Stdin = pty.Input()
 		sess.Stdout = pty.Output()
 		sess.Stderr = pty.Output()
@@ -259,13 +259,18 @@ func TestNewServer_Signal(t *testing.T) {
 
 		c := sshClient(t, ln.Addr().String())
 
+		pty := ptytest.New(t)
+
 		sess, err := c.NewSession()
 		require.NoError(t, err)
 		r, err := sess.StdoutPipe()
 		require.NoError(t, err)
 
 		// Note, we request pty but don't use ptytest here because we can't
 		// easily test for no text before EOF.
+		sess.Stdin = pty.Input()
+		sess.Stderr = pty.Output()
+
 		err = sess.RequestPty("xterm", 80, 80, nil)
 		require.NoError(t, err)
 
diff --git a/agent/agentssh/signal_windows.go b/agent/agentssh/signal_windows.go
@@ -8,8 +8,7 @@ import (
 
 func osSignalFrom(sig ssh.Signal) os.Signal {
 	switch sig {
-	case ssh.SIGINT:
-		return os.Interrupt
+	// Signals are not supported on Windows.
 	default:
 		return os.Kill
 	}

Original file line number	Diff line number	Diff line change
`@@ -491,10 +491,10 @@ func (s *Server) handleSignal(logger slog.Logger, ssig ssh.Signal, signaler inte`
`491`	`491`	`ctx := context.Background()`
`492`	`492`	`sig := osSignalFrom(ssig)`
`493`	`493`	`logger = logger.With(slog.F("ssh_signal", ssig), slog.F("signal", sig.String()))`
`494`		`- logger.Info(ctx, "received signal")`
	`494`	`+ logger.Info(ctx, "received signal from client")`
`495`	`495`	`err := signaler.Signal(sig)`
`496`	`496`	`if err != nil {`
`497`		`- logger.Warn(ctx, "signal failed", slog.Error(err))`
	`497`	`+ logger.Warn(ctx, "signaling the process failed", slog.Error(err))`
`498`	`498`	`s.metrics.sessionErrors.WithLabelValues(magicTypeLabel, "yes", "signal").Add(1)`
`499`	`499`	`}`
`500`	`500`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,7 @@ import (`
`8`	`8`
`9`	`9`	`func osSignalFrom(sig ssh.Signal) os.Signal {`
`10`	`10`	`switch sig {`
`11`		`- case ssh.SIGINT:`
`12`		`- return os.Interrupt`
	`11`	`+ // Signals are not supported on Windows.`
`13`	`12`	`default:`
`14`	`13`	`return os.Kill`
`15`	`14`	`}`