Merge pull request #787 from aledbf/pass-server-header

Add setting to allow returning the Server header from the backend
kubernetes · May 28, 2017 · 32f2438 · 32f2438
2 parents 3a9e3fd + 2f20c6b
commit 32f2438
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/controllers/nginx/pkg/config/config.go b/controllers/nginx/pkg/config/config.go
@@ -82,6 +82,12 @@ const (
 type Configuration struct {
 	defaults.Backend `json:",squash"`
 
+	// AllowBackendServerHeader enables the return of the header Server from the backend
+	// instead of the generic nginx string.
+	// http://nginx.org/en/docs/http/ngx_http_proxy_module.html#proxy_hide_header
+	// By default this is disabled
+	AllowBackendServerHeader bool `json:"allow-backend-server-header"`
+
 	// EnableDynamicTLSRecords enables dynamic TLS record sizes
 	// https://blog.cloudflare.com/optimizing-tls-over-tcp-to-reduce-latency
 	// By default this is enabled
@@ -288,6 +294,7 @@ type Configuration struct {
 // NewDefault returns the default nginx configuration
 func NewDefault() Configuration {
 	cfg := Configuration{
+		AllowBackendServerHeader:   false,
 		ClientHeaderBufferSize:     "1k",
 		ClientBodyBufferSize:       "8k",
 		EnableDynamicTLSRecords:    true,

diff --git a/controllers/nginx/rootfs/etc/nginx/template/nginx.tmpl b/controllers/nginx/rootfs/etc/nginx/template/nginx.tmpl
@@ -219,6 +219,10 @@ http {
 
     proxy_ssl_session_reuse on;
 
+    {{ if $cfg.AllowBackendServerHeader }}
+    proxy_pass_header Server;
+    {{ end }}
+
     {{range $name, $upstream := $backends}}
     upstream {{$upstream.Name}} {
         {{ if eq $upstream.SessionAffinity.AffinityType "cookie" }}