mirror of
				https://github.com/dani-garcia/vaultwarden.git
				synced 2025-10-31 10:18:19 +02:00 
			
		
		
		
	Protect namedfile against path traversal, rocket only does it for pathbuf
This commit is contained in:
		
							
								
								
									
										33
									
								
								src/util.rs
									
									
									
									
									
								
							
							
						
						
									
										33
									
								
								src/util.rs
									
									
									
									
									
								
							| @@ -5,7 +5,8 @@ use std::io::Cursor; | ||||
|  | ||||
| use rocket::{ | ||||
|     fairing::{Fairing, Info, Kind}, | ||||
|     http::{ContentType, Header, HeaderMap, Method, Status}, | ||||
|     http::{ContentType, Header, HeaderMap, Method, RawStr, Status}, | ||||
|     request::FromParam, | ||||
|     response::{self, Responder}, | ||||
|     Data, Request, Response, Rocket, | ||||
| }; | ||||
| @@ -125,6 +126,36 @@ impl<'r, R: Responder<'r>> Responder<'r> for Cached<R> { | ||||
|     } | ||||
| } | ||||
|  | ||||
| pub struct SafeString(String); | ||||
|  | ||||
| impl std::fmt::Display for SafeString { | ||||
|     fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result { | ||||
|         self.0.fmt(f) | ||||
|     } | ||||
| } | ||||
|  | ||||
| impl AsRef<Path> for SafeString { | ||||
|     #[inline] | ||||
|     fn as_ref(&self) -> &Path { | ||||
|         Path::new(&self.0) | ||||
|     } | ||||
| } | ||||
|  | ||||
| impl<'r> FromParam<'r> for SafeString { | ||||
|     type Error = (); | ||||
|  | ||||
|     #[inline(always)] | ||||
|     fn from_param(param: &'r RawStr) -> Result<Self, Self::Error> { | ||||
|         let s = param.percent_decode().map(|cow| cow.into_owned()).map_err(|_| ())?; | ||||
|  | ||||
|         if s.chars().all(|c| matches!(c, 'a'..='z' | 'A'..='Z' |'0'..='9' | '-')) { | ||||
|             Ok(SafeString(s)) | ||||
|         } else { | ||||
|             Err(()) | ||||
|         } | ||||
|     } | ||||
| } | ||||
|  | ||||
| // Log all the routes from the main paths list, and the attachments endpoint | ||||
| // Effectively ignores, any static file route, and the alive endpoint | ||||
| const LOGGED_ROUTES: [&str; 6] = | ||||
|   | ||||
		Reference in New Issue
	
	Block a user