Skip to content

Commit

Permalink
Merge pull request #3596 from aledbf/fix-proxy-host
Browse files Browse the repository at this point in the history
Fix proxy_host variable configuration
  • Loading branch information
k8s-ci-robot authored Jan 2, 2019
2 parents fea48a3 + a73dac2 commit 5d4cf75
Show file tree
Hide file tree
Showing 2 changed files with 88 additions and 4 deletions.
6 changes: 2 additions & 4 deletions rootfs/etc/nginx/template/nginx.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -539,9 +539,6 @@ http {
{{ end }}
server_name {{ $hostname }};

{{/* default value of proxy_host is the name and port of a proxied server as specified in the proxy_pass directive */}}
set $proxy_host {{ $hostname }};

{{ if gt (len $cfg.BlockUserAgents) 0 }}
if ($block_ua) {
return 403;
Expand Down Expand Up @@ -1126,7 +1123,8 @@ stream {

port_in_redirect {{ if $location.UsePortInRedirects }}on{{ else }}off{{ end }};

set $proxy_upstream_name "{{ buildUpstreamName $location }}";
set $proxy_upstream_name "{{ buildUpstreamName $location }}";
set $proxy_host $proxy_upstream_name;

{{/* redirect to HTTPS can be achieved forcing the redirect or having a SSL Certificate configured for the server */}}
{{ if (or $location.Rewrite.ForceSSLRedirect (and (not (empty $server.SSLCert.PemFileName)) $location.Rewrite.SSLRedirect)) }}
Expand Down
86 changes: 86 additions & 0 deletions test/e2e/settings/proxy_host.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
/*
Copyright 2018 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package settings

import (
"fmt"
"net/http"
"strings"

. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
"github.com/parnurzeal/gorequest"

"k8s.io/ingress-nginx/test/e2e/framework"
)

var _ = framework.IngressNginxDescribe("Proxy host variable", func() {
test := "proxy-host"
f := framework.NewDefaultFramework(test)

BeforeEach(func() {
f.NewEchoDeploymentWithReplicas(1)
})

It("should exist a proxy_host", func() {
upstreamName := fmt.Sprintf("%v-http-svc-80", f.IngressController.Namespace)
annotations := map[string]string{
"nginx.ingress.kubernetes.io/configuration-snippet": `more_set_headers "Custom-Header: $proxy_host"`,
}
f.EnsureIngress(framework.NewSingleIngress(test, "/", test, f.IngressController.Namespace, "http-svc", 80, &annotations))

f.WaitForNginxConfiguration(
func(server string) bool {
return strings.Contains(server, fmt.Sprintf("server_name %v", test)) &&
strings.Contains(server, "set $proxy_host $proxy_upstream_name")
})

resp, _, errs := gorequest.New().
Get(f.IngressController.HTTPURL).
Set("Host", test).
End()

Expect(len(errs)).Should(Equal(0))
Expect(resp.StatusCode).Should(Equal(http.StatusOK))
Expect(resp.Header.Get("Custom-Header")).Should(Equal(upstreamName))
})

It("should exist a proxy_host using the upstream-vhost annotation value", func() {
upstreamName := fmt.Sprintf("%v-http-svc-80", f.IngressController.Namespace)
upstreamVHost := "different.host"
annotations := map[string]string{
"nginx.ingress.kubernetes.io/upstream-vhost": upstreamVHost,
"nginx.ingress.kubernetes.io/configuration-snippet": `more_set_headers "Custom-Header: $proxy_host"`,
}
f.EnsureIngress(framework.NewSingleIngress(test, "/", test, f.IngressController.Namespace, "http-svc", 80, &annotations))

f.WaitForNginxConfiguration(
func(server string) bool {
return strings.Contains(server, fmt.Sprintf("server_name %v", test)) &&
strings.Contains(server, fmt.Sprintf("set $proxy_host $proxy_upstream_name"))
})

resp, _, errs := gorequest.New().
Get(f.IngressController.HTTPURL).
Set("Host", test).
End()

Expect(len(errs)).Should(Equal(0))
Expect(resp.StatusCode).Should(Equal(http.StatusOK))
Expect(resp.Header.Get("Custom-Header")).Should(Equal(upstreamName))
})
})

0 comments on commit 5d4cf75

Please sign in to comment.