Use original address for forwarded channel. Fix antoniomika#237

antoniomika · antoniomika · commit 62dec83b1310 · 2022-12-20T13:31:17.000-05:00
diff --git a/sshmuxer/aliashandler.go b/sshmuxer/aliashandler.go
@@ -19,7 +19,7 @@ import (
 func handleAliasListener(check *channelForwardMsg, stringPort string, requestMessages string, listenerHolder *utils.ListenerHolder, state *utils.State, sshConn *utils.SSHConnection) (*utils.AliasHolder, *url.URL, string, string, error) {
 	validAlias, aH := utils.GetOpenAlias(check.Addr, stringPort, state, sshConn)
 
-	if !strings.HasPrefix(validAlias, strings.ToLower(check.Addr)) && viper.GetBool("force-requested-aliases") || validAlias == "" {
+	if !strings.HasPrefix(validAlias, check.Addr) && viper.GetBool("force-requested-aliases") || validAlias == "" {
 		return nil, nil, "", "", fmt.Errorf("error assigning requested alias to tunnel")
 	}
 
diff --git a/sshmuxer/channels.go b/sshmuxer/channels.go
@@ -250,6 +250,8 @@ func handleAlias(newChannel ssh.NewChannel, sshConn *utils.SSHConnection, state
 		return
 	}
 
+	check.Addr = strings.ToLower(check.Addr)
+
 	tcpAliasToConnect := fmt.Sprintf("%s:%d", check.Addr, check.Port)
 	loc, ok := state.AliasListeners.Load(tcpAliasToConnect)
 	if !ok {
diff --git a/sshmuxer/httphandler.go b/sshmuxer/httphandler.go
@@ -21,7 +21,7 @@ import (
 func handleHTTPListener(check *channelForwardMsg, stringPort string, requestMessages string, listenerHolder *utils.ListenerHolder, state *utils.State, sshConn *utils.SSHConnection, scheme string) (*utils.HTTPHolder, *url.URL, string, error) {
 	hostUrl, pH := utils.GetOpenHost(check.Addr, state, sshConn)
 
-	if (hostUrl == nil || !strings.HasPrefix(hostUrl.Host, strings.ToLower(check.Addr))) && viper.GetBool("force-requested-subdomains") {
+	if (hostUrl == nil || !strings.HasPrefix(hostUrl.Host, check.Addr)) && viper.GetBool("force-requested-subdomains") {
 		return nil, nil, "", fmt.Errorf("error assigning requested subdomain to tunnel")
 	}
 
diff --git a/sshmuxer/requests.go b/sshmuxer/requests.go
@@ -57,6 +57,7 @@ func handleRemoteForward(newRequest *ssh.Request, sshConn *utils.SSHConnection,
 		log.Println("Error unmarshaling remote forward payload:", err)
 	}
 
+	originalAddress := check.Addr
 	check.Addr = strings.ToLower(check.Addr)
 
 	bindPort := check.Rport
@@ -299,9 +300,9 @@ func handleRemoteForward(newRequest *ssh.Request, sshConn *utils.SSHConnection,
 			}
 
 			resp := &forwardedTCPPayload{
-				Addr:       check.Addr,
+				Addr:       originalAddress,
 				Port:       portChannelForwardReplyPayload.Rport,
-				OriginAddr: check.Addr,
+				OriginAddr: originalAddress,
 				OriginPort: portChannelForwardReplyPayload.Rport,
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ import (`
`19`	`19`	`func handleAliasListener(check channelForwardMsg, stringPort string, requestMessages string, listenerHolder utils.ListenerHolder, state utils.State, sshConn utils.SSHConnection) (utils.AliasHolder, url.URL, string, string, error) {`
`20`	`20`	`validAlias, aH := utils.GetOpenAlias(check.Addr, stringPort, state, sshConn)`
`21`	`21`
`22`		`- if !strings.HasPrefix(validAlias, strings.ToLower(check.Addr)) && viper.GetBool("force-requested-aliases") \|\| validAlias == "" {`
	`22`	`+ if !strings.HasPrefix(validAlias, check.Addr) && viper.GetBool("force-requested-aliases") \|\| validAlias == "" {`
`23`	`23`	`return nil, nil, "", "", fmt.Errorf("error assigning requested alias to tunnel")`
`24`	`24`	`}`
`25`	`25`
Original file line number	Diff line number	Diff line change
`@@ -250,6 +250,8 @@ func handleAlias(newChannel ssh.NewChannel, sshConn *utils.SSHConnection, state`
`250`	`250`	`return`
`251`	`251`	`}`
`252`	`252`
	`253`	`+ check.Addr = strings.ToLower(check.Addr)`
	`254`	`+`
`253`	`255`	`tcpAliasToConnect := fmt.Sprintf("%s:%d", check.Addr, check.Port)`
`254`	`256`	`loc, ok := state.AliasListeners.Load(tcpAliasToConnect)`
`255`	`257`	`if !ok {`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ import (`
`21`	`21`	`func handleHTTPListener(check channelForwardMsg, stringPort string, requestMessages string, listenerHolder utils.ListenerHolder, state utils.State, sshConn utils.SSHConnection, scheme string) (utils.HTTPHolder, url.URL, string, error) {`
`22`	`22`	`hostUrl, pH := utils.GetOpenHost(check.Addr, state, sshConn)`
`23`	`23`
`24`		`- if (hostUrl == nil \|\| !strings.HasPrefix(hostUrl.Host, strings.ToLower(check.Addr))) && viper.GetBool("force-requested-subdomains") {`
	`24`	`+ if (hostUrl == nil \|\| !strings.HasPrefix(hostUrl.Host, check.Addr)) && viper.GetBool("force-requested-subdomains") {`
`25`	`25`	`return nil, nil, "", fmt.Errorf("error assigning requested subdomain to tunnel")`
`26`	`26`	`}`
`27`	`27`
Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,7 @@ func handleRemoteForward(newRequest ssh.Request, sshConn utils.SSHConnection,`
`57`	`57`	`log.Println("Error unmarshaling remote forward payload:", err)`
`58`	`58`	`}`
`59`	`59`
	`60`	`+ originalAddress := check.Addr`
`60`	`61`	`check.Addr = strings.ToLower(check.Addr)`
`61`	`62`
`62`	`63`	`bindPort := check.Rport`
`@@ -299,9 +300,9 @@ func handleRemoteForward(newRequest ssh.Request, sshConn utils.SSHConnection,`
`299`	`300`	`}`
`300`	`301`
`301`	`302`	`resp := &forwardedTCPPayload{`
`302`		`- Addr: check.Addr,`
	`303`	`+ Addr: originalAddress,`
`303`	`304`	`Port: portChannelForwardReplyPayload.Rport,`
`304`		`- OriginAddr: check.Addr,`
	`305`	`+ OriginAddr: originalAddress,`
`305`	`306`	`OriginPort: portChannelForwardReplyPayload.Rport,`
`306`	`307`	`}`
`307`	`308`