fix: handle channel accept failures in similar fashion

gravitational · Jul 27, 2022 · 17b9193 · 17b9193
1 parent a35a1fb
commit 17b9193
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 61 deletions.
diff --git a/lib/srv/forward/sshserver.go b/lib/srv/forward/sshserver.go
@@ -732,8 +732,9 @@ func (s *Server) handleChannel(ctx context.Context, nch ssh.NewChannel) {
 	case tracessh.TracingChannel:
 		ch, _, err := nch.Accept()
 		if err != nil {
-			if err := nch.Reject(ssh.ConnectionFailed, err.Error()); err != nil {
-				s.log.Warnf("Unable to reject %q channel: %v", nch.ChannelType(), err)
+			s.log.Warnf("Unable to accept channel: %v", err)
+			if err := nch.Reject(ssh.ConnectionFailed, fmt.Sprintf("unable to accept channel: %v", err)); err != nil {
+				s.log.Warnf("Failed to reject channel: %v", err)
 			}
 			return
 		}