Fix geo details for viewers not showing on CDN connection (#3359)

* Added extraction of first IP address from X-FORWARDED-FOR header

* Added tests to the GetIPAddressFromRequest util method

---------

Co-authored-by: Aziz Rmadi <azizrmadi@Azizs-MacBook-Air.local>
This commit is contained in:
armadi1809
2023-10-15 17:43:07 -05:00
committed by GitHub
parent 77f23fdbf7
commit 3019995a6f
2 changed files with 35 additions and 1 deletions

View File

@@ -5,6 +5,7 @@ import (
"encoding/hex"
"net"
"net/http"
"strings"
log "github.com/sirupsen/logrus"
)
@@ -24,7 +25,13 @@ func GetIPAddressFromRequest(req *http.Request) string {
ipAddressString := req.RemoteAddr
xForwardedFor := req.Header.Get("X-FORWARDED-FOR")
if xForwardedFor != "" {
return xForwardedFor
clientIpString := strings.Split(xForwardedFor, ", ")[0]
ip, _, err := net.SplitHostPort(clientIpString)
if err != nil {
log.Errorln(err)
return ""
}
return ip
}
ip, _, err := net.SplitHostPort(ipAddressString)