p/pukram-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow all image paths, only care about the ending

Browse Source
This commit is contained in:
p11 2023-12-07 19:24:33 +01:00
parent 4519c5c7ab
commit bba2c0a4f0
1 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main.rs
View File

@ -199,9 +199,14 @@ fn handle_connection(context: Arc<Mutex<Context>>, path: PathBuf, mut stream: Tc
(Some(pki_path), 1, path.to_string(), num) (Some(pki_path), 1, path.to_string(), num)
}; };
if relative_path.split('/').any(|name| name == "Images") { if let Some((_, ending)) = relative_path.rsplit_once('.') {
let path = path.to_path_buf(); let path = path.to_path_buf();
reply_image(stream, &relative_path, path); let ending = ending.to_lowercase();
match ending.as_ref() {
"jpg" => reply_image(stream, &relative_path, "jpeg", path),
"png" | "tiff" | "gif" | "jpeg" => reply_image(stream, &relative_path, &ending, path),
_ => fail(stream),
};
return; return;
} }
@ -251,23 +256,7 @@ fn handle_connection(context: Arc<Mutex<Context>>, path: PathBuf, mut stream: Tc
) )
} }
fn reply_image(mut stream: TcpStream, relative_path: &str, mut path: PathBuf) { fn reply_image(mut stream: TcpStream, relative_path: &str, image_type: &str, mut path: PathBuf) {
let Some((_, ending)) = relative_path.rsplit_once('.') else {
fail(stream);
return;
};
let ending = ending.to_lowercase();
let image_type = match ending.as_ref() {
"jpg" => "jpeg",
"png" | "tiff" | "gif" | "jpeg" => &ending,
_ => {
fail(stream);
return;
}
};
path.push(relative_path); path.push(relative_path);
let Ok(mut file) = File::open(path) else { let Ok(mut file) = File::open(path) else {
fail(stream); fail(stream);