CEF/ergo
1
0
Fork 0
forked from External/ergo
Code Pull requests Activity

refactor [dk]lines, implement #144

Browse source
This commit is contained in:
Shivaram Lingamneni 2019-01-22 05:01:01 -05:00
parent f154ea9583
commit 6bdc6af186
6 changed files with 563 additions and 397 deletions
Download patch file Download diff file Expand all files Collapse all files

13
irc/server.go
View file

@ -285,11 +285,10 @@ func (server *Server) checkBans(ipaddr net.IP) (banned bool, message string) {
if err != nil {
// too many connections too quickly from client, tell them and close the connection
duration := server.connectionThrottler.BanDuration()
length := &IPRestrictTime{
Duration: duration,
Expires: time.Now().Add(duration),
if duration == 0 {
return false, ""
}
server.dlines.AddIP(ipaddr, length, server.connectionThrottler.BanMessage(), "Exceeded automated connection throttle", "auto.connection.throttler")
server.dlines.AddIP(ipaddr, duration, server.connectionThrottler.BanMessage(), "Exceeded automated connection throttle", "auto.connection.throttler")
// they're DLINE'd for 15 minutes or whatever, so we can reset the connection throttle now,
// and once their temporary DLINE is finished they can fill up the throttler again
@ -409,11 +408,7 @@ func (server *Server) tryRegister(c *Client) {
// check KLINEs
isBanned, info := server.klines.CheckMasks(c.AllNickmasks()...)
if isBanned {
reason := info.Reason
if info.Time != nil {
reason += fmt.Sprintf(" [%s]", info.Time.Duration.String())
}
c.Quit(fmt.Sprintf(c.t("You are banned from this server (%s)"), reason))
c.Quit(info.BanMessage(c.t("You are banned from this server (%s)")))
c.destroy(false)
return
}