Files
soulseek-rs-modded/soulseek-rs/src/port_mapping/nat_pmp.rs
T
Michel de Graaf f1b667f7f9 refactor: cut what a whole-repo audit proved dead, padded, or hand-rolled
Seven region audits, every finding adversarially verified against the
whole workspace before being applied; 80 landed and the two that failed
in application were refuted honestly (ParseError has a from_str_radix
producer the audit missed; NatPmpError's Display is the only reader of
its diagnostic payloads).

The bigger cuts:

- The NewPeer/PierceFireWall cluster: an operation variant nothing ever
  sent, its 77-line arm, a protocol-wrong Client::pierce_firewall that
  wrote a peer-init frame down the server socket, and the struct only
  they used. The live paths in peer/listen.rs are untouched.
- The ops loop reads `for operation in reader` instead of hand-rolling
  recv/break, de-indenting the whole dispatch body.
- Dead lib surface: Message::print_hex and four unused accessors,
  UploadFailed, registry and actor getters, build_watch_user,
  strip_ansi_codes, delegating shims on ClientContext. Removing public
  items makes this a semver major, which the release pipeline enforces.
- Never-used flexibility: the state-migration framework that never held
  a migration, border-type helpers that all answered Rounded, the TUI's
  max_concurrent_downloads field nothing read.
- Convergence: six poll loops into poll_until, three wrap-around
  navigation blocks into cycle, hit tests into Rect::contains, char
  walkers into floor/ceil_char_boundary, five Download literals into
  one helper, the suites' shared scaffolding into tests/common.

Deliberately not taken: swapping the hand-rolled zlib inflate and MD5
for crates (they replace wire-facing machinery whose tolerance of
real-world peer quirks no local test exercises) and pulling chrono into
the lib for a log timestamp. Recorded for their own decision.

Net -1002 lines. Both e2e modes stay green: 94 CLI tests each way, 16
protocol, 33 lib, unit suites, clippy pedantic clean, aislop 100/100
with the four scanner false positives suppressed inline where they
fire.
2026-07-28 12:52:18 +02:00

350 lines
12 KiB
Rust

//! Hand-rolled NAT-PMP (RFC 6886) over `std::net::UdpSocket`, no dependencies.
//!
//! The gateway address is always passed in as a `SocketAddr`, so tests point it
//! at an in-process mock gateway on `127.0.0.1`. Only [`default_gateway`] touches
//! the OS routing table.
use std::io;
use std::net::{Ipv4Addr, SocketAddr, UdpSocket};
use std::time::Duration;
/// The well-known NAT-PMP gateway UDP port.
pub const NAT_PMP_PORT: u16 = 5351;
const PROTO_VERSION: u8 = 0;
const OP_MAP_TCP: u8 = 2;
const RESPONSE_FLAG: u8 = 128; // response opcode == request opcode + 128
/// RFC-recommended mapping lifetime (2 hours).
pub const RECOMMENDED_LIFETIME: u32 = 7200;
#[derive(Debug)]
pub enum NatPmpError {
Io(io::Error),
ShortResponse,
BadVersion(u8),
BadOpcode(u8),
/// A non-zero RFC 6886 result code (1..=5).
ResultCode(u16),
/// Every retransmission timed out.
NoResponse,
}
impl std::fmt::Display for NatPmpError {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
match self {
Self::Io(e) => write!(f, "network error: {e}"),
Self::ShortResponse => write!(f, "truncated gateway response"),
Self::BadVersion(v) => write!(f, "unexpected version {v}"),
Self::BadOpcode(o) => write!(f, "unexpected opcode {o}"),
Self::ResultCode(c) => write!(f, "gateway result code {c}"),
Self::NoResponse => write!(f, "no response from gateway"),
}
}
}
impl From<io::Error> for NatPmpError {
fn from(e: io::Error) -> Self {
Self::Io(e)
}
}
/// A successful TCP mapping. The gateway may grant a different external port or
/// a shorter lifetime than requested, so callers must use these values.
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub struct MapResponse {
pub internal_port: u16,
pub external_port: u16,
pub lifetime: u32,
}
/// Request (or, with `lifetime == 0`, remove) a TCP port mapping from the
/// NAT-PMP gateway at `gateway`. `attempts` bounds the retransmissions; RFC 6886
/// allows up to 9 (~64s), but an interactive tool should pass a smaller number
/// so a non-NAT-PMP router doesn't stall for a minute.
///
/// # Errors
/// Returns a [`NatPmpError`] on I/O failure, a malformed/short reply, a non-zero
/// gateway result code, or if no reply arrives within `attempts` retransmits.
pub fn map_tcp(
gateway: SocketAddr,
internal_port: u16,
suggested_external: u16,
lifetime: u32,
attempts: u32,
) -> Result<MapResponse, NatPmpError> {
let mut request = Vec::with_capacity(12);
request.push(PROTO_VERSION);
request.push(OP_MAP_TCP);
request.extend_from_slice(&[0, 0]); // reserved
request.extend_from_slice(&internal_port.to_be_bytes());
request.extend_from_slice(&suggested_external.to_be_bytes());
request.extend_from_slice(&lifetime.to_be_bytes());
let response = transact(gateway, &request, OP_MAP_TCP, attempts)?;
if response.len() < 16 {
return Err(NatPmpError::ShortResponse);
}
Ok(MapResponse {
internal_port: u16::from_be_bytes([response[8], response[9]]),
external_port: u16::from_be_bytes([response[10], response[11]]),
lifetime: u32::from_be_bytes([
response[12],
response[13],
response[14],
response[15],
]),
})
}
/// Remove a TCP mapping for `internal_port` (external port 0, lifetime 0).
///
/// # Errors
/// As [`map_tcp`].
pub fn unmap_tcp(
gateway: SocketAddr,
internal_port: u16,
attempts: u32,
) -> Result<(), NatPmpError> {
map_tcp(gateway, internal_port, 0, 0, attempts).map(|_| ())
}
/// Send `request` to `gateway` and return the validated response body, retrying
/// with RFC 6886's 250ms exponential backoff up to `attempts` times.
fn transact(
gateway: SocketAddr,
request: &[u8],
expected_op: u8,
attempts: u32,
) -> Result<Vec<u8>, NatPmpError> {
let socket = UdpSocket::bind((Ipv4Addr::UNSPECIFIED, 0))?;
socket.connect(gateway)?;
let mut timeout = Duration::from_millis(250);
let mut buf = [0u8; 32];
for _ in 0..attempts.max(1) {
socket.send(request)?;
socket.set_read_timeout(Some(timeout))?;
match socket.recv(&mut buf) {
Ok(n) => {
let response = &buf[..n];
if response.len() < 4 {
return Err(NatPmpError::ShortResponse);
}
if response[0] != PROTO_VERSION {
return Err(NatPmpError::BadVersion(response[0]));
}
if response[1] != expected_op + RESPONSE_FLAG {
return Err(NatPmpError::BadOpcode(response[1]));
}
let result = u16::from_be_bytes([response[2], response[3]]);
if result != 0 {
return Err(NatPmpError::ResultCode(result));
}
return Ok(response.to_vec());
}
Err(e)
if matches!(
e.kind(),
io::ErrorKind::WouldBlock | io::ErrorKind::TimedOut
) =>
{
timeout = timeout.saturating_mul(2);
}
Err(e) => return Err(NatPmpError::Io(e)),
}
}
Err(NatPmpError::NoResponse)
}
/// Best-effort discovery of the IPv4 default-gateway address from the OS routing
/// table. Supports macOS and Linux; returns `None` elsewhere or on any parse
/// failure (callers should treat NAT-PMP as unavailable then).
#[must_use]
pub fn default_gateway() -> Option<Ipv4Addr> {
#[cfg(target_os = "macos")]
{
let out = std::process::Command::new("route")
.args(["-n", "get", "default"])
.output()
.ok()?;
parse_macos_default_gateway(&String::from_utf8_lossy(&out.stdout))
}
#[cfg(target_os = "linux")]
{
let text = std::fs::read_to_string("/proc/net/route").ok()?;
parse_linux_default_gateway(&text)
}
#[cfg(not(any(target_os = "macos", target_os = "linux")))]
{
None
}
}
/// Parse the gateway IP from `route -n get default` output (macOS).
#[cfg(any(target_os = "macos", test))]
#[must_use]
fn parse_macos_default_gateway(output: &str) -> Option<Ipv4Addr> {
output.lines().find_map(|line| {
line.trim().strip_prefix("gateway:")?.trim().parse().ok()
})
}
/// Parse the IPv4 default gateway from the contents of `/proc/net/route`
/// (Linux). Fields are whitespace-separated; the default route has Destination
/// `00000000` and stores the Gateway as a little-endian hex u32. A `00000000`
/// (unspecified) gateway is a directly-connected route with no next hop, so it
/// is skipped rather than returned as `0.0.0.0`.
#[cfg(any(target_os = "linux", test))]
#[must_use]
fn parse_linux_default_gateway(contents: &str) -> Option<Ipv4Addr> {
contents.lines().skip(1).find_map(|line| {
let mut fields = line.split_whitespace();
let _iface = fields.next()?;
let destination = fields.next()?;
let gateway = fields.next()?;
if destination != "00000000" {
return None;
}
let raw = u32::from_str_radix(gateway, 16).ok()?;
(raw != 0).then(|| Ipv4Addr::from(raw.to_le_bytes()))
})
}
#[cfg(test)]
mod tests {
use super::*;
use std::sync::mpsc;
use std::thread;
/// A minimal in-process NAT-PMP gateway for tests. It receives one request,
/// hands the raw bytes back to the test, and replies with `reply`.
fn mock_gateway(reply: Vec<u8>) -> (SocketAddr, mpsc::Receiver<Vec<u8>>) {
let socket = UdpSocket::bind((Ipv4Addr::LOCALHOST, 0)).unwrap();
let addr = socket.local_addr().unwrap();
let (tx, rx) = mpsc::channel();
thread::spawn(move || {
let mut buf = [0u8; 64];
if let Ok((n, from)) = socket.recv_from(&mut buf) {
let _ = tx.send(buf[..n].to_vec());
let _ = socket.send_to(&reply, from);
}
});
(addr, rx)
}
fn map_reply(
result: u16,
internal: u16,
external: u16,
lifetime: u32,
) -> Vec<u8> {
let mut r = vec![PROTO_VERSION, OP_MAP_TCP + RESPONSE_FLAG];
r.extend_from_slice(&result.to_be_bytes());
r.extend_from_slice(&123u32.to_be_bytes()); // epoch
r.extend_from_slice(&internal.to_be_bytes());
r.extend_from_slice(&external.to_be_bytes());
r.extend_from_slice(&lifetime.to_be_bytes());
r
}
#[test]
fn map_tcp_sends_correct_request_and_parses_response() {
// Gateway grants a DIFFERENT external port and a SHORTER lease than asked.
let (gateway, requests) = mock_gateway(map_reply(0, 2234, 40000, 3600));
let resp = map_tcp(gateway, 2234, 2234, 7200, 3)
.expect("mapping should succeed");
// The request bytes must match the RFC 6886 map-TCP layout.
let req = requests.recv().unwrap();
assert_eq!(req.len(), 12);
assert_eq!(req[0], 0, "version");
assert_eq!(req[1], 2, "opcode TCP");
assert_eq!(&req[2..4], &[0, 0], "reserved");
assert_eq!(u16::from_be_bytes([req[4], req[5]]), 2234, "internal port");
assert_eq!(
u16::from_be_bytes([req[6], req[7]]),
2234,
"suggested external"
);
assert_eq!(
u32::from_be_bytes([req[8], req[9], req[10], req[11]]),
7200,
"lifetime"
);
// The response's granted values (not the requested ones) are returned.
assert_eq!(resp.external_port, 40000);
assert_eq!(resp.lifetime, 3600);
assert_eq!(resp.internal_port, 2234);
}
#[test]
fn map_tcp_surfaces_gateway_result_code() {
// Result code 2 = "not authorized/refused" per RFC 6886.
let (gateway, _req) = mock_gateway(map_reply(2, 2234, 0, 0));
match map_tcp(gateway, 2234, 2234, 7200, 3) {
Err(NatPmpError::ResultCode(2)) => {}
other => panic!("expected ResultCode(2), got {other:?}"),
}
}
#[test]
fn map_tcp_times_out_when_gateway_is_silent() {
// Bind a socket but never reply: the mapper must give up, not hang.
let dead = UdpSocket::bind((Ipv4Addr::LOCALHOST, 0)).unwrap();
let addr = dead.local_addr().unwrap();
drop(dead); // nothing listening now
match map_tcp(addr, 2234, 2234, 7200, 2) {
Err(NatPmpError::NoResponse | NatPmpError::Io(_)) => {}
other => panic!("expected timeout/io error, got {other:?}"),
}
}
#[test]
fn parses_macos_default_gateway() {
let output = " route to: default\ndestination: default\n mask: default\n gateway: 192.168.1.254\n interface: en0\n";
assert_eq!(
parse_macos_default_gateway(output),
Some(Ipv4Addr::new(192, 168, 1, 254))
);
// No default route → None.
assert_eq!(parse_macos_default_gateway("interface: en0\n"), None);
}
#[test]
fn parses_linux_default_gateway_and_skips_unspecified() {
// Header + a directly-connected default (gateway 00000000) that must be
// skipped + the real default route (192.168.0.1 => 0100A8C0 LE).
let contents = "Iface\tDestination\tGateway\tFlags\tRefCnt\tUse\tMetric\tMask\n\
tun0\t00000000\t00000000\t0001\t0\t0\t0\t00000000\n\
eth0\t00000000\t0100A8C0\t0003\t0\t0\t100\t00000000\n\
eth0\t0000A8C0\t00000000\t0001\t0\t0\t0\t00FFFFFF\n";
assert_eq!(
parse_linux_default_gateway(contents),
Some(Ipv4Addr::new(192, 168, 0, 1))
);
// Only a gateway-less default route → None (not 0.0.0.0).
let only_direct = "Iface\tDestination\tGateway\tFlags\n\
tun0\t00000000\t00000000\t0001\n";
assert_eq!(parse_linux_default_gateway(only_direct), None);
}
#[test]
fn unmap_sends_zero_lifetime_and_port() {
let (gateway, requests) = mock_gateway(map_reply(0, 2234, 0, 0));
unmap_tcp(gateway, 2234, 3).expect("unmap should succeed");
let req = requests.recv().unwrap();
assert_eq!(
u16::from_be_bytes([req[6], req[7]]),
0,
"external port 0 to delete"
);
assert_eq!(
u32::from_be_bytes([req[8], req[9], req[10], req[11]]),
0,
"lifetime 0 to delete"
);
}
}