Skip to content

fix(parsing): Handling wrong timestamps in dnstap-parser #23048

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
pront merged 2 commits into from
May 15, 2025
Merged

fix(parsing): Handling wrong timestamps in dnstap-parser #23048

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc3572c
fix(parsing): Handling wrong timestamps in dnstap-parser
wooffie May 14, 2025
d383309
Add tests and changelog
wooffie May 15, 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
26 changes: 21 additions & 5 deletions lib/dnstap-parser/src/parser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ impl DnstapParser {
dnstap_message_type_id,
dnstap_message.query_message.as_ref(),
&DNSTAP_MESSAGE_REQUEST_TYPE_IDS,
);
)?;
}

if let Some(response_time_sec) = dnstap_message.response_time_sec {
Expand All @@ -248,7 +248,7 @@ impl DnstapParser {
dnstap_message_type_id,
dnstap_message.response_message.as_ref(),
&DNSTAP_MESSAGE_RESPONSE_TYPE_IDS,
);
)?;
}

DnstapParser::parse_dnstap_message_type(
Expand Down Expand Up @@ -366,10 +366,25 @@ impl DnstapParser {
dnstap_message_type_id: i32,
message: Option<&Vec<u8>>,
type_ids: &HashSet<i32>,
) {
) -> Result<()> {
let (time_in_nanosec, query_time_nsec) = match time_nsec {
Some(nsec) => (time_sec as i64 * 1_000_000_000_i64 + nsec as i64, nsec),
None => (time_sec as i64 * 1_000_000_000_i64, 0),
Some(nsec) => {
if let Some(time_in_ns) = (time_sec as i64)
.checked_mul(1_000_000_000)
.and_then(|v| v.checked_add(nsec as i64))
{
(time_in_ns, nsec)
} else {
return Err(Error::from("Cannot parse timestamp"));
}
}
None => {
if let Some(time_in_ns) = (time_sec as i64).checked_mul(1_000_000_000) {
(time_in_ns, 0)
} else {
return Err(Error::from("Cannot parse timestamp"));
}
}
};

if type_ids.contains(&dnstap_message_type_id) {
Expand All @@ -392,6 +407,7 @@ impl DnstapParser {
"ns",
);
}
Ok(())
}

fn parse_dnstap_message_socket_family<'a>(
Expand Down
Loading