fedserv/echoIRCd
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

connectban: clamp the IPv6 keep-hextets to >=1 — connectban_ipv6cidr between 1 and 15 made keep==0, so the z-line glob became "*" and banned every IPv6 address on the internet (and bucketed all v6 clients into one key); mirrors the v4 clamp(1,4)

Browse source
This commit is contained in:
Jean Chevronnet 2026-08-19 00:34:53 +00:00
parent c99f16f3e0
commit a4f4c29a8a
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/modules/connectban.rs
View file

@ -49,7 +49,9 @@ fn range_of(ip: IpAddr, v4cidr: u8, v6cidr: u8) -> (String, String) {
} }
IpAddr::V6(a) => { IpAddr::V6(a) => {
let segs = a.segments(); let segs = a.segments();
let keep = (v6cidr / 16).min(8) as usize; // keep at least one hextet, so a sub-/16 config can't collapse the ban
// mask to "*" and z-line every IPv6 address (mirrors the v4 clamp above).
let keep = (v6cidr / 16).clamp(1, 8) as usize;
if keep >= 8 { if keep >= 8 {
(format!("v6:{}", a), a.to_string()) (format!("v6:{}", a), a.to_string())
} else { } else {
@ -169,5 +171,8 @@ mod tests {
let ip: IpAddr = "2001:db8::1".parse().unwrap(); let ip: IpAddr = "2001:db8::1".parse().unwrap();
assert_eq!(range_of(ip, 32, 128).1, "2001:db8::1"); assert_eq!(range_of(ip, 32, 128).1, "2001:db8::1");
assert_eq!(range_of(ip, 32, 32).1, "2001:db8:*"); assert_eq!(range_of(ip, 32, 32).1, "2001:db8:*");
// a sub-/16 v6 prefix must keep at least one hextet, never collapse to "*"
assert_eq!(range_of(ip, 32, 8).1, "2001:*");
assert_ne!(range_of(ip, 32, 1).1, "*");
} }
} }