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

Http2 normalize host userinfo 6479 v1 #9762

Closed
wants to merge 1 commit into from
Closed

Http2 normalize host userinfo 6479 v1 #9762

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
53 changes: 41 additions & 12 deletions rust/src/http2/detect.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,13 +613,28 @@ fn http2_lower(value: &[u8]) -> Option<Vec<u8>> {
}

// returns a tuple with the value and its size
fn http2_normalize_host(value: &[u8]) -> (Option<Vec<u8>>, usize) {
match value.iter().position(|&x| x == b':') {
fn http2_normalize_host(value: &[u8]) -> Option<Vec<u8>> {
match value.iter().position(|&x| x == b'@') {
Some(i) => {
return (http2_lower(&value[..i]), i);
let value = &value[i+1..];
match value.iter().position(|&x| x == b':') {
Some(i) => {
return http2_lower(&value[..i]);
}
None => {
return http2_lower(value);
}
}
}
None => {
return (http2_lower(value), value.len());
match value.iter().position(|&x| x == b':') {
Some(i) => {
return http2_lower(&value[..i]);
}
None => {
return http2_lower(value);
}
}
}
}
}
Expand All @@ -632,20 +647,20 @@ pub unsafe extern "C" fn rs_http2_tx_get_host_norm(
let r = http2_normalize_host(value);
// r is a tuple with the value and its size
// this is useful when we only take a substring (before the port)
match r.0 {
match r {
Some(normval) => {
// In case we needed some normalization,
// the transaction needs to take ownership of this normalized host
tx.escaped.push(normval);
let idx = tx.escaped.len() - 1;
let resvalue = &tx.escaped[idx];
*buffer = resvalue.as_ptr(); //unsafe
*buffer_len = r.1 as u32;
*buffer_len = resvalue.len() as u32;
return 1;
}
None => {
*buffer = value.as_ptr(); //unsafe
*buffer_len = r.1 as u32;
*buffer_len = value.len() as u32;
return 1;
}
}
Expand Down Expand Up @@ -1008,7 +1023,7 @@ mod tests {
fn test_http2_normalize_host() {
let buf0 = "aBC.com:1234".as_bytes();
let r0 = http2_normalize_host(buf0);
match r0.0 {
match r0 {
Some(r) => {
assert_eq!(r, "abc.com".as_bytes().to_vec());
}
Expand All @@ -1018,22 +1033,36 @@ mod tests {
}
let buf1 = "oisf.net".as_bytes();
let r1 = http2_normalize_host(buf1);
match r1.0 {
match r1 {
Some(r) => {
panic!("Result should not have been None, not {:?}", r);
}
None => {}
}
assert_eq!(r1.1, "oisf.net".len());
let buf2 = "localhost:3000".as_bytes();
let r2 = http2_normalize_host(buf2);
match r2.0 {
match r2 {
Some(r) => {
panic!("Result should not have been None, not {:?}", r);
}
None => {}
}
let buf3 = "user:pass@localhost".as_bytes();
let r3 = http2_normalize_host(buf3);
match r3 {
Some(r) => {
panic!("Result should not have been None, not {:?}", r);
}
None => {}
}
let buf4 = "user:pass@localhost:123".as_bytes();
let r4 = http2_normalize_host(buf4);
match r4 {
Some(r) => {
panic!("Result should not have been None, not {:?}", r);
}
None => {}
}
assert_eq!(r2.1, "localhost".len());
}

#[test]
Expand Down
Loading