Force lower case aliases and subdomains

antoniomika · antoniomika · commit c54d68112253 · 2022-12-12T12:04: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, check.Addr) && viper.GetBool("force-requested-aliases") || validAlias == "" {
+	if !strings.HasPrefix(validAlias, strings.ToLower(check.Addr)) && viper.GetBool("force-requested-aliases") || validAlias == "" {
 		return nil, nil, "", "", fmt.Errorf("error assigning requested alias to tunnel")
 	}
 
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, check.Addr)) && viper.GetBool("force-requested-subdomains") {
+	if (hostUrl == nil || !strings.HasPrefix(hostUrl.Host, strings.ToLower(check.Addr))) && viper.GetBool("force-requested-subdomains") {
 		return nil, nil, "", fmt.Errorf("error assigning requested subdomain to tunnel")
 	}
 

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, check.Addr) && viper.GetBool("force-requested-aliases") \|\| validAlias == "" {`
	`22`	`+ if !strings.HasPrefix(validAlias, strings.ToLower(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
`@@ -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, check.Addr)) && viper.GetBool("force-requested-subdomains") {`
	`24`	`+ if (hostUrl == nil \|\| !strings.HasPrefix(hostUrl.Host, strings.ToLower(check.Addr))) && viper.GetBool("force-requested-subdomains") {`
`25`	`25`	`return nil, nil, "", fmt.Errorf("error assigning requested subdomain to tunnel")`
`26`	`26`	`}`
`27`	`27`