kata-containers/micro-http
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

forbid GET requests with body content

Browse Source 
Signed-off-by: Luminita Voicu <lumivo@amazon.com>
This commit is contained in:
Luminita Voicu
2021-07-07 11:12:04 +03:00
parent 83dcfdd22b
commit 7f3a14f16f
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/request.rs
View File

@@ -236,6 +236,9 @@ impl Request {
None
}
content_length => {
if request_line.method == Method::Get {
return Err(RequestError::InvalidRequest);
}
// Multiplication is safe because `CRLF_LEN` is a small constant.
// Addition is also safe because `headers_end` started out as the result
// of `find(<something>, CRLFCRLF)`, then `CRLF_LEN` was subtracted from it.
@@ -456,6 +459,15 @@ mod tests {
RequestError::InvalidRequest
);
// Test for invalid Request (`GET` requests should have no body).
let request_bytes = b"GET /machine-config HTTP/1.1\r\n\
Content-Length: 13\r\n\
Content-Type: application/json\r\n\r\nwhatever body";
assert_eq!(
Request::try_from(request_bytes).unwrap_err(),
RequestError::InvalidRequest
);
// Test for a request with the headers we are looking for.
let request = Request::try_from(
b"PATCH http://localhost/home HTTP/1.1\r\n\

12
src/server.rs
View File

@@ -754,8 +754,7 @@ mod tests {
second_socket
.write_all(
b"GET /machine-config HTTP/1.1\r\n\
Content-Length: 20\r\n\
Content-Type: application/json\r\n\r\nwhatever second body",
Content-Type: application/json\r\n\r\n",
)
.unwrap();
@@ -766,8 +765,7 @@ mod tests {
second_server_request.request,
Request::try_from(
b"GET /machine-config HTTP/1.1\r\n\
Content-Length: 20\r\n\
Content-Type: application/json\r\n\r\nwhatever second body"
Content-Type: application/json\r\n\r\n"
)
.unwrap()
);
@@ -980,8 +978,7 @@ mod tests {
second_socket
.write_all(
b"GET /machine-config HTTP/1.1\r\n\
Content-Length: 20\r\n\
Content-Type: application/json\r\n\r\nwhatever second body",
Content-Type: application/json\r\n\r\n",
)
.unwrap();
@@ -992,8 +989,7 @@ mod tests {
second_server_request.request,
Request::try_from(
b"GET /machine-config HTTP/1.1\r\n\
Content-Length: 20\r\n\
Content-Type: application/json\r\n\r\nwhatever second body"
Content-Type: application/json\r\n\r\n"
)
.unwrap()
);