iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixup: Propagate bind errors up

This commit is contained in:
Daniel Kimsey 2019-08-20 13:46:43 -05:00 committed by Megan Marsh
parent 3b64620234
commit 543d09a29c
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
communicator/ssh/communicator.go
View File

@ -364,27 +364,35 @@ func (c *comm) reconnect() (err error) {
c.client = ssh.NewClient(sshConn, sshChan, req) c.client = ssh.NewClient(sshConn, sshChan, req)
} }
c.connectToAgent() c.connectToAgent()
c.connectTunnels(sshConn) err = c.connectTunnels(sshConn)
if err != nil {
return
}
return return
} }
func (c *comm) connectTunnels(sshConn ssh.Conn) { func (c *comm) connectTunnels(sshConn ssh.Conn) (err error) {
if c.client == nil { if c.client == nil {
return return
} }
if len(c.config.Tunnels) == 0 {
// No Tunnels to configure
return
}
// Start remote forwards of ports to ourselves. // Start remote forwards of ports to ourselves.
log.Printf("[DEBUG] Tunnel Configuration: %v", c.config.Tunnels) log.Printf("[DEBUG] Tunnel configuration: %v", c.config.Tunnels)
for _, v := range c.config.Tunnels { for _, v := range c.config.Tunnels {
done := make(chan struct{}) done := make(chan struct{})
var listener net.Listener
switch v.Direction { switch v.Direction {
case RemoteTunnel: case RemoteTunnel:
// This requests the sshd Host to bind a port and send traffic back to us // This requests the sshd Host to bind a port and send traffic back to us
listener, err := c.client.Listen(v.ListenType, v.ListenAddr) listener, err = c.client.Listen(v.ListenType, v.ListenAddr)
// TODO How can we get this failure to ui.Error?
if err != nil { if err != nil {
log.Printf("[ERROR] Tunnel: unable to bind remote tunnel ('%v'): %s", v, err) err = fmt.Errorf("Tunnel: Failed to bind remote ('%v'): %s", v, err)
return return
} }
log.Printf("[INFO] Tunnel: Remote bound on %s forwarding to %s", v.ListenAddr, v.ForwardAddr) log.Printf("[INFO] Tunnel: Remote bound on %s forwarding to %s", v.ListenAddr, v.ForwardAddr)
@ -395,10 +403,9 @@ func (c *comm) connectTunnels(sshConn ssh.Conn) {
go shutdownProxyTunnel(sshConn, done, listener) go shutdownProxyTunnel(sshConn, done, listener)
case LocalTunnel: case LocalTunnel:
// This binds locally and sends traffic back to the sshd host // This binds locally and sends traffic back to the sshd host
listener, err := net.Listen(v.ListenType, v.ListenAddr) listener, err = net.Listen(v.ListenType, v.ListenAddr)
if err != nil { if err != nil {
// TODO How can we get this failure to ui.Error? err = fmt.Errorf("Tunnel: Failed to bind local ('%v'): %s", v, err)
log.Printf("[ERROR] Tunnel: unable to bind local tunnel ('%v'): %s", v, err)
return return
} }
log.Printf("[INFO] Tunnel: Local bound on %s forwarding to %s", v.ListenAddr, v.ForwardAddr) log.Printf("[INFO] Tunnel: Local bound on %s forwarding to %s", v.ListenAddr, v.ForwardAddr)
@ -410,8 +417,8 @@ func (c *comm) connectTunnels(sshConn ssh.Conn) {
// FIXME: Is there a better "on-shutdown" we can wait on? // FIXME: Is there a better "on-shutdown" we can wait on?
go shutdownProxyTunnel(sshConn, done, listener) go shutdownProxyTunnel(sshConn, done, listener)
default: default:
log.Printf("[ERROR] Tunnel: Unknown tunnel type ('%v'): %v", v, v.Direction) err = fmt.Errorf("Tunnel: Unknown tunnel direction ('%v'): %v", v, v.Direction)
continue return
} }
} }