Skip to content

fix(nap_pmp): reject buffers that are too short on responses #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
divagant-martian merged 3 commits into from
Sep 8, 2025
Merged

fix(nap_pmp): reject buffers that are too short on responses #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
07ae937
reject buffers that are too short on responses
divagant-martian Sep 8, 2025
9bbc710
update tracing
divagant-martian Sep 8, 2025
437a9c1
update slab
divagant-martian Sep 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 12 additions & 46 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 9 additions & 5 deletions portmapper/src/nat_pmp/protocol/response.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,11 @@ impl Response {
pub const RESPONSE_INDICATOR: u8 = 1u8 << 7;

/// Decode a map response.
fn decode_map(buf: &[u8], proto: MapProtocol) -> Response {
fn decode_map(buf: &[u8], proto: MapProtocol) -> Result<Self, Error> {
if buf.len() != Self::MAX_SIZE {
return Err(MalformedSnafu.build());
}

let epoch_bytes = buf[4..8].try_into().expect("slice has the right len");
let epoch_time = u32::from_be_bytes(epoch_bytes);

Expand All @@ -128,13 +132,13 @@ impl Response {
let lifetime_bytes = buf[12..16].try_into().expect("slice has the right len");
let lifetime_seconds = u32::from_be_bytes(lifetime_bytes);

Response::PortMap {
Ok(Response::PortMap {
proto,
epoch_time,
private_port,
external_port,
lifetime_seconds,
}
})
}

/// Decode a response.
Expand Down Expand Up @@ -176,8 +180,8 @@ impl Response {
public_ip: ip_bytes.into(),
}
}
Opcode::MapUdp => Self::decode_map(buf, MapProtocol::Udp),
Opcode::MapTcp => Self::decode_map(buf, MapProtocol::Tcp),
Opcode::MapUdp => Self::decode_map(buf, MapProtocol::Udp)?,
Opcode::MapTcp => Self::decode_map(buf, MapProtocol::Tcp)?,
};

Ok(response)
Expand Down
Loading