Fix #56 by using net.SplitHostPort.

libstring/libstring.go

@@ -2,6 +2,7 @@
 package libstring
 
 import (
+	"net"
 	"net/http"
 	"strings"
 )
@@ -16,22 +17,15 @@ func StringInSlice(sliceString []string, needle string) bool {
 	return false
 }
 
-func ipAddrFromRemoteAddr(s string) string {
-	idx := strings.LastIndex(s, ":")
-	if idx == -1 {
-		return s
-	}
-	return s[:idx]
-}
-
 // RemoteIP finds IP Address given http.Request struct.
 func RemoteIP(ipLookups []string, forwardedForIndexFromBehind int, r *http.Request) string {
 	realIP := r.Header.Get("X-Real-IP")
 	forwardedFor := r.Header.Get("X-Forwarded-For")
 
 	for _, lookup := range ipLookups {
 		if lookup == "RemoteAddr" {
-			return ipAddrFromRemoteAddr(r.RemoteAddr)
+			ip, _, _ := net.SplitHostPort(r.RemoteAddr)
+			return ip
 		}
 		if lookup == "X-Forwarded-For" && forwardedFor != "" {
 			// X-Forwarded-For is potentially a list of addresses separated with ","

libstring/libstring_test.go

@@ -12,12 +12,6 @@ func TestStringInSlice(t *testing.T) {
 	}
 }
 
-func TestIPAddrFromRemoteAddr(t *testing.T) {
-	if ipAddrFromRemoteAddr("127.0.0.1:8989") != "127.0.0.1" {
-		t.Errorf("ipAddrFromRemoteAddr did not chop the port number correctly.")
-	}
-}
-
 func TestRemoteIPDefault(t *testing.T) {
 	ipLookups := []string{"RemoteAddr", "X-Real-IP"}
 	ipv6 := "2601:7:1c82:4097:59a0:a80b:2841:b8c8"