client ip logic updated

Author: jeevatkm

header_test.go

@@ -186,11 +186,15 @@ func TestParseContentType(t *testing.T) {
 }
 
 func createRequest(hdrKey, value string) *Request {
+	return &Request{Request: createRawHTTPRequest(hdrKey, value)}
+}
+
+func createRawHTTPRequest(hdrKey, value string) *http.Request {
 	hdr := http.Header{}
 	hdr.Set(hdrKey, value)
 	url, _ := url.Parse("http://localhost:8080/testpath")
-	return &Request{Request: &http.Request{
+	return &http.Request{
 		URL:    url,
 		Header: hdr,
-	}}
+	}
 }

request.go

@@ -18,34 +18,29 @@ type Request struct {
 }
 
 //‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾
-// Request methods
+// Unexported methods
 //___________________________________
 
-// ClientIP returns IP address from HTTP request, typically known as Client IP or
+// clientIP returns IP address from HTTP request, typically known as Client IP or
 // Remote IP. It parses the IP in the order of X-Forwarded-For, X-Real-IP
 // and finally `http.Request.RemoteAddr`.
-//
-// Set aah application configuration `http.proxy = true`, if you're running
-// application behind proxy server like nginx, haproxy, apache, etc. otherwise
-// this method might return inaccurate Client IP address.
-func (r *Request) ClientIP(proxy bool) string {
-	if proxy {
-		// Header X-Forwarded-For
-		if fwdFor := r.Header.Get(HeaderXForwardedFor); !ess.IsStrEmpty(fwdFor) {
-			index := strings.Index(fwdFor, ",")
-			if index == -1 {
-				return strings.TrimSpace(fwdFor)
-			}
-			return strings.TrimSpace(fwdFor[:index])
+func clientIP(req *http.Request) string {
+	// Header X-Forwarded-For
+	if fwdFor := req.Header.Get(HeaderXForwardedFor); !ess.IsStrEmpty(fwdFor) {
+		index := strings.Index(fwdFor, ",")
+		if index == -1 {
+			return strings.TrimSpace(fwdFor)
 		}
+		return strings.TrimSpace(fwdFor[:index])
+	}
 
-		// Header X-Real-Ip
-		if realIP := r.Header.Get(HeaderXRealIP); !ess.IsStrEmpty(realIP) {
-			return strings.TrimSpace(realIP)
-		}
+	// Header X-Real-Ip
+	if realIP := req.Header.Get(HeaderXRealIP); !ess.IsStrEmpty(realIP) {
+		return strings.TrimSpace(realIP)
 	}
 
-	if remoteAddr, _, err := net.SplitHostPort(r.RemoteAddr); err == nil {
+	// Remote Address
+	if remoteAddr, _, err := net.SplitHostPort(req.RemoteAddr); err == nil {
 		return strings.TrimSpace(remoteAddr)
 	}
 

request_test.go

@@ -12,29 +12,27 @@ import (
 )
 
 func TestClientIP(t *testing.T) {
-	req1 := createRequest(HeaderXForwardedFor, "10.0.0.1, 10.0.0.2")
-	ipAddress := req1.ClientIP(true)
+	req1 := createRawHTTPRequest(HeaderXForwardedFor, "10.0.0.1, 10.0.0.2")
+	ipAddress := clientIP(req1)
 	assert.Equal(t, "10.0.0.1", ipAddress)
 
-	req2 := createRequest(HeaderXForwardedFor, "10.0.0.2")
-	ipAddress = req2.ClientIP(true)
+	req2 := createRawHTTPRequest(HeaderXForwardedFor, "10.0.0.2")
+	ipAddress = clientIP(req2)
 	assert.Equal(t, "10.0.0.2", ipAddress)
 
-	req3 := createRequest(HeaderXRealIP, "10.0.0.3")
-	ipAddress = req3.ClientIP(true)
+	req3 := createRawHTTPRequest(HeaderXRealIP, "10.0.0.3")
+	ipAddress = clientIP(req3)
 	assert.Equal(t, "10.0.0.3", ipAddress)
 
 	req4 := createRequestWithHost("127.0.0.1:8080", "192.168.0.1:1234")
-	ipAddress = req4.ClientIP(false)
+	ipAddress = clientIP(req4)
 	assert.Equal(t, "192.168.0.1", ipAddress)
 
 	req5 := createRequestWithHost("127.0.0.1:8080", "")
-	ipAddress = req5.ClientIP(false)
+	ipAddress = clientIP(req5)
 	assert.Equal(t, "", ipAddress)
 }
 
-func createRequestWithHost(host, remote string) *Request {
-	return &Request{
-		Request: &http.Request{Host: host, RemoteAddr: remote},
-	}
+func createRequestWithHost(host, remote string) *http.Request {
+	return &http.Request{Host: host, RemoteAddr: remote}
 }