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

Merge pull request #2696 from bfin/fix/completely-remove-server-header

Browse source 
If server_tokens is disabled completely remove the Server header
This commit is contained in:
k8s-ci-robot 2018-06-23 09:08:05 -07:00 committed by GitHub
commit 9dd12d02da
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rootfs/etc/nginx/template/nginx.tmpl
View file

@ -184,7 +184,7 @@ http {
server_tokens {{ if $cfg.ShowServerTokens }}on{{ else }}off{{ end }}; server_tokens {{ if $cfg.ShowServerTokens }}on{{ else }}off{{ end }};
{{ if not $cfg.ShowServerTokens }} {{ if not $cfg.ShowServerTokens }}
more_set_headers "Server: "; more_clear_headers Server;
{{ end }} {{ end }}
# disable warnings # disable warnings

2
test/e2e/settings/server_tokens.go
View file

@ -51,7 +51,7 @@ var _ = framework.IngressNginxDescribe("Server Tokens", func() {
err = f.WaitForNginxConfiguration( err = f.WaitForNginxConfiguration(
func(cfg string) bool { func(cfg string) bool {
return strings.Contains(cfg, "server_tokens off") && return strings.Contains(cfg, "server_tokens off") &&
strings.Contains(cfg, "more_set_headers \"Server: \"") strings.Contains(cfg, "more_clear_headers Server;")
}) })
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
}) })