add option to not ignore query params

src/main.rs

@@ -13,13 +13,32 @@ enum ResponseCode {
     NotFound,
 }
 
-/// Remove query parameters and trailing slashes.
-/// Makes all paths lowercase.
-fn normalise_path(path: &str) -> String {
-    let mut path = path
+#[derive(Clone, Copy)]
+struct Config {
+    ignore_query_params: bool,
+}
+
+impl Default for Config {
+    fn default() -> Self {
+        Self {
+            ignore_query_params: match env::var("URLS_TXT_IGNORE_QUERY_PARAMS") {
+                Ok(val) => val != "false",
+                _ => true,
+            }
+        }
+    }
+}
+
+fn normalise_path(path: &str, config: &Config) -> String {
+    let mut path = path;
+
+    if config.ignore_query_params {
+        path = path
         .split('?')
         .next()
         .expect("split operation returns at least one substring");
+    }
+
     while path.len() > 1
         && let Some('/') = path.chars().next_back()
     {
@@ -49,7 +68,7 @@ async fn simple_response(mut socket: BufStream<TcpStream>, rc: ResponseCode) {
     };
 }
 
-async fn process_socket(mut socket: BufStream<TcpStream>, urlmap: Arc<HashMap<String, String>>) {
+async fn process_socket(mut socket: BufStream<TcpStream>, urlmap: Arc<HashMap<String, String>>, config: &Config) {
     let mut request_line = String::default();
     if let Err(e) = socket.read_line(&mut request_line).await {
         println!("process_request: failed to read line: {e}");
@@ -63,7 +82,7 @@ async fn process_socket(mut socket: BufStream<TcpStream>, urlmap: Arc<HashMap<St
         return;
     };
 
-    let path = normalise_path(path);
+    let path = normalise_path(path, config);
 
     if http_method != "GET" {
         println!("process_request: forbidden method: http_method={http_method}");
@@ -110,9 +129,11 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         }
     };
 
-    let config = spawn_blocking(move || std::fs::read_to_string(urls_filename)).await??;
+    let config = Config::default();
+
+    let urls_file = spawn_blocking(move || std::fs::read_to_string(urls_filename)).await??;
     let mut urlmap = HashMap::new();
-    for url_pair in config.split('\n') {
+    for url_pair in urls_file.split('\n') {
         if url_pair.is_empty() {
             continue;
         }
@@ -132,7 +153,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
             Err(format!("Unable to parse line: '{}'", url_pair))?
         };
 
-        urlmap.insert(normalise_path(slug), redirect.to_string());
+        urlmap.insert(normalise_path(slug, &config), redirect.to_string());
     }
 
     let urlmap = Arc::new(urlmap);
@@ -143,7 +164,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         let (socket, _addr) = listener.accept().await?;
         let urlmap = urlmap.clone();
         tokio::spawn(async move {
-            process_socket(BufStream::new(socket), urlmap).await;
+            process_socket(BufStream::new(socket), urlmap, &config).await;
         });
     }
 }