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

Add support for X11 forwarding #829

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Add support for X11 forwarding #829

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions pkg/ssh/server/ssh.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,9 @@ func NewServer(addr string, hostKey []byte, keys []ssh.PublicKey, workdir string

return true
},
X11ForwardingCallback: func(ctx ssh.Context, x11 ssh.X11) bool {
return true
},
ChannelHandlers: map[string]ssh.ChannelHandler{
"direct-tcpip": ssh.DirectTCPIPHandler,
"direct-streamlocal@openssh.com": ssh.DirectStreamLocalHandler,
Expand Down Expand Up @@ -171,6 +174,7 @@ func getShell() ([]string, error) {

func (s *Server) handler(sess ssh.Session) {
ptyReq, winCh, isPty := sess.Pty()
x11Req, isX11 := sess.X11()
cmd := s.getCommand(sess, isPty)
if ssh.AgentRequested(sess) {
// on some systems (like containers) /tmp may not exists, this ensures
Expand All @@ -191,6 +195,20 @@ func (s *Server) handler(sess ssh.Session) {
cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%s", "SSH_AUTH_SOCK", l.Addr().String()))
}

if isX11 {
l, xauth, err := ssh.NewX11Forwarder(x11Req)
if err != nil {
s.exitWithError(sess, perrors.Wrap(err, "start X11 forwarder"))
return
}

defer l.Close()
defer os.Remove(xauth.Name())
go ssh.ForwardX11Connections(l, xauth, sess)
cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%s:%d.0", "DISPLAY", ssh.X11DisplayHost, l.Addr().(*net.TCPAddr).Port - ssh.X11DisplayBasePort))
cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%s", "XAUTHORITY", xauth.Name()))
}

// start shell session
var err error
if isPty {
Expand Down