Browse Source

Added a check for the port before calling the splitHostPort function (#3372)

Co-authored-by: Aziz Rmadi <azizrmadi@Azizs-MacBook-Air.local>
pull/3395/head
armadi1809 2 years ago committed by Gabe Kangas
parent
commit
7997f760b8
  1. 14
      utils/clientId.go

14
utils/clientId.go

@ -26,14 +26,16 @@ func GetIPAddressFromRequest(req *http.Request) string {
xForwardedFor := req.Header.Get("X-FORWARDED-FOR") xForwardedFor := req.Header.Get("X-FORWARDED-FOR")
if xForwardedFor != "" { if xForwardedFor != "" {
clientIpString := strings.Split(xForwardedFor, ", ")[0] clientIpString := strings.Split(xForwardedFor, ", ")[0]
ip, _, err := net.SplitHostPort(clientIpString) if strings.Contains(clientIpString, ":") {
if err != nil { ip, _, err := net.SplitHostPort(clientIpString)
log.Errorln(err) if err != nil {
return "" log.Errorln(err)
return ""
}
return ip
} }
return ip return clientIpString
} }
ip, _, err := net.SplitHostPort(ipAddressString) ip, _, err := net.SplitHostPort(ipAddressString)
if err != nil { if err != nil {
log.Errorln(err) log.Errorln(err)

Loading…
Cancel
Save