self-hosted/teleport
self-hosted/teleport
1
0
Fork 0
mirror of https://github.com/gravitational/teleport synced 2024-10-20 17:23:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enabled port forwarding for joined sessions

Browse source
This commit is contained in:
Ev Kontsevoy 2016-08-25 21:19:22 -07:00
parent 20c0d85341
commit 6c5489e9cf
1 changed files with 23 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
lib/client/api.go
View file

@ -329,21 +329,14 @@ func (tc *TeleportClient) SSH(command []string, runLocally bool, input io.Reader
nodeAddrs[0])
}
// proxy local ports (forward incoming connections to remote host ports)
if len(tc.Config.LocalForwardPorts) > 0 {
nodeClient, err := proxyClient.ConnectToNode(nodeAddrs[0]+"@"+siteInfo.Name, tc.Config.HostLogin)
if err != nil {
return trace.Wrap(err)
}
for _, fp := range tc.Config.LocalForwardPorts {
socket, err := net.Listen("tcp", net.JoinHostPort(fp.SrcIP, strconv.Itoa(fp.SrcPort)))
if err != nil {
return trace.Wrap(err)
}
go nodeClient.listenAndForward(socket, net.JoinHostPort(fp.DestHost, strconv.Itoa(fp.DestPort)))
}
nodeClient, err := proxyClient.ConnectToNode(nodeAddrs[0]+"@"+siteInfo.Name, tc.Config.HostLogin)
if err != nil {
return trace.Wrap(err)
}
// proxy local ports (forward incoming connections to remote host ports)
tc.startPortForwarding(nodeClient)
// local execution?
if runLocally {
if len(tc.Config.LocalForwardPorts) == 0 {
@ -357,14 +350,22 @@ func (tc *TeleportClient) SSH(command []string, runLocally bool, input io.Reader
return tc.runCommand(siteInfo.Name, nodeAddrs, proxyClient, command)
}
nodeClient, err := proxyClient.ConnectToNode(nodeAddrs[0]+"@"+siteInfo.Name, tc.Config.HostLogin)
if err != nil {
return trace.Wrap(err)
}
return tc.runShell(nodeClient, nil, input)
}
func (tc *TeleportClient) startPortForwarding(nodeClient *NodeClient) error {
if len(tc.Config.LocalForwardPorts) > 0 {
for _, fp := range tc.Config.LocalForwardPorts {
socket, err := net.Listen("tcp", net.JoinHostPort(fp.SrcIP, strconv.Itoa(fp.SrcPort)))
if err != nil {
return trace.Wrap(err)
}
go nodeClient.listenAndForward(socket, net.JoinHostPort(fp.DestHost, strconv.Itoa(fp.DestPort)))
}
}
return nil
}
// Join connects to the existing/active SSH session
func (tc *TeleportClient) Join(sessionID session.ID, input io.Reader) (err error) {
if sessionID.Check() != nil {
@ -433,6 +434,10 @@ func (tc *TeleportClient) Join(sessionID session.ID, input io.Reader) (err error
return trace.Wrap(err)
}
// start forwarding ports, if configured:
tc.startPortForwarding(nc)
// running shell with a given session means "join" it:
return tc.runShell(nc, session, input)
}