Support real-ip in default server

nginx · Sep 8, 2020 · 905b69c · 905b69c
1 parent 739e35a
commit 905b69c
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 0 deletions.
diff --git a/internal/configs/configmaps.go b/internal/configs/configmaps.go
@@ -519,6 +519,9 @@ func GenerateNginxMainConfig(staticCfgParams *StaticConfigParams, config *Config
 		ResolverIPV6:                       config.ResolverIPV6,
 		ResolverTimeout:                    config.ResolverTimeout,
 		ResolverValid:                      config.ResolverValid,
+		RealIPHeader:                       config.RealIPHeader,
+		RealIPRecursive:                    config.RealIPRecursive,
+		SetRealIPFrom:                      config.SetRealIPFrom,
 		ServerNamesHashBucketSize:          config.MainServerNamesHashBucketSize,
 		ServerNamesHashMaxSize:             config.MainServerNamesHashMaxSize,
 		ServerTokens:                       config.ServerTokens,

diff --git a/internal/configs/version1/config.go b/internal/configs/version1/config.go
@@ -166,6 +166,9 @@ type MainConfig struct {
 	ResolverIPV6                       bool
 	ResolverTimeout                    string
 	ResolverValid                      string
+	RealIPHeader                       string
+	RealIPRecursive                    bool
+	SetRealIPFrom                      []string
 	ServerNamesHashBucketSize          string
 	ServerNamesHashMaxSize             string
 	ServerTokens                       string

diff --git a/internal/configs/version1/nginx-plus.tmpl b/internal/configs/version1/nginx-plus.tmpl
@@ -115,6 +115,11 @@ http {
         ssl_certificate /etc/nginx/secrets/default;
         ssl_certificate_key /etc/nginx/secrets/default;
 
+        {{range $setRealIPFrom := .SetRealIPFrom}}
+        set_real_ip_from {{$setRealIPFrom}};{{end}}
+        {{if .RealIPHeader}}real_ip_header {{.RealIPHeader}};{{end}}
+        {{if .RealIPRecursive}}real_ip_recursive on;{{end}}
+
         server_name _;
         server_tokens "{{.ServerTokens}}";
         {{if .DefaultServerAccessLogOff}}

diff --git a/internal/configs/version1/nginx.tmpl b/internal/configs/version1/nginx.tmpl
@@ -101,6 +101,11 @@ http {
         ssl_certificate /etc/nginx/secrets/default;
         ssl_certificate_key /etc/nginx/secrets/default;
 
+        {{range $setRealIPFrom := .SetRealIPFrom}}
+        set_real_ip_from {{$setRealIPFrom}};{{end}}
+        {{if .RealIPHeader}}real_ip_header {{.RealIPHeader}};{{end}}
+        {{if .RealIPRecursive}}real_ip_recursive on;{{end}}
+
         server_name _;
         server_tokens "{{.ServerTokens}}";
         {{if .DefaultServerAccessLogOff}}