Merge pull request #686 from luraproject/remote_ip_headers

Do not replace the default gin value if there's no remote_ip_headers …
luraproject · Sep 28, 2023 · 8afdf3a · 8afdf3a
2 parents ae01c04 + 005d77b
commit 8afdf3a
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/router/gin/engine.go b/router/gin/engine.go
@@ -61,11 +61,15 @@ func NewEngine(cfg config.ServiceConfig, opt EngineOptions) *gin.Engine {
 				if ginOptions.ForwardedByClientIP != nil {
 					engine.ForwardedByClientIP = *ginOptions.ForwardedByClientIP
 				}
-				engine.RemoteIPHeaders = ginOptions.RemoteIPHeaders
-				for k, h := range engine.RemoteIPHeaders {
-					engine.RemoteIPHeaders[k] = textproto.CanonicalMIMEHeaderKey(h)
+				if len(ginOptions.RemoteIPHeaders) > 0 {
+					engine.RemoteIPHeaders = ginOptions.RemoteIPHeaders
+					for k, h := range engine.RemoteIPHeaders {
+						engine.RemoteIPHeaders[k] = textproto.CanonicalMIMEHeaderKey(h)
+					}
+				}
+				if len(ginOptions.TrustedProxies) > 0 {
+					engine.SetTrustedProxies(ginOptions.TrustedProxies)
 				}
-				engine.SetTrustedProxies(ginOptions.TrustedProxies)
 				engine.AppEngine = ginOptions.AppEngine
 				engine.MaxMultipartMemory = ginOptions.MaxMultipartMemory
 				engine.RemoveExtraSlash = ginOptions.RemoveExtraSlash