DevFW-CICD/ingress-nginx-helm
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use net.JoinHostPort to avoid IPV6 issues

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2020-09-02 22:01:13 -04:00
parent 2217dcf7f1
commit 8abe794178
4 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
internal/ingress/controller/nginx.go
View file

@ -927,7 +927,8 @@ func updateStreamConfiguration(TCPEndpoints []ingress.L4Service, UDPEndpoints []
return err return err
} }
conn, err := net.Dial("tcp", fmt.Sprintf("127.0.0.1:%v", nginx.StreamPort)) hostPort := net.JoinHostPort("127.0.0.1", fmt.Sprintf("%v", nginx.StreamPort))
conn, err := net.Dial("tcp", hostPort)
if err != nil { if err != nil {
return err return err
} }

3
internal/ingress/controller/tcp.go
View file

@ -79,7 +79,8 @@ func (p *TCPProxy) Handle(conn net.Conn) {
return return
} }
clientConn, err := net.Dial("tcp", fmt.Sprintf("%s:%d", proxy.IP, proxy.Port)) hostPort := net.JoinHostPort(proxy.IP, fmt.Sprintf("%v", proxy.Port))
clientConn, err := net.Dial("tcp", hostPort)
if err != nil { if err != nil {
return return
} }

3
test/e2e/framework/framework.go
View file

@ -485,7 +485,8 @@ func (f *Framework) WaitForNginxListening(port int) {
podIP := f.GetNginxIP() podIP := f.GetNginxIP()
err = wait.Poll(500*time.Millisecond, DefaultTimeout, func() (bool, error) { err = wait.Poll(500*time.Millisecond, DefaultTimeout, func() (bool, error) {
conn, err := net.Dial("tcp", fmt.Sprintf("%v:%v", podIP, port)) hostPort := net.JoinHostPort(podIP, fmt.Sprintf("%v", port))
conn, err := net.Dial("tcp", hostPort)
if err != nil { if err != nil {
return false, nil return false, nil
} }

3
test/e2e/security/request_smuggling.go
View file

@ -68,7 +68,8 @@ server {
}) })
func smugglingRequest(host, addr string, port int) (string, error) { func smugglingRequest(host, addr string, port int) (string, error) {
conn, err := net.Dial("tcp", fmt.Sprintf("%v:%v", addr, port)) hostPort := net.JoinHostPort(addr, fmt.Sprintf("%v", port))
conn, err := net.Dial("tcp", hostPort)
if err != nil { if err != nil {
return "", err return "", err
} }