From fb9b0c67f54567fb7b59568034570ad6814e0da2 Mon Sep 17 00:00:00 2001
From: Trisha <trisha@virtusensetech.com>
Date: Fri, 25 Mar 2022 16:14:22 -0500
Subject: [PATCH] :heavy_plus_sign: add multi-root

---
 .../ptth_server/src/file_server/internal.rs   | 41 +++++++++++++------
 1 file changed, 29 insertions(+), 12 deletions(-)

diff --git a/crates/ptth_server/src/file_server/internal.rs b/crates/ptth_server/src/file_server/internal.rs
index bf99d11..bd2013c 100644
--- a/crates/ptth_server/src/file_server/internal.rs
+++ b/crates/ptth_server/src/file_server/internal.rs
@@ -257,21 +257,38 @@ struct RoutedPath <'a> {
 
 impl <'a> FileRoots <'a> {
 	fn route (self, input: &'a str) -> Result <Option <RoutedPath>, FileServerError> {
-		let path = match input.strip_prefix ("/files/") {
-			Some (x) => x,
-			None => return Ok (None),
-		};
-		
 		// TODO: There is totally a dir traversal attack in here somewhere
 		
-		let encoded_path = &path [0..];
+		if let Some (path) = input.strip_prefix ("/dirs/") {
+			if let Some ((dir, path)) = path.split_once ('/') {
+				let root = match self.dirs.get (dir) {
+					None => return Ok (None),
+					Some (x) => x,
+				};
+				
+				let path_s = percent_decode (path.as_bytes ()).decode_utf8 ().map_err (FileServerError::PathNotUtf8)?;
+				
+				return Ok (Some (RoutedPath {
+					root,
+					path_s,
+				}));
+			}
+			else {
+				return Ok (None);
+			}
+		}
+		if let Some (path) = input.strip_prefix ("/files/") {
+			let encoded_path = &path [0..];
+			
+			let path_s = percent_decode (encoded_path.as_bytes ()).decode_utf8 ().map_err (FileServerError::PathNotUtf8)?;
+			
+			return Ok (Some (RoutedPath {
+				root: self.files,
+				path_s,
+			}));
+		}
 		
-		let path_s = percent_decode (encoded_path.as_bytes ()).decode_utf8 ().map_err (FileServerError::PathNotUtf8)?;
-		
-		Ok (Some (RoutedPath {
-			root: self.files,
-			path_s,
-		}))
+		return Ok (None);
 	}
 }