From 2d1b6dc9c9be59672c57782ad9bb62a31cb79081 Mon Sep 17 00:00:00 2001 From: Donald Guy Date: Mon, 8 May 2017 17:44:43 -0400 Subject: [PATCH] [nginx] pass non-SNI TLS hello to default backend, Fixes #693 --- controllers/nginx/pkg/cmd/controller/nginx.go | 8 +++++++- controllers/nginx/pkg/cmd/controller/tcp.go | 6 +----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/controllers/nginx/pkg/cmd/controller/nginx.go b/controllers/nginx/pkg/cmd/controller/nginx.go index ca4f7e978..7047cec4d 100644 --- a/controllers/nginx/pkg/cmd/controller/nginx.go +++ b/controllers/nginx/pkg/cmd/controller/nginx.go @@ -83,7 +83,13 @@ func newNGINXController() ingress.Controller { configmap: &api_v1.ConfigMap{}, isIPV6Enabled: isIPv6Enabled(), resolver: h, - proxy: &proxy{}, + proxy: &proxy{ + Default: &server{ + Hostname: "localhost", + IP: "127.0.0.1", + Port: 442, + }, + }, } listener, err := net.Listen("tcp", ":443") diff --git a/controllers/nginx/pkg/cmd/controller/tcp.go b/controllers/nginx/pkg/cmd/controller/tcp.go index 5c481f6f3..54bafc8be 100644 --- a/controllers/nginx/pkg/cmd/controller/tcp.go +++ b/controllers/nginx/pkg/cmd/controller/tcp.go @@ -27,11 +27,7 @@ func (p *proxy) Get(host string) *server { } } - return &server{ - Hostname: "localhost", - IP: "127.0.0.1", - Port: 442, - } + return p.Default } func (p *proxy) Handle(conn net.Conn) {