CrispyPin/webserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

work around weird canonicalize() behaviour on windows

Browse source
This commit is contained in:
Crispy 2024-03-25 14:45:38 +01:00
parent 702a1dc024
commit 7f37d4a775
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main.rs
View file

@ -113,10 +113,18 @@ fn handle_request(request: String, stream: &mut TcpStream) -> bool {
fn get_file(request: Request) -> Option<(Content, bool)> { fn get_file(request: Request) -> Option<(Content, bool)> {
const MAX_SIZE: usize = 1024 * 1024 * 8; const MAX_SIZE: usize = 1024 * 1024 * 8;
let path = PathBuf::from(format!("./{}", &request.path)) let current_dir = env::current_dir().unwrap();
let path = current_dir
.join(request.path.strip_prefix('/')?)
.canonicalize() .canonicalize()
.ok()?; .ok()?;
if path.strip_prefix(env::current_dir().unwrap()).is_err() {
if path
.strip_prefix(current_dir.canonicalize().unwrap())
.is_err()
{
println!("illegal path: {}", request.path);
return None; return None;
} }