Files
teleport/lib/sshutils/x11/forward.go
T
Brian Joerger 6cd713f667 Fix ssh -X -oControlMaster to agentless nodes. (#38779)
* Fix X11 forwarding with OpenSSH option control master when connecting through the Proxy ssh forwarding service.

* Add X11Forwarding integration test with ControlMaster subtest.

* Refactor forwarding server to always forward x11 channel requests.

* Address comments.

* Fix x11 forwarding integration tests.
2024-03-12 17:45:54 +00:00

153 lines
4.8 KiB
Go

/*
* Teleport
* Copyright (C) 2023 Gravitational, Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
// Package X11 contains contains the ssh client/server helper functions
// for performing X11 forwarding.
package x11
import (
"context"
"io"
"sync"
"github.com/gravitational/trace"
"golang.org/x/crypto/ssh"
"github.com/gravitational/teleport/lib/sshutils"
)
// forwardIO forwards io between two XServer connections until
// one of the connections is closed. If the ctx is closed early,
// the function will return, but forwarding will continue until
// the XServer connnections are closed.
func Forward(ctx context.Context, client, server XServerConn) error {
errs := make(chan error)
var wg sync.WaitGroup
wg.Add(1)
go func() {
defer wg.Done()
_, err := io.Copy(client, server)
errs <- trace.Wrap(err)
// Send other goroutine an EOF
err = client.CloseWrite()
errs <- trace.Wrap(err)
}()
wg.Add(1)
go func() {
defer wg.Done()
_, err := io.Copy(server, client)
errs <- trace.Wrap(err)
// Send other goroutine an EOF
err = server.CloseWrite()
errs <- trace.Wrap(err)
}()
go func() {
wg.Wait()
close(errs)
}()
return trace.NewAggregateFromChannel(errs, ctx)
}
// ForwardRequestPayload according to http://www.ietf.org/rfc/rfc4254.txt
type ForwardRequestPayload struct {
// SingleConnection determines whether any connections will be forwarded
// after the first connection, or after the session is closed. In OpenSSH
// and Teleport SSH clients, SingleConnection is always set to false.
SingleConnection bool
// AuthProtocol is the name of the X11 authentication protocol being used.
AuthProtocol string
// AuthCookie is a hexadecimal encoded X11 authentication cookie. This should
// be a fake, random cookie, which will be checked and replaced by the real
// cookie once the connection request is received.
AuthCookie string
// ScreenNumber determines which screen will be.
ScreenNumber uint32
}
// RequestForwarding sends an "x11-req" to the server to set up X11 forwarding for the given session.
// authProto and authCookie are required to set up authentication with the Server. screenNumber is used
// by the server to determine which screen should be connected to for X11 forwarding. singleConnection is
// an optional argument to request X11 forwarding for a single connection.
func RequestForwarding(sess *ssh.Session, xauthEntry *XAuthEntry) error {
payload := ForwardRequestPayload{
AuthProtocol: xauthEntry.Proto,
AuthCookie: xauthEntry.Cookie,
ScreenNumber: uint32(xauthEntry.Display.ScreenNumber),
}
ok, err := sess.SendRequest(sshutils.X11ForwardRequest, true, ssh.Marshal(payload))
if err != nil {
return trace.Wrap(err)
} else if !ok {
return trace.Errorf("X11 forward request failed")
}
return nil
}
// ChannelRequestPayload according to http://www.ietf.org/rfc/rfc4254.txt
type ChannelRequestPayload struct {
// OriginatorAddress is the address of the server requesting an X11 channel
OriginatorAddress string
// OriginatorPort is the port of the server requesting an X11 channel
OriginatorPort uint32
}
type x11ChannelHandler func(ctx context.Context, nch ssh.NewChannel)
// ServeChannelRequests opens an X11 channel handler and starts a
// goroutine to serve any channels received with the handler provided.
func ServeChannelRequests(ctx context.Context, clt *ssh.Client, handler x11ChannelHandler) error {
channels := clt.HandleChannelOpen(sshutils.X11ChannelRequest)
if channels == nil {
return trace.Wrap(trace.AlreadyExists("X11 forwarding channel already open"))
}
go func() {
ctx, cancel := context.WithCancel(ctx)
defer cancel()
for {
select {
case nch := <-channels:
if nch == nil {
return
}
go handler(ctx, nch)
case <-ctx.Done():
return
}
}
}()
return nil
}
// ServerConfig is a server configuration for X11 forwarding
type ServerConfig struct {
// Enabled controls whether X11 forwarding requests can be granted by the server.
Enabled bool
// DisplayOffset tells the server what X11 display number to start from when
// searching for an open X11 unix socket for XServer proxies.
DisplayOffset int
// MaxDisplay tells the server what X11 display number to stop at when
// searching for an open X11 unix socket for XServer proxies.
MaxDisplay int
}