Skip to content

refactor: PTY & SSH #7100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 22 commits into from
Apr 24, 2023
Merged

refactor: PTY & SSH #7100

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
0075d7d
Add ssh tests for longoutput, orphan
spikecurtis Apr 11, 2023
a491d4f
PTY/SSH tests & improvements
spikecurtis Apr 12, 2023
2cf357a
Fix some tests
spikecurtis Apr 12, 2023
28c0646
Fix linting
spikecurtis Apr 12, 2023
872e357
fmt
spikecurtis Apr 12, 2023
3f21e30
Fix windows test
spikecurtis Apr 13, 2023
e83ff6e
Windows copy test
spikecurtis Apr 14, 2023
b610579
WIP Windows pty handling
spikecurtis Apr 14, 2023
90bfe94
Fix truncation tests
spikecurtis Apr 18, 2023
d6e131c
Appease linter/fmt
spikecurtis Apr 18, 2023
2c9c6ef
Fix typo
spikecurtis Apr 18, 2023
e39e885
Rework truncation test to not assume OS buffers
spikecurtis Apr 18, 2023
8ec3d1f
Disable orphan test on Windows --- uses sh
spikecurtis Apr 18, 2023
df424e6
agent_test running SSH in pty use ptytest.Start
spikecurtis Apr 19, 2023
50e3fec
More detail about closing pseudoconsole on windows
spikecurtis Apr 19, 2023
c09083e
Code review fixes
spikecurtis Apr 20, 2023
439107d
Rearrange ptytest method order
spikecurtis Apr 20, 2023
c6a3229
Protect pty.Resize on windows from races
spikecurtis Apr 21, 2023
aa94546
Fix windows bugs
spikecurtis Apr 21, 2023
0f07cb9
PTY doesn't extend PTYCmd
spikecurtis Apr 24, 2023
eaabb3a
merge branch 'main' of https://github.com/coder/coder into spike/pty-ssh
spikecurtis Apr 24, 2023
50060d8
Fix windows types
spikecurtis Apr 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix windows types 
Signed-off-by: Spike Curtis <spike@coder.com>
  • Loading branch information
@spikecurtis
spikecurtis committed Apr 24, 2023
commit 50060d83556eb4e5207986aa72fe2b78bb695e64
2 changes: 1 addition & 1 deletion pty/pty_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ var (
)

// See: https://docs.microsoft.com/en-us/windows/console/creating-a-pseudoconsole-session
func newPty(opt ...Option) (PTY, error) {
func newPty(opt ...Option) (*ptyWindows, error) {
var opts ptyOptions
for _, o := range opt {
o(&opts)
Expand Down
9 changes: 4 additions & 5 deletions pty/start_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (

// Allocates a PTY and starts the specified command attached to it.
// See: https://docs.microsoft.com/en-us/windows/console/creating-a-pseudoconsole-session#creating-the-hosted-process
func startPty(cmd *exec.Cmd, opt ...StartOption) (_ PTY, _ Process, retErr error) {
func startPty(cmd *exec.Cmd, opt ...StartOption) (_ PTYCmd, _ Process, retErr error) {
var opts startOptions
for _, o := range opt {
o(&opts)
Expand Down Expand Up @@ -46,18 +46,17 @@ func startPty(cmd *exec.Cmd, opt ...StartOption) (_ PTY, _ Process, retErr error
return nil, nil, err
}

pty, err := newPty(opts.ptyOpts...)
winPty, err := newPty(opts.ptyOpts...)
if err != nil {
return nil, nil, err
}
defer func() {
if retErr != nil {
// we hit some error finishing setup; close pty, so
// we don't leak the kernel resources associated with it
_ = pty.Close()
_ = winPty.Close()
}
}()
winPty := pty.(*ptyWindows)
if winPty.opts.sshReq != nil {
cmd.Env = append(cmd.Env, fmt.Sprintf("SSH_TTY=%s", winPty.Name()))
}
Expand Down Expand Up @@ -130,7 +129,7 @@ func startPty(cmd *exec.Cmd, opt ...StartOption) (_ PTY, _ Process, retErr error
return nil, nil, errI
}
go wp.waitInternal()
return pty, wp, nil
return winPty, wp, nil
}

// Taken from: https://github.com/microsoft/hcsshim/blob/7fbdca16f91de8792371ba22b7305bf4ca84170a/internal/exec/exec.go#L476
Expand Down