Adjust override logic

bdwyertech · Mar 7, 2021 · 2afaef2 · 2afaef2
1 parent 7055965
commit 2afaef2
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/pkg/gontlm-proxy.go b/pkg/gontlm-proxy.go
@@ -83,17 +83,20 @@ func Run() {
 
 	proxyDialer := func(addr string, pxyUrl *url.URL) proxyplease.DialContext {
 		cacheKey := addr
-		if pxyUrl != nil && pxyUrl.Host != "" {
-			cacheKey = strings.Split(pxyUrl.Host, ":")[0]
+		if pxyUrl != nil && pxyUrl.Host != "" && ProxyOverrides == nil {
+			cacheKey = pxyUrl.Host
 		}
+
 		s, _, _ := dialerCache.Memoize(cacheKey, func() (pxyCtx interface{}, err error) {
 			if ProxyOverrides != nil {
-				if pxy, ok := (*ProxyOverrides)[addr]; ok {
-					if pxy == nil {
-						d := net.Dialer{}
-						return d.DialContext, nil
+				for _, s := range []string{addr, strings.Split(addr, ":")[0]} {
+					if pxy, ok := (*ProxyOverrides)[strings.ToLower(s)]; ok {
+						if pxy == nil {
+							d := net.Dialer{}
+							return d.DialContext, nil
+						}
+						pxyUrl = pxy
 					}
-					pxyUrl = pxy
 				}
 			}