Merge pull request #3333 from Shopify/dont-trust-by-default

breaking change: by default do not trust any client
kubernetes · Nov 27, 2018 · 710ea8c · 710ea8c
2 parents 8299652 + 5f3b48e
commit 710ea8c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/docs/user-guide/nginx-configuration/configmap.md b/docs/user-guide/nginx-configuration/configmap.md
@@ -106,7 +106,7 @@ The following table shows a configuration option's name, type, and the default v
 |[proxy-stream-timeout](#proxy-stream-timeout)|string|"600s"|
 |[proxy-stream-responses](#proxy-stream-responses)|int|1|
 |[bind-address](#bind-address)|[]string|""|
-|[use-forwarded-headers](#use-forwarded-headers)|bool|"true"|
+|[use-forwarded-headers](#use-forwarded-headers)|bool|"false"|
 |[forwarded-for-header](#forwarded-for-header)|string|"X-Forwarded-For"|
 |[compute-full-forwarded-for](#compute-full-forwarded-for)|bool|"false"|
 |[proxy-add-original-uri-header](#proxy-add-original-uri-header)|bool|"true"|

diff --git a/internal/ingress/controller/config/config.go b/internal/ingress/controller/config/config.go
@@ -588,7 +588,7 @@ func NewDefault() Configuration {
 		EnableDynamicTLSRecords:    true,
 		EnableUnderscoresInHeaders: false,
 		ErrorLogLevel:              errorLevel,
-		UseForwardedHeaders:        true,
+		UseForwardedHeaders:        false,
 		ForwardedForHeader:         "X-Forwarded-For",
 		ComputeFullForwardedFor:    false,
 		ProxyAddOriginalURIHeader:  true,

diff --git a/test/e2e/settings/geoip2.go b/test/e2e/settings/geoip2.go
@@ -45,6 +45,7 @@ var _ = framework.IngressNginxDescribe("Geoip2", func() {
   AU 0;
 }`
 		f.UpdateNginxConfigMapData("http-snippet", httpSnippetAllowingOnlyAustralia)
+		f.UpdateNginxConfigMapData("use-forwarded-headers", "true")
 
 		f.WaitForNginxConfiguration(
 			func(cfg string) bool {