Navy.gif/owncast
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Co-authored-by: Aziz Rmadi <azizrmadi@Azizs-MacBook-Air.local>
This commit is contained in:
armadi1809 2023-10-18 19:01:03 -05:00 committed by GitHub
parent 47d5b3c92f
commit 6b27d850d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
utils/clientId.go
View File

@ -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)