pcap: preserve capture and protocol source history

Port relevant PCAP implementation and regression snapshots from Craft Anything 34774fd3b3addd9c0537ec7890f2de939261911b.
This commit is contained in:
Afloat authored and Dylan M. Taylor committed 2026-11-17 08:37:52 -05:00
1 parent 32ed24dc73
commit 747080c659
4 files changed
+98 -10

No files matched your search

+31 -10
View File
@@ -10,6 +10,7 @@ use crate::FormatError;
use crate::bytes::Reader;
use serde::Serialize;
use std::collections::{BTreeMap, BTreeSet, HashMap};
use std::fmt::Write as _;
use std::net::{IpAddr, Ipv4Addr, Ipv6Addr};
/// Most accepted and rejected packet records read from one capture.
@@ -887,7 +888,18 @@ fn dns_name(msg: &[u8], mut off: usize, allow_compression: bool) -> Option<(Stri
if !out.is_empty() {
out.push('.');
}
out.extend(label.iter().map(|&c| if c.is_ascii_graphic() { char::from(c) } else { '?' }));
for &c in label {
match c {
b'.' | b'\\' => {
out.push('\\');
out.push(char::from(c));
}
c if c.is_ascii_graphic() => out.push(char::from(c)),
_ => {
let _ = write!(out, "\\{c:03}");
}
}
}
off += 1 + usize::from(l);
}
_ => return None,
@@ -1179,19 +1191,28 @@ pub fn strip_userinfo(target: &str) -> String {
fn tcp_app(p: &[u8], d: &mut Decoded) {
let head = p.get(..p.len().min(16 << 10)).unwrap_or(p);
let line_end = head.windows(2).position(|w| w == b"\r\n").unwrap_or(head.len().min(2048));
let line = String::from_utf8_lossy(head.get(..line_end.min(2048)).unwrap_or(&[])).into_owned();
if let Some(rest) = line.strip_prefix("HTTP/1.") {
let status = rest.split(' ').nth(1).and_then(|s| s.parse().ok());
let Some(line_end) = head.windows(2).position(|w| w == b"\r\n") else {
tls(p, d);
return;
};
let line = String::from_utf8_lossy(head.get(..line_end).unwrap_or(&[]));
let version = |v: &str| matches!(v.as_bytes(), [b'H', b'T', b'T', b'P', b'/', b'1', b'.', b'0'..=b'9']);
let mut parts = line.splitn(3, ' ');
let fields = (parts.next(), parts.next(), parts.next());
if let (Some(v), Some(code), reason) = fields
&& version(v)
&& matches!(code.as_bytes(), [b'1'..=b'5', b'0'..=b'9', b'0'..=b'9'])
&& reason.is_none_or(|text| text.bytes().all(|b| b == b'\t' || !b.is_ascii_control()))
{
d.protocols.push("http");
d.http =
Some(Http { kind: "response", method: None, target: None, status, version: format!("HTTP/1.{}", rest.chars().next().unwrap_or('?')), host: None });
d.http = Some(Http { kind: "response", method: None, target: None, status: code.parse().ok(), version: v.to_string(), host: None });
return;
}
let mut parts = line.splitn(3, ' ');
if let (Some(m), Some(t), Some(v)) = (parts.next(), parts.next(), parts.next())
if let (Some(m), Some(t), Some(v)) = fields
&& METHODS.contains(&m)
&& v.starts_with("HTTP/1.")
&& !t.is_empty()
&& !t.bytes().any(|b| b.is_ascii_control())
&& version(v)
{
let mut remaining = head.get(line_end + 2..).unwrap_or(&[]);
let mut host = None;
+13
View File
@@ -149,3 +149,16 @@ fn root_name_rdata_remains_valid() {
assert_eq!(dns.answers[1].value, "203.0.113.1");
}
}
#[test]
fn dns_label_escapes_distinguish_wire_names_in_question_and_answer_owners() {
let mut message = vec![0, 1, 0x81, 0x80, 0, 2, 0, 1, 0, 0, 0, 0];
message.extend(b"\x03a.b\x03\\\x00\xff\x00\x00\x01\x00\x01");
message.extend(b"\x01a\x01b\x03\\\x00\xff\x00\x00\x01\x00\x01");
message.extend([0xc0, 12, 0, 1, 0, 1, 0, 0, 0, 0, 0, 4, 1, 2, 3, 4]);
let dns = decode(101, &ipv4_pkt(17, [1; 4], [2; 4], &udp(53, 100, &message))).dns.unwrap();
assert!(!dns.incomplete);
assert_eq!(dns.questions[0].name, r"a\.b.\\\000\255");
assert_eq!(dns.questions[1].name, r"a.b.\\\000\255");
assert_eq!(dns.answers[0].name, dns.questions[0].name);
}
@@ -22,3 +22,46 @@ fn host_requires_a_complete_header_line_and_keeps_its_spelling() {
assert!(request(b"GET / HTTP/1.1\r\nHost: cut").host.is_none());
assert_eq!(request(b"GET / HTTP/1.1\r\nHost: Real.test\r\n\r\n").host.as_deref(), Some("Real.test"));
}
#[test]
fn http_evidence_needs_a_complete_start_line() {
for input in [
b"GET / HTTP/1.1".as_slice(),
b"GET / HTTP/1.1x\r\n",
b"GET / HTTP/1.1 extra\r\n",
b"GET HTTP/1.0\r\n",
b"GET /bad\tpath HTTP/1.1\r\n",
b"HTTP/1.garbage\r\n",
b"HTTP/1.1 20 OK\r\n",
b"HTTP/1.1 999 OK\r\n",
b"HTTP/1.1 200 OK",
b"HTTP/1.garbage 204\r\n\r\n",
b"HTTP/1.1 20\r\n\r\n",
b"HTTP/1.1 2040\r\n\r\n",
b"HTTP/1.1 999\r\n\r\n",
b"HTTP/1.1 2x4\r\n\r\n",
b"HTTP/1.1 204",
b"HTTP/1.1 204 bad\0reason\r\n\r\n",
] {
assert!(decode(101, &ipv4_pkt(6, [1; 4], [2; 4], &tcp(100, 80, 0x18, input))).http.is_none(), "{input:?}");
}
assert_eq!(request(b"GET / HTTP/1.0\r\n").version, "HTTP/1.0");
assert_eq!(request(b"HTTP/1.1 204 \r\n").status, Some(204));
assert_eq!(request(b"HTTP/1.1 403 Access denied\r\n").status, Some(403));
}
#[test]
fn responses_with_no_reason_phrase_still_keep_the_status_code() {
for (input, version, code) in
[(b"HTTP/1.1 204\r\n\r\n".as_slice(), "HTTP/1.1", 204), (b"HTTP/1.0 200\r\nContent-Length: 0\r\n\r\n".as_slice(), "HTTP/1.0", 200)]
{
let decoded = decode(101, &ipv4_pkt(6, [1; 4], [2; 4], &tcp(80, 100, 0x18, input)));
assert!(decoded.protocols.contains(&"http"));
let http = decoded.http.unwrap();
assert_eq!(http.kind, "response");
assert_eq!(http.version, version);
assert_eq!(http.status, Some(code));
assert!(http.method.is_none());
assert!(http.target.is_none());
}
}
@@ -64,3 +64,14 @@ fn big_endian_block_footers_use_the_sections_byte_order() {
data[end - 4..].copy_from_slice(&20u32.to_le_bytes());
assert!(!summarize(&data, &|| false).unwrap().warnings.is_empty());
}
#[test]
fn a_skipped_packet_before_the_first_interface_preserves_later_frames() {
let original = pcapng(&sample_frames());
let mut data = original[..28].to_vec();
data.extend(block(3, &[0; 4]));
data.extend(&original[28..]);
let summary = summarize(&data, &|| false).unwrap();
assert_eq!(summary.packets, 7);
assert!(summary.warnings.iter().any(|w| w.contains("undeclared interface")));
}