@@ -320,7 +320,7 @@ func (a *agent) runStartupScript(ctx context.Context, script string) error {
320320 return nil
321321 }
322322
323- writer , err := os .OpenFile (filepath .Join (os .TempDir (), "coder-startup-script.log" ), os .O_CREATE | os .O_RDWR , 0600 )
323+ writer , err := os .OpenFile (filepath .Join (os .TempDir (), "coder-startup-script.log" ), os .O_CREATE | os .O_RDWR , 0o600 )
324324 if err != nil {
325325 return xerrors .Errorf ("open startup script log file: %w" , err )
326326 }
@@ -415,6 +415,8 @@ func (a *agent) init(ctx context.Context) {
415415 },
416416 SubsystemHandlers : map [string ]ssh.SubsystemHandler {
417417 "sftp" : func (session ssh.Session ) {
418+ session .DisablePTYEmulation ()
419+
418420 server , err := sftp .NewServer (session )
419421 if err != nil {
420422 a .logger .Debug (session .Context (), "initialize sftp server" , slog .Error (err ))
@@ -539,7 +541,8 @@ func (a *agent) createCommand(ctx context.Context, rawCommand string, env []stri
539541}
540542
541543func (a * agent ) handleSSHSession (session ssh.Session ) (retErr error ) {
542- cmd , err := a .createCommand (session .Context (), session .RawCommand (), session .Environ ())
544+ ctx := session .Context ()
545+ cmd , err := a .createCommand (ctx , session .RawCommand (), session .Environ ())
543546 if err != nil {
544547 return err
545548 }
@@ -556,32 +559,34 @@ func (a *agent) handleSSHSession(session ssh.Session) (retErr error) {
556559
557560 sshPty , windowSize , isPty := session .Pty ()
558561 if isPty {
562+ // Disable minimal PTY emulation set by gliderlabs/ssh (NL-to-CRNL).
563+ // See https://github.com/coder/coder/issues/3371.
564+ session .DisablePTYEmulation ()
565+
559566 cmd .Env = append (cmd .Env , fmt .Sprintf ("TERM=%s" , sshPty .Term ))
560567
561568 // The pty package sets `SSH_TTY` on supported platforms.
562- ptty , process , err := pty .Start (cmd )
569+ ptty , process , err := pty .Start (cmd , pty .WithPTYOption (
570+ pty .WithSSHRequest (sshPty ),
571+ pty .WithLogger (slog .Stdlib (ctx , a .logger , slog .LevelInfo )),
572+ ))
563573 if err != nil {
564574 return xerrors .Errorf ("start command: %w" , err )
565575 }
566576 defer func () {
567577 closeErr := ptty .Close ()
568578 if closeErr != nil {
569- a .logger .Warn (context .Background (), "failed to close tty" ,
570- slog .Error (closeErr ))
579+ a .logger .Warn (ctx , "failed to close tty" , slog .Error (closeErr ))
571580 if retErr == nil {
572581 retErr = closeErr
573582 }
574583 }
575584 }()
576- err = ptty .Resize (uint16 (sshPty .Window .Height ), uint16 (sshPty .Window .Width ))
577- if err != nil {
578- return xerrors .Errorf ("resize ptty: %w" , err )
579- }
580585 go func () {
581586 for win := range windowSize {
582587 resizeErr := ptty .Resize (uint16 (win .Height ), uint16 (win .Width ))
583588 if resizeErr != nil {
584- a .logger .Warn (context . Background () , "failed to resize tty" , slog .Error (resizeErr ))
589+ a .logger .Warn (ctx , "failed to resize tty" , slog .Error (resizeErr ))
585590 }
586591 }
587592 }()
@@ -596,8 +601,7 @@ func (a *agent) handleSSHSession(session ssh.Session) (retErr error) {
596601 // ExitErrors just mean the command we run returned a non-zero exit code, which is normal
597602 // and not something to be concerned about. But, if it's something else, we should log it.
598603 if err != nil && ! xerrors .As (err , & exitErr ) {
599- a .logger .Warn (context .Background (), "wait error" ,
600- slog .Error (err ))
604+ a .logger .Warn (ctx , "wait error" , slog .Error (err ))
601605 }
602606 return err
603607 }
0 commit comments