From 283c75b32e971b100c8aa7c25c0a448f682d77d5 Mon Sep 17 00:00:00 2001 From: Elwin Tamminga Date: Tue, 20 Jul 2021 10:49:55 +0200 Subject: [PATCH] Remove port when using headers in c.RealIP Co-authored-by: Elwin Tamminga Co-committed-by: Elwin Tamminga --- context.go | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/context.go b/context.go index eec329c..e9c2fd6 100644 --- a/context.go +++ b/context.go @@ -105,14 +105,17 @@ func (c *Context) Get(key string) interface{} { // RealIP uses proxy headers for the real ip, if none exist the IP of the current connection is returned func (c *Context) RealIP() string { + reqIP := c.Request.RemoteAddr + if ip := c.Request.Header.Get(`X-Forwarded-For`); ip != `` { - return strings.Split(ip, `, `)[0] + reqIP = strings.Split(ip, `, `)[0] + } else if ip := c.Request.Header.Get(`X-Real-IP`); ip != `` { + reqIP = ip } - if ip := c.Request.Header.Get(`X-Real-IP`); ip != `` { - return ip + ra, _, _ := net.SplitHostPort(reqIP) + if ra != `` { + reqIP = ra } - - ra, _, _ := net.SplitHostPort(c.Request.RemoteAddr) - return ra + return reqIP }