3
0
mirror of https://github.com/ergochat/ergo.git synced 2024-11-10 22:19:31 +01:00

Merge pull request #740 from slingamn/proxy_dline

don't check the real IP for bans on proxy-before-TLS
This commit is contained in:
Shivaram Lingamneni 2020-01-09 04:42:46 -05:00 committed by GitHub
commit 68968d6868
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -222,7 +222,10 @@ func (server *Server) RunClient(conn clientConn, proxyLine string) {
isBanned, banMsg = server.checkTorLimits()
} else {
realIP = utils.AddrToIP(conn.Conn.RemoteAddr())
isBanned, banMsg = server.checkBans(realIP)
// skip the ban check for k8s-style proxy-before-TLS
if proxyLine == "" {
isBanned, banMsg = server.checkBans(realIP)
}
}
if isBanned {