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

fix masking bug

Browse source 
IP.Mask() returns a new IP value, rather than modifying its target in place
This commit is contained in:
Shivaram Lingamneni 2019-02-05 01:44:58 -05:00
parent 1c23af8767
commit eb8f0e50df
2 changed files with 10 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

19
irc/connection_limits/throttler.go
View file

@ -88,19 +88,6 @@ type Throttler struct {
exemptedNets []net.IPNet
}
// maskAddr masks the given IPv4/6 address with our cidr limit masks.
func (ct *Throttler) maskAddr(addr net.IP) net.IP {
if addr.To4() == nil {
// IPv6 addr
addr = addr.Mask(ct.ipv6Mask)
} else {
// IPv4 addr
addr = addr.Mask(ct.ipv4Mask)
}
return addr
}
// ResetFor removes any existing count for the given address.
func (ct *Throttler) ResetFor(addr net.IP) {
ct.Lock()
@ -111,8 +98,7 @@ func (ct *Throttler) ResetFor(addr net.IP) {
}
// remove
ct.maskAddr(addr)
addrString := addr.String()
addrString := addrToKey(addr, ct.ipv4Mask, ct.ipv6Mask)
delete(ct.population, addrString)
}
@ -131,8 +117,7 @@ func (ct *Throttler) AddClient(addr net.IP) error {
}
// check throttle
ct.maskAddr(addr)
addrString := addr.String()
addrString := addrToKey(addr, ct.ipv4Mask, ct.ipv6Mask)
details := ct.population[addrString] // retrieve mutable throttle state from the map
// add in constant state to process the limiting operation