lukas/Raid_Manager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix panic if invalid url

Browse Source
This commit is contained in:
lukas-heiligenbrunner 2022-12-21 19:00:54 +01:00
parent 6c3ee2fbe8
commit 75c0a61bf9
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/src/embed/mod.rs
View File

@ -1,7 +1,7 @@
use std::io::Cursor; use std::io::Cursor;
use rust_embed::RustEmbed; use rust_embed::{EmbeddedFile, RustEmbed};
use rocket::{Data, Request, Response, Route}; use rocket::{Data, Request, Response, Route};
use rocket::http::{ContentType, Method}; use rocket::http::{ContentType, Method, Status};
use rocket::http::uri::{Segments}; use rocket::http::uri::{Segments};
use rocket::http::uri::fmt::Path; use rocket::http::uri::fmt::Path;
use rocket::route::{Handler, Outcome}; use rocket::route::{Handler, Outcome};
@ -13,8 +13,7 @@ struct Asset;
#[cfg(feature = "static")] #[cfg(feature = "static")]
#[derive(Clone)] #[derive(Clone)]
pub struct CustomHandler { pub struct CustomHandler {}
}
#[cfg(feature = "static")] #[cfg(feature = "static")]
impl Into<Vec<Route>> for CustomHandler { impl Into<Vec<Route>> for CustomHandler {
@ -38,8 +37,12 @@ impl Handler for CustomHandler {
path path
}; };
let file_content = let file_content = <Asset as RustEmbed>::get(path.to_string_lossy().as_ref());
<Asset as RustEmbed>::get(path.to_string_lossy().as_ref()).unwrap(); let file_content = match file_content {
None => return Outcome::Failure(Status::NotFound),
Some(c) => c
};
let content_type: ContentType = path let content_type: ContentType = path
.extension() .extension()
.map(|x| x.to_string_lossy()) .map(|x| x.to_string_lossy())