Skip to content

Commit

Permalink
fix panic on none ascii headers
Browse files Browse the repository at this point in the history
None utf-8 or ascii headers should not
make a server panic, but return 400 BadRequest
instead.
  • Loading branch information
ririsoft committed Jan 4, 2021
1 parent b71e346 commit fe32ac2
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 1 deletion.
2 changes: 2 additions & 0 deletions src/server/decode.rs
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ where
req.set_version(Some(http_types::Version::Http1_1));

for header in httparse_req.headers.iter() {
// https://tools.ietf.org/html/rfc822#section-3.1
http_types::ensure_status!(!header.value.is_ascii(), 400, "None ascii header");
req.append_header(header.name, std::str::from_utf8(header.value)?);
}

Expand Down
33 changes: 32 additions & 1 deletion tests/server_decode.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ mod test_utils;
mod server_decode {
use super::test_utils::TestIO;
use async_std::io::prelude::*;
use http_types::headers::TRANSFER_ENCODING;
use http_types::Request;
use http_types::Result;
use http_types::Url;
use http_types::{headers::TRANSFER_ENCODING, StatusCode};
use pretty_assertions::assert_eq;

async fn decode_lines(lines: Vec<&str>) -> Result<Option<Request>> {
Expand Down Expand Up @@ -125,4 +125,35 @@ mod server_decode {

Ok(())
}

#[async_std::test]
async fn none_utf8_header() {
let s = vec![
b"GET / HTTP/1.1" as &[u8],
b"host: localhost:8080",
b"none-utf8-header: \xc3\x28",
b"",
b"",
]
.join(b"\r\n" as &[u8]);
let (mut client, server) = TestIO::new();
client.write_all(&s).await.unwrap();
client.close();
let err = async_h1::server::decode(server).await.unwrap_err();
assert_eq!(err.status(), StatusCode::BadRequest);
}

#[async_std::test]
async fn none_ascii_header() {
let err = decode_lines(vec![
"GET / HTTP/1.1",
"host: localhost:8080",
"none-ascii-header: élo",
"",
"",
])
.await
.unwrap_err();
assert_eq!(err.status(), StatusCode::BadRequest);
}
}

0 comments on commit fe32ac2

Please sign in to comment.