[nginx] pass non-SNI TLS hello to default backend, Fixes #693

Donald Guy · Donald Guy · commit 2d1b6dc9c9be · 2017-05-08T17:44:43.000-04:00
diff --git 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
@@ -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) {

Original file line number	Diff line number	Diff line change
`@@ -27,11 +27,7 @@ func (p proxy) Get(host string) server {`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`
`30`		`- return &server{`
`31`		`- Hostname: "localhost",`
`32`		`- IP: "127.0.0.1",`
`33`		`- Port: 442,`
`34`		`- }`
	`30`	`+ return p.Default`
`35`	`31`	`}`
`36`	`32`
`37`	`33`	`func (p *proxy) Handle(conn net.Conn) {`