dearsky/ntfy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into user-account

Browse Source
This commit is contained in:
binwiederhier
2022-12-23 09:37:47 -05:00
parent b5e2c83fba 4e7e6e57fe
commit 7a507505aa
8 changed files with 1038 additions and 782 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/util.go
View File

@@ -101,7 +101,9 @@ func extractIPAddress(r *http.Request, behindProxy bool) netip.Addr {
ip, err = netip.ParseAddr(remoteAddr)
if err != nil {
ip = netip.IPv4Unspecified()
log.Warn("unable to parse IP (%s), new visitor with unspecified IP (0.0.0.0) created %s", remoteAddr, err)
if remoteAddr != "@" || !behindProxy { // RemoteAddr is @ when unix socket is used
log.Warn("unable to parse IP (%s), new visitor with unspecified IP (0.0.0.0) created %s", remoteAddr, err)
}
}
}
if behindProxy && strings.TrimSpace(r.Header.Get("X-Forwarded-For")) != "" {