Skip to content
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

Jump to bottom

fix(ssh): allow multiplexed connection #3658

Closed
wants to merge 1 commit into from
Closed

fix(ssh): allow multiplexed connection #3658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 1 addition & 16 deletions ssh/server/channels/session.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,21 +175,6 @@ func DefaultSessionHandler(opts DefaultSessionHandlerOptions) gliderssh.ChannelH

switch req.Type {
case ShellRequestType, ExecRequestType, SubsystemRequestType:
// Once the session has been set up, a program is started at the remote end. The program can be a
// shell, an application program, or a subsystem with a host-independent name. **Only one of these
// requests can succeed per channel.**
//
// https://www.rfc-editor.org/rfc/rfc4254#section-6.5
if sess.Handled {
logger.Warn("fail to start a new session before ending the previous one")

if err := req.Reply(false, nil); err != nil {
logger.WithError(err).Error("failed to reply the client when data pipe already started")
}

continue
}

if err := req.Reply(ok, nil); err != nil {
logger.WithError(err).Error("failed to reply the client with right response for pipe request type")

Expand All @@ -209,7 +194,7 @@ func DefaultSessionHandler(opts DefaultSessionHandlerOptions) gliderssh.ChannelH
// encrypted tunnel.
//
// https://www.rfc-editor.org/rfc/rfc4254#section-6.5
go pipe(ctx, sess, client, agent, req.Type, opts)
go pipe(sess, client, agent, req.Type, opts)
case PtyRequestType:
var pty session.Pty

Expand Down
14 changes: 1 addition & 13 deletions ssh/server/channels/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,14 @@ import (
"io"
"sync"

gliderssh "github.com/gliderlabs/ssh"
"github.com/shellhub-io/shellhub/pkg/envs"
"github.com/shellhub-io/shellhub/pkg/models"
"github.com/shellhub-io/shellhub/ssh/session"
log "github.com/sirupsen/logrus"
gossh "golang.org/x/crypto/ssh"
)

func pipe(ctx gliderssh.Context, sess *session.Session, client gossh.Channel, agent gossh.Channel, req string, opts DefaultSessionHandlerOptions) {
defer func() {
ctx.Lock()
sess.Handled = false
ctx.Unlock()
}()

// NOTICE: avoid multiple pipe data in same channel due to protocol limitaion.
ctx.Lock()
sess.Handled = true
ctx.Unlock()

func pipe(sess *session.Session, client gossh.Channel, agent gossh.Channel, req string, opts DefaultSessionHandlerOptions) {
defer log.
WithFields(log.Fields{"session": sess.UID, "sshid": sess.SSHID}).
Trace("data pipe between client and agent has done")
Expand Down
2 changes: 0 additions & 2 deletions ssh/session/session.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@ type Data struct {
Lookup map[string]string
// Pty is the PTY dimension.
Pty Pty
// Handled check if the session is already handling a "shell", "exec" or a "subsystem".
Handled bool
}

// TODO: implement [io.Read] and [io.Write] on session to simplify the data piping.
Expand Down