Skip to content
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

Jump to bottom

Add tests for {dns_name, ip_address}::presented_id_matches_constraint() #239

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Add tests for {dns_name, ip_address}::presented_id_matches_constraint() #239

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
a603e72
dns_name: Update assert string to new API
AlessandroBono Aug 9, 2021
d2b950f
dns_name: Add tests for `presented_id_matches_constraint`
AlessandroBono Aug 9, 2021
691ea4c
ip_address: Add tests for `presented_id_matches_constraint`
AlessandroBono Aug 10, 2021
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
66 changes: 61 additions & 5 deletions src/name/dns_name.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -785,11 +785,67 @@ mod tests {
untrusted::Input::from(reference),
);
assert_eq!(
actual_result,
expected_result,
"presented_dns_id_matches_reference_dns_id(\"{:?}\", IDRole::ReferenceID, \"{:?}\")",
presented,
reference
actual_result, expected_result,
"presented_id_matches_reference_id(\"{:?}\", \"{:?}\")",
presented, reference
);
}
}

const PRESENTED_MATCHES_CONTRAINT: &[(&[u8], &[u8], Option<bool>)] = &[
// No absolute presented IDs allowed
(b".", b"", None),
(b"www.example.com.", b"", None),
(b"www.example.com.", b"www.example.com.", None),
// No absolute contraints allowed
(b"www.example.com", b".", None),
(b"www.example.com", b"www.example.com.", None),
// No wildcard in constraints allowed
(b"www.example.com", b"*.example.com", None),
// No empty presented IDs allowed
(b"", b"", None),
// Empty constraints match everything allowed
(b"example.com", b"", Some(true)),
(b"*.example.com", b"", Some(true)),
// Constraints that start with a dot
(b"www.example.com", b".example.com", Some(true)),
(b"www.example.com", b".EXAMPLE.COM", Some(true)),
(b"www.example.com", b".axample.com", Some(false)),
(b"www.example.com", b".xample.com", Some(false)),
(b"www.example.com", b".exampl.com", Some(false)),
(b"badexample.com", b".example.com", Some(false)),
// Constraints that do not start with a dot
(b"www.example.com", b"example.com", Some(true)),
(b"www.example.com", b"EXAMPLE.COM", Some(true)),
(b"www.example.com", b"axample.com", Some(false)),
(b"www.example.com", b"xample.com", Some(false)),
(b"www.example.com", b"exampl.com", Some(false)),
(b"badexample.com", b"example.com", Some(false)),
// Presented IDs with wildcard
(b"*.example.com", b".example.com", Some(true)),
(b"*.example.com", b"example.com", Some(true)),
(b"*.example.com", b"www.example.com", Some(true)),
(b"*.example.com", b"www.EXAMPLE.COM", Some(true)),
(b"*.example.com", b"www.axample.com", Some(false)),
(b"*.example.com", b".xample.com", Some(false)),
(b"*.example.com", b"xample.com", Some(false)),
(b"*.example.com", b".exampl.com", Some(false)),
(b"*.example.com", b"exampl.com", Some(false)),
// Matching IDs
(b"www.example.com", b"www.example.com", Some(true)),
];

#[test]
fn presented_matches_constraint_test() {
for &(presented, constraint, expected_result) in PRESENTED_MATCHES_CONTRAINT {
let actual_result = presented_id_matches_constraint(
untrusted::Input::from(presented),
untrusted::Input::from(constraint),
);
assert_eq!(
actual_result, expected_result,
"presented_id_matches_constraint(\"{:?}\", \"{:?}\")",
presented, constraint
);
}
}
Expand Down
74 changes: 74 additions & 0 deletions src/name/ip_address.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,3 +62,77 @@ pub(super) fn presented_id_matches_constraint(

Ok(true)
}

#[cfg(test)]
mod tests {
use super::*;

const PRESENTED_MATCHES_CONTRAINT: &[(&str, &str, &str, Result<bool, Error>)] = &[
// Cannot mix IpV4 with IpV6 and viceversa
("2001:db8::", "8.8.8.8", "255.255.255.255", Ok(false)),
("8.8.8.8", "2001:db8::", "ffff::", Ok(false)),
// IpV4
("8.8.8.8", "8.8.8.8", "255.255.255.255", Ok(true)),
("8.8.8.9", "8.8.8.8", "255.255.255.255", Ok(false)),
("8.8.8.9", "8.8.8.8", "255.255.255.254", Ok(true)),
("8.8.8.10", "8.8.8.8", "255.255.255.254", Ok(false)),
("8.8.8.10", "8.8.8.8", "255.255.255.0", Ok(true)),
("8.8.15.10", "8.8.8.8", "255.255.248.0", Ok(true)),
("8.8.16.10", "8.8.8.8", "255.255.248.0", Ok(false)),
("8.8.16.10", "8.8.8.8", "255.255.0.0", Ok(true)),
("8.31.16.10", "8.8.8.8", "255.224.0.0", Ok(true)),
("8.32.16.10", "8.8.8.8", "255.224.0.0", Ok(false)),
("8.32.16.10", "8.8.8.8", "255.0.0.0", Ok(true)),
("63.32.16.10", "8.8.8.8", "192.0.0.0", Ok(true)),
("64.32.16.10", "8.8.8.8", "192.0.0.0", Ok(false)),
("64.32.16.10", "8.8.8.8", "0.0.0.0", Ok(true)),
// IpV6
("2001:db8::", "2001:db8::", "ffff:ffff::", Ok(true)),
("2001:db9::", "2001:db8::", "ffff:ffff::", Ok(false)),
("2001:db9::", "2001:db8::", "ffff:fffe::", Ok(true)),
("2001:dba::", "2001:db8::", "ffff:fffe::", Ok(false)),
("2001:dba::", "2001:db8::", "ffff:ff00::", Ok(true)),
("2001:dca::", "2001:db8::", "ffff:fe00::", Ok(true)),
("2001:fca::", "2001:db8::", "ffff:fe00::", Ok(false)),
("2001:fca::", "2001:db8::", "ffff:0000::", Ok(true)),
("2000:fca::", "2001:db8::", "fffe:0000::", Ok(true)),
("2003:fca::", "2001:db8::", "fffe:0000::", Ok(false)),
("2003:fca::", "2001:db8::", "ff00:0000::", Ok(true)),
("1003:fca::", "2001:db8::", "e000:0000::", Ok(false)),
("1003:fca::", "2001:db8::", "0000:0000::", Ok(true)),
];

#[cfg(feature = "std")]
#[test]
fn presented_matches_constraint_test() {
use std::boxed::Box;
use std::net::IpAddr;

for &(presented, constraint_address, constraint_mask, expected_result) in
PRESENTED_MATCHES_CONTRAINT
{
let presented_bytes: Box<[u8]> = match presented.parse::<IpAddr>().unwrap() {
IpAddr::V4(p) => Box::new(p.octets()),
IpAddr::V6(p) => Box::new(p.octets()),
};
let ca_bytes: Box<[u8]> = match constraint_address.parse::<IpAddr>().unwrap() {
IpAddr::V4(ca) => Box::new(ca.octets()),
IpAddr::V6(ca) => Box::new(ca.octets()),
};
let cm_bytes: Box<[u8]> = match constraint_mask.parse::<IpAddr>().unwrap() {
IpAddr::V4(cm) => Box::new(cm.octets()),
IpAddr::V6(cm) => Box::new(cm.octets()),
};
let constraint_bytes = [ca_bytes, cm_bytes].concat();
let actual_result = presented_id_matches_constraint(
untrusted::Input::from(&presented_bytes),
untrusted::Input::from(&constraint_bytes),
);
assert_eq!(
actual_result, expected_result,
"presented_id_matches_constraint(\"{:?}\", \"{:?}\")",
presented_bytes, constraint_bytes
);
}
}
}