From 8414c591e5e673d4de1d2cb1f0b32d2e63dfc91d Mon Sep 17 00:00:00 2001 From: Maisem Ali Date: Thu, 23 Mar 2023 12:32:44 -0700 Subject: [PATCH] ssh/tailssh: enable recording of non-pty sessions Updates tailscale/corp#9967 Signed-off-by: Maisem Ali (cherry picked from commit 8a246487c27a4e20c4b59663c0fc4c6dd7da1835) --- ssh/tailssh/tailssh.go | 5 +---- ssh/tailssh/tailssh_test.go | 3 ++- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/ssh/tailssh/tailssh.go b/ssh/tailssh/tailssh.go index 9ec2066ea..31881cdb6 100644 --- a/ssh/tailssh/tailssh.go +++ b/ssh/tailssh/tailssh.go @@ -1130,10 +1130,7 @@ func (ss *sshSession) recorders() []netip.AddrPort { } func (ss *sshSession) shouldRecord() bool { - // for now only record pty sessions - // TODO(bradfitz,maisem): support recording non-pty stuff too. - _, _, isPtyReq := ss.Pty() - return isPtyReq && len(ss.recorders()) > 0 + return len(ss.recorders()) > 0 } type sshConnInfo struct { diff --git a/ssh/tailssh/tailssh_test.go b/ssh/tailssh/tailssh_test.go index bdd237376..e355e2750 100644 --- a/ssh/tailssh/tailssh_test.go +++ b/ssh/tailssh/tailssh_test.go @@ -539,7 +539,8 @@ func TestSSH(t *testing.T) { node: &tailcfg.Node{}, uprof: tailcfg.UserProfile{}, } - sc.finalAction = &tailcfg.SSHAction{Accept: true} + sc.action0 = &tailcfg.SSHAction{Accept: true} + sc.finalAction = sc.action0 sc.Handler = func(s ssh.Session) { sc.newSSHSession(s).run()