Skip to content

Commit b0f66f2

Browse files
committed
Correctly handle empty string for proxy URI
Signed-off-by: Kyle Stein <[email protected]>
1 parent 883e6cb commit b0f66f2

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

cmd/edge-proxy/main.go

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -167,16 +167,17 @@ func main() {
167167
fmt.Printf("Starting edge HTTP proxy (proxyAddr=%s, proxyURI=%s)\n", proxyAddr, proxyURI)
168168

169169
proxyForEdge := func(req *http.Request) (*url.URL, error) {
170-
var proxy *url.URL
171170

172-
proxy, err := url.Parse(externalHTTPProxyURI)
173-
if err != nil {
174-
return nil, nil
175-
} else {
176-
return proxy, nil
171+
if externalHTTPProxyURI != "" {
172+
var proxy *url.URL
173+
proxy, err := url.Parse(externalHTTPProxyURI)
174+
if err == nil {
175+
return proxy, nil
176+
}
177177
}
178-
}
179178

179+
return nil, nil
180+
}
180181

181182
server.RunEdgeHTTPProxyServer(childCtx, proxyAddr, forwardingAddresses(proxyURIParsed, forwardingAddressesMapParsed), caList, cert, proxyForEdge)
182183

0 commit comments

Comments
 (0)