support SSH connection #1014
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| package system | ||
|
|
||
| import ( | ||
| "context" | ||
| "io" | ||
| "os" | ||
|
|
||
| "github.com/docker/cli/cli" | ||
| "github.com/docker/cli/cli/command" | ||
| "github.com/pkg/errors" | ||
| "github.com/sirupsen/logrus" | ||
| "github.com/spf13/cobra" | ||
| ) | ||
|
|
||
| // newDialStdioCommand creates a new cobra.Command for `docker system dial-stdio` | ||
| func newDialStdioCommand(dockerCli command.Cli) *cobra.Command { | ||
| cmd := &cobra.Command{ | ||
| Use: "dial-stdio", | ||
| Short: "Proxy the stdio stream to the daemon connection. Should not be invoked manually.", | ||
| Args: cli.NoArgs, | ||
| Hidden: true, | ||
| RunE: func(cmd *cobra.Command, args []string) error { | ||
| return runDialStdio(dockerCli) | ||
| }, | ||
| } | ||
| return cmd | ||
| } | ||
|
|
||
| func runDialStdio(dockerCli command.Cli) error { | ||
| ctx, cancel := context.WithCancel(context.Background()) | ||
| defer cancel() | ||
| dialer := dockerCli.Client().Dialer() | ||
| conn, err := dialer(ctx) | ||
| if err != nil { | ||
| return errors.Wrap(err, "failed to open the raw stream connection") | ||
| } | ||
| connHalfCloser, ok := conn.(halfCloser) | ||
| if !ok { | ||
| return errors.New("the raw stream connection does not implement halfCloser") | ||
|
There was a problem hiding this comment. Seems like this will be passed on to the user. Maybe we can explain what this error is better? There was a problem hiding this comment. Actually this type assertion should never fail and the error won't be printed There was a problem hiding this comment. Maybe we should make the error a little more clear in this case? There was a problem hiding this comment. How about just panic here and |
||
| } | ||
| stdin2conn := make(chan error) | ||
| conn2stdout := make(chan error) | ||
| go func() { | ||
| stdin2conn <- copier(connHalfCloser, &halfReadCloserWrapper{os.Stdin}, "stdin to stream") | ||
| }() | ||
| go func() { | ||
| conn2stdout <- copier(&halfWriteCloserWrapper{os.Stdout}, connHalfCloser, "stream to stdout") | ||
| }() | ||
| select { | ||
| case err = <-stdin2conn: | ||
| if err != nil { | ||
| return err | ||
| } | ||
| // wait for stdout | ||
| err = <-conn2stdout | ||
| case err = <-conn2stdout: | ||
| // return immediately without waiting for stdin to be closed. | ||
| // (stdin is never closed when tty) | ||
| } | ||
| return err | ||
| } | ||
|
|
||
| func copier(to halfWriteCloser, from halfReadCloser, debugDescription string) error { | ||
| defer func() { | ||
| if err := from.CloseRead(); err != nil { | ||
| logrus.Errorf("error while CloseRead (%s): %v", debugDescription, err) | ||
| } | ||
| if err := to.CloseWrite(); err != nil { | ||
| logrus.Errorf("error while CloseWrite (%s): %v", debugDescription, err) | ||
| } | ||
| }() | ||
| if _, err := io.Copy(to, from); err != nil { | ||
| return errors.Wrapf(err, "error while Copy (%s)", debugDescription) | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| type halfReadCloser interface { | ||
| io.Reader | ||
| CloseRead() error | ||
| } | ||
|
|
||
| type halfWriteCloser interface { | ||
| io.Writer | ||
| CloseWrite() error | ||
| } | ||
|
|
||
| type halfCloser interface { | ||
| halfReadCloser | ||
| halfWriteCloser | ||
| } | ||
|
|
||
| type halfReadCloserWrapper struct { | ||
| io.ReadCloser | ||
| } | ||
|
|
||
| func (x *halfReadCloserWrapper) CloseRead() error { | ||
| return x.Close() | ||
| } | ||
|
|
||
| type halfWriteCloserWrapper struct { | ||
| io.WriteCloser | ||
| } | ||
|
|
||
| func (x *halfWriteCloserWrapper) CloseWrite() error { | ||
| return x.Close() | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we should just add
WithDialerinstead of overriding client and removeWithHijackDialer. Using it would create a new client with a transport pointing to the current dialer and set it to hijack as well.