Merge pull request antoniomika#202 from antoniomika/am/fix-loaders

Updated loader functions to support new forward params
shakahl · Dec 7, 2021 · 24e9f31 · 24e9f31
2 parents aee4770 + b5dd6b9
commit 24e9f31
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 3 deletions.
diff --git a/httpmuxer/httpmuxer.go b/httpmuxer/httpmuxer.go
@@ -258,7 +258,19 @@ func Start(state *utils.State) {
 					return fmt.Errorf("ondemand certificate retrieval is not enabled")
 				}
 
-				_, ok := state.HTTPListeners.Load(name)
+				ok := false
+
+				state.HTTPListeners.Range(func(key, value interface{}) bool {
+					locationListener := value.(*utils.HTTPHolder)
+
+					if name == locationListener.HTTPUrl.Host {
+						ok = true
+						return false
+					}
+
+					return true
+				})
+
 				if !ok {
 					return fmt.Errorf("cannot find connection for host: %s", name)
 				}

diff --git a/utils/utils.go b/utils/utils.go
@@ -692,9 +692,25 @@ func GetOpenHost(addr string, state *State, sshConn *SSHConnection) (*url.URL, *
 				host = getRandomHost()
 			}
 
-			holder, ok := state.HTTPListeners.Load(host)
+			var holder *HTTPHolder
+			ok := false
+
+			state.HTTPListeners.Range(func(key, value interface{}) bool {
+				locationListener := value.(*HTTPHolder)
+
+				parsedPassword, _ := locationListener.HTTPUrl.User.Password()
+
+				if host == locationListener.HTTPUrl.Host && strings.HasPrefix(path, locationListener.HTTPUrl.Path) && username == locationListener.HTTPUrl.User.Username() && password == parsedPassword {
+					ok = true
+					holder = locationListener
+					return false
+				}
+
+				return true
+			})
+
 			if ok && viper.GetBool("http-load-balancer") {
-				pH = holder.(*HTTPHolder)
+				pH = holder
 				ok = false
 			}