index redirect with query string

Author: timzaak

docs/develop/change-log.md

@@ -1,4 +1,6 @@
 # Change Log
+### Version 2.2.3
+- fix: sub_path '' => '/', like GitHub pages
 
 ### Version 2.2.2
 

server/src/file_cache.rs

@@ -242,8 +242,8 @@ impl FileCache {
                     .or_else(|| result.get("index.htm"))
                     .cloned();
                 if let Some(v) = index_opt {
-                    // result.insert("".to_string(), v.clone());
-                    result.insert("/".to_string(), v);
+                    result.insert("".to_string(), v.clone());
+                    //result.insert("/".to_string(), v);
                 }
             }
         }

server/src/service.rs

@@ -64,12 +64,12 @@ pub async fn create_service(
         if !is_https {
             if let Some(port) = service_config.http_redirect_to_https {
                 let mut resp = Response::default();
-                let port = if port == 443 {
-                    "".to_string()
+                
+                let redirect_path = if port != 443 {
+                    format!("https://{host}{port}{uri}")
                 } else {
-                    format!(":{}", port)
+                    format!("https://{host}{uri}")
                 };
-                let redirect_path = format!("https://{host}{port}{}", uri);
                 resp.headers_mut()
                     .insert(LOCATION, redirect_path.parse().unwrap());
                 *resp.status_mut() = StatusCode::MOVED_PERMANENTLY;
@@ -80,8 +80,14 @@ pub async fn create_service(
         let path = uri.path();
         if domain_storage.check_if_empty_index(host, path) {
             let mut resp = Response::default();
+            let mut path = format!("{path}/");
+            if let Some(query) =  uri.query() {
+                path.push('?');
+                path.push_str(query);
+            }
+            let path = path.parse().unwrap();
             resp.headers_mut()
-                .insert(LOCATION, format!("{path}/").parse().unwrap());
+                .insert(LOCATION, path);
             *resp.status_mut() = StatusCode::MOVED_PERMANENTLY;
             return Ok(resp);
         }

test/config.test.conf

@@ -5,7 +5,7 @@ http {
 }
 
 # directory to store static web files. if you use docker, please mount a persistence volume for it.
-file_dir = "./test/data/"
+file_dir = "./tests/data/web"
 
 # enable cors, default is false, its implementation is simple now.
 # Access-Control-Allow-Origin: $ORIGIN

tests/tests/common.rs

@@ -1,6 +1,6 @@
 use reqwest::header::CACHE_CONTROL;
 use reqwest::redirect::Policy;
-use reqwest::{ClientBuilder, StatusCode};
+use reqwest::{ClientBuilder, StatusCode, Url};
 use spa_client::api::API;
 use std::path::{Path, PathBuf};
 use std::{env, fs, io};
@@ -140,6 +140,29 @@ pub async fn assert_files(
             );
         }
     }
+}
+pub async fn assert_index_redirect_correct(request_prefix: &str) {
+    let client = ClientBuilder::new()
+        .danger_accept_invalid_certs(true)
+        .redirect(Policy::none())
+        .build()
+        .unwrap();
+    let query = [("lang", "rust"), ("browser", "servo"), ("zh", "转义字符")];
+    let url = Url::parse_with_params(request_prefix,
+                           &query).unwrap();
+    println!("{}", url);
+    let path = url.path();
+    let query = url.query().unwrap();
+    let response= client.get(url.clone()).send().await.unwrap();
+    assert_eq!(response.status(),StatusCode::MOVED_PERMANENTLY);
+    assert_eq!(response.headers().get("location").unwrap().to_str().unwrap(),
+               format!("{path}/?{query}")
+    );
+    
+    
+    
+    
+    
 }
 pub async fn assert_files_no_exists(request_prefix: &str, check_path: Vec<&'static str>) {
     for file in check_path {

tests/tests/starter.rs

@@ -18,9 +18,10 @@ async fn start_server_and_client_upload_file() {
 
     run_server();
 
-    tokio::time::sleep(Duration::from_secs(2)).await;
+    tokio::time::sleep(Duration::from_secs(1)).await;
 
     upload_file_and_check(domain, request_prefix, 1, vec!["", "index.html"]).await;
+    assert_index_redirect_correct(request_prefix).await;
 
     assert_expired(
         request_prefix,
@@ -58,6 +59,7 @@ async fn start_server_with_single_domain() {
 
     tokio::time::sleep(Duration::from_secs(2)).await;
 
+    // assert_index_redirect_correct(request_prefix).await;  // http client would auto patch / to http://www.example.com => http://www.example.com/
     upload_file_and_check(domain, request_prefix, 1, vec!["", "index.html"]).await;
 
     assert_expired(