IPv6 parity: - blacklist6_map (LPM trie, 20-byte key) and is_blacklisted6(); the native_v6 path now passes the port gate and the L4 checks instead of returning XDP_PASS early. - ban_cidr() covers V4 and V6; gateway bans by /32 or /128; subnet monitor bans v6 /64 prefixes; ban_ip() removed (dead code is a bug). - v6 TCP feeds prefix stats through prefix_key_from_v6 (subnet detector now sees IPv6); UDP policy=drop and detect_tcp_bypass apply to v6. - tests/xdp_ban_v6.rs and scripts/xdp_ipv6_smoke.sh (real netns/verifier). Bug fixes (both families): - Ban expiry compared SystemTime epoch-ns against bpf_ktime_get_ns(), so bans never expired. Userspace now writes CLOCK_MONOTONIC via xdp::monotonic_ns(); regression in tests/xdp_ban_clock.rs. - The L4 gate required sizeof(struct tcphdr) for every protocol, so short UDP datagrams bypassed the port gate and the blacklist. The minimum is now per-protocol (UDP 8 bytes); smoke covers it.
29 lines
1.2 KiB
Rust
29 lines
1.2 KiB
Rust
//! Часы бана: XDP сравнивает expiry с `bpf_ktime_get_ns()` (монотонные ns
|
||
//! с загрузки), поэтому userspace обязан писать то же самое. Регрессия:
|
||
//! раньше писался `SystemTime` (epoch ns ≈ 1.7e18), и бан не истекал никогда.
|
||
#![cfg(feature = "xdp")]
|
||
|
||
use rampart::xdp::monotonic_ns;
|
||
|
||
fn clock_monotonic_ns() -> u64 {
|
||
let mut ts = libc::timespec { tv_sec: 0, tv_nsec: 0 };
|
||
// SAFETY: `ts` — валидный writable `timespec`; CLOCK_MONOTONIC на Linux
|
||
// поддерживается всегда (xdp-фича собирается только под Linux).
|
||
let rc = unsafe { libc::clock_gettime(libc::CLOCK_MONOTONIC, &mut ts) };
|
||
assert_eq!(rc, 0, "clock_gettime(CLOCK_MONOTONIC) failed");
|
||
let secs = u64::try_from(ts.tv_sec).expect("tv_sec fits u64");
|
||
let nanos = u64::try_from(ts.tv_nsec).expect("tv_nsec fits u64");
|
||
secs * 1_000_000_000 + nanos
|
||
}
|
||
|
||
#[test]
|
||
fn ban_clock_is_monotonic_not_wall_clock() {
|
||
let expected = clock_monotonic_ns();
|
||
let got = monotonic_ns();
|
||
|
||
let diff = got.abs_diff(expected);
|
||
assert!(
|
||
diff < 5_000_000_000,
|
||
"monotonic_ns must read CLOCK_MONOTONIC: got {got}, expected ~{expected}"
|
||
);
|
||
}
|