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

Clear all clippy warnings

Browse Source 
Additionally, HttpServer::new_from_fd has been marked as unsafe,
since the correctness of the unsafe call within the function
relies on the caller upholding an invariant

Signed-off-by: Patrick Roy <roypat@amazon.co.uk>
This commit is contained in:
Patrick Roy
2022-11-15 17:15:41 +00:00
committed by Alexandra Iordache
parent d2caafab0e
commit 43d5a1d4b0
8 changed files with 47 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/server.rs
View File

@@ -133,7 +133,7 @@ impl<T: Read + Write + ScmSocket> ClientConnection<T> {
let mut error_response = Response::new(Version::Http11, StatusCode::BadRequest);
error_response.set_body(Body::new(format!(
"{{ \"error\": \"{}\nAll previous unanswered requests will be dropped.\" }}",
inner.to_string()
inner
)));
self.connection.enqueue_response(error_response);
}
@@ -285,16 +285,17 @@ impl HttpServer {
/// Constructor for `HttpServer`.
///
/// Note that this function requires the socket_fd to be solely owned
/// Returns the newly formed `HttpServer`.
///
/// # Safety
/// This function requires the socket_fd to be solely owned
/// and not be associated with another File in the caller as it uses
/// the unsafe `UnixListener::from_raw_fd method`.
///
/// Returns the newly formed `HttpServer`.
///
/// # Errors
/// Returns an `IOError` when `epoll::create` fails.
pub fn new_from_fd(socket_fd: RawFd) -> Result<Self> {
let socket = unsafe { UnixListener::from_raw_fd(socket_fd) };
pub unsafe fn new_from_fd(socket_fd: RawFd) -> Result<Self> {
let socket = UnixListener::from_raw_fd(socket_fd);
let epoll = epoll::Epoll::new().map_err(ServerError::IOError)?;
Ok(HttpServer {
socket,
@@ -639,6 +640,8 @@ impl HttpServer {
#[cfg(test)]
mod tests {
#![allow(clippy::undocumented_unsafe_blocks)]
use super::*;
use std::io::{Read, Write};
use std::net::Shutdown;
@@ -764,7 +767,7 @@ mod tests {
let socket_listener = UnixListener::bind(path_to_socket.as_path()).unwrap();
let socket_fd = socket_listener.into_raw_fd();
let mut server = HttpServer::new_from_fd(socket_fd).unwrap();
let mut server = unsafe { HttpServer::new_from_fd(socket_fd).unwrap() };
server.start_server().unwrap();
// Test one incoming connection.