Move ClientIP funcs to helpers

utils/http/helpers/helpers.go

@@ -9,11 +9,14 @@ import (
 	"regexp"
 	"runtime"
 	"strconv"
+	"strings"
 	"time"
 
 	"github.com/vladimirok5959/golang-server-sessions/session"
 )
 
+// func ClientIP(r *http.Request) string
+// func ClientIPs(r *http.Request) []string
 // func HandlerApplicationStatus() http.Handler
 // func HandlerBuildInFile(data, contentType string) http.Handler
 // func MinifyHtmlCode(str string) string
@@ -26,6 +29,27 @@ var mHtml = regexp.MustCompile(`>[\n\t\r]+<`)
 var mHtmlLeft = regexp.MustCompile(`>[\n\t\r]+`)
 var mHtmlRight = regexp.MustCompile(`[\n\t\r]+<`)
 
+func ClientIP(r *http.Request) string {
+	ips := ClientIPs(r)
+	if len(ips) >= 1 {
+		return ips[0]
+	}
+	return ""
+}
+
+func ClientIPs(r *http.Request) []string {
+	ra := r.RemoteAddr
+	if xff := strings.Trim(r.Header.Get("X-Forwarded-For"), " "); xff != "" {
+		ra = strings.Join([]string{xff, ra}, ",")
+	}
+	res := []string{}
+	ips := strings.Split(ra, ",")
+	for _, ip := range ips {
+		res = append(res, strings.Trim(ip, " "))
+	}
+	return res
+}
+
 func HandlerApplicationStatus() http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		if r.Method != http.MethodGet {

utils/http/helpers/helpers_test.go

@@ -1,6 +1,7 @@
 package helpers_test
 
 import (
+	"net/http"
 	"testing"
 
 	. "github.com/onsi/ginkgo"
@@ -9,6 +10,64 @@ import (
 )
 
 var _ = Describe("helpers", func() {
+	Context("ClientIP", func() {
+		It("return client IP", func() {
+			Expect(helpers.ClientIP(&http.Request{
+				RemoteAddr: "127.0.0.1",
+			})).To(Equal("127.0.0.1"))
+
+			Expect(helpers.ClientIP(&http.Request{
+				RemoteAddr: "192.168.0.1,127.0.0.1",
+			})).To(Equal("192.168.0.1"))
+
+			Expect(helpers.ClientIP(&http.Request{
+				RemoteAddr: "192.168.0.1, 127.0.0.1",
+			})).To(Equal("192.168.0.1"))
+
+			Expect(helpers.ClientIP(&http.Request{
+				RemoteAddr: "192.168.0.50,192.168.0.1,127.0.0.1",
+			})).To(Equal("192.168.0.50"))
+
+			Expect(helpers.ClientIP(&http.Request{
+				RemoteAddr: "192.168.0.50, 192.168.0.1, 127.0.0.1",
+			})).To(Equal("192.168.0.50"))
+		})
+	})
+
+	Context("ClientIPs", func() {
+		It("return array of client IPs", func() {
+			Expect(helpers.ClientIPs(&http.Request{
+				RemoteAddr: "127.0.0.1",
+			})).To(ConsistOf(
+				"127.0.0.1",
+			))
+
+			Expect(helpers.ClientIPs(&http.Request{
+				RemoteAddr: "192.168.0.1,127.0.0.1",
+			})).To(ConsistOf(
+				"192.168.0.1", "127.0.0.1",
+			))
+
+			Expect(helpers.ClientIPs(&http.Request{
+				RemoteAddr: "192.168.0.1, 127.0.0.1",
+			})).To(ConsistOf(
+				"192.168.0.1", "127.0.0.1",
+			))
+
+			Expect(helpers.ClientIPs(&http.Request{
+				RemoteAddr: "192.168.0.50,192.168.0.1,127.0.0.1",
+			})).To(ConsistOf(
+				"192.168.0.50", "192.168.0.1", "127.0.0.1",
+			))
+
+			Expect(helpers.ClientIPs(&http.Request{
+				RemoteAddr: "192.168.0.50, 192.168.0.1, 127.0.0.1",
+			})).To(ConsistOf(
+				"192.168.0.50", "192.168.0.1", "127.0.0.1",
+			))
+		})
+	})
+
 	Context("MinifyHtmlCode", func() {
 		It("minify Html code", func() {
 			Expect(helpers.MinifyHtmlCode(`

utils/http/logger/logger.go

@@ -3,8 +3,9 @@ package logger
 import (
 	"log"
 	"net/http"
-	"strings"
 	"time"
+
+	"github.com/vladimirok5959/golang-utils/utils/http/helpers"
 )
 
 type ResponseWriter struct {
@@ -17,27 +18,6 @@ func (r *ResponseWriter) WriteHeader(status int) {
 	r.ResponseWriter.WriteHeader(status)
 }
 
-func ClientIP(r *http.Request) string {
-	ips := ClientIPs(r)
-	if len(ips) >= 1 {
-		return ips[0]
-	}
-	return ""
-}
-
-func ClientIPs(r *http.Request) []string {
-	ra := r.RemoteAddr
-	if xff := strings.Trim(r.Header.Get("X-Forwarded-For"), " "); xff != "" {
-		ra = strings.Join([]string{xff, ra}, ",")
-	}
-	res := []string{}
-	ips := strings.Split(ra, ",")
-	for _, ip := range ips {
-		res = append(res, strings.Trim(ip, " "))
-	}
-	return res
-}
-
 func LogRequests(handler http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		start := time.Now()
@@ -48,7 +28,7 @@ func LogRequests(handler http.Handler) http.Handler {
 		handler.ServeHTTP(nw, r)
 		log.Printf(
 			"\"%s\" \"%s %s\" %d \"%.3f ms\"\n",
-			ClientIP(r), r.Method, r.URL, nw.Status, time.Since(start).Seconds(),
+			helpers.ClientIP(r), r.Method, r.URL, nw.Status, time.Since(start).Seconds(),
 		)
 	})
 }

utils/http/logger/logger_test.go

@@ -14,64 +14,6 @@ import (
 )
 
 var _ = Describe("logger", func() {
-	Context("ClientIP", func() {
-		It("return client IP", func() {
-			Expect(logger.ClientIP(&http.Request{
-				RemoteAddr: "127.0.0.1",
-			})).To(Equal("127.0.0.1"))
-
-			Expect(logger.ClientIP(&http.Request{
-				RemoteAddr: "192.168.0.1,127.0.0.1",
-			})).To(Equal("192.168.0.1"))
-
-			Expect(logger.ClientIP(&http.Request{
-				RemoteAddr: "192.168.0.1, 127.0.0.1",
-			})).To(Equal("192.168.0.1"))
-
-			Expect(logger.ClientIP(&http.Request{
-				RemoteAddr: "192.168.0.50,192.168.0.1,127.0.0.1",
-			})).To(Equal("192.168.0.50"))
-
-			Expect(logger.ClientIP(&http.Request{
-				RemoteAddr: "192.168.0.50, 192.168.0.1, 127.0.0.1",
-			})).To(Equal("192.168.0.50"))
-		})
-	})
-
-	Context("ClientIPs", func() {
-		It("return array of client IPs", func() {
-			Expect(logger.ClientIPs(&http.Request{
-				RemoteAddr: "127.0.0.1",
-			})).To(ConsistOf(
-				"127.0.0.1",
-			))
-
-			Expect(logger.ClientIPs(&http.Request{
-				RemoteAddr: "192.168.0.1,127.0.0.1",
-			})).To(ConsistOf(
-				"192.168.0.1", "127.0.0.1",
-			))
-
-			Expect(logger.ClientIPs(&http.Request{
-				RemoteAddr: "192.168.0.1, 127.0.0.1",
-			})).To(ConsistOf(
-				"192.168.0.1", "127.0.0.1",
-			))
-
-			Expect(logger.ClientIPs(&http.Request{
-				RemoteAddr: "192.168.0.50,192.168.0.1,127.0.0.1",
-			})).To(ConsistOf(
-				"192.168.0.50", "192.168.0.1", "127.0.0.1",
-			))
-
-			Expect(logger.ClientIPs(&http.Request{
-				RemoteAddr: "192.168.0.50, 192.168.0.1, 127.0.0.1",
-			})).To(ConsistOf(
-				"192.168.0.50", "192.168.0.1", "127.0.0.1",
-			))
-		})
-	})
-
 	Context("LogRequests", func() {
 		var srv *httptest.Server
 		var client *http.Client