bakg

timzaak · timzaak · commit c7bdf2e1b0e5 · 2024-06-24T18:10:03.000+08:00
diff --git a/.github/workflows/spa-server-ci.yml b/.github/workflows/spa-server-ci.yml
@@ -28,17 +28,15 @@ jobs:
         with:
           path: ~/.cargo/git
           key: cargo-index-trimmed-${{ hashFiles('**/Cargo.lock') }}
-      - name: build all
-        run: cargo build
-      - name: run spa-client test
-        run: cargo test -p spa-client
-      - name: run spa-client test
-        run: cargo test -p spa-server
       - name: run integration test
         # --show-output
         run: cargo test -p tests --test starter -j 1 -- --test-threads 1
       - name: run pebble
         run: ./run_pebble.sh
         working-directory: ./tests/bash/
       - name: run acme integration test
-        run: cargo test -p tests --test acme_test -j 1 -- --test-threads 1
+        run: cargo test -p tests --test acme_test -j 1 -- --test-threads 1
+      - name: run spa-client test
+        run: cargo test -p spa-client
+      - name: run spa-client test
+        run: cargo test -p spa-server
diff --git a/server/src/file_cache.rs b/server/src/file_cache.rs
@@ -233,7 +233,7 @@ impl FileCache {
                     .cloned();
                 if let Some(v) = index_opt {
                     result.insert(format!("{key_prefix}/"), v.clone());
-                    // result.insert(key_prefix.to_string(), v);
+                    // result.insert(key_prefix.to_string(), v); //GitHub Action CI would trigger This, but I could not trigger this in my compute
                 }
             }
             None => {
diff --git a/server/src/service.rs b/server/src/service.rs
@@ -103,22 +103,10 @@ pub async fn create_service(
                 return Ok(resp);
             }
         }
-        // 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, path);
-            *resp.status_mut() = StatusCode::MOVED_PERMANENTLY;
-            return Ok(resp);
-        }
+        
         // static file
-        let mut resp = match get_cache_file(path, host, domain_storage).await {
-            Ok(item) => {
+        let mut resp = match get_cache_file(path, host, domain_storage.clone()).await {
+            Some(item) => {
                 let headers = req.headers();
                 let conditionals = Conditionals {
                     if_modified_since: headers.typed_get(),
@@ -131,7 +119,23 @@ pub async fn create_service(
                     .and_then(|x| x.to_str().map(|x| x.to_string()).ok());
                 cache_or_file_reply(item, conditionals, accept_encoding).await
             }
-            Err(resp) => Ok(resp),
+            None => {
+                // 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, path);
+                    *resp.status_mut() = StatusCode::MOVED_PERMANENTLY;
+                    Ok(resp)
+                } else {
+                    Ok(not_found())
+                }
+            },
         };
 
         if let Some(Validated::Simple(origin)) = origin_opt {
diff --git a/server/src/static_file_filter.rs b/server/src/static_file_filter.rs
@@ -19,16 +19,16 @@ use warp::fs::{file_stream, optimal_buf_size, Cond, Conditionals};
 use warp::http::{Response, StatusCode};
 
 //from warp::fs
-fn sanitize_path(tail: &str) -> Result<String, Response<Body>> {
+fn sanitize_path(tail: &str) -> Option<String> {
     if let Ok(p) = percent_decode_str(tail).decode_utf8() {
         for seg in p.split('/') {
             if seg.starts_with("..") || seg.contains('\\') {
-                return Err(not_found());
+                return None
             }
         }
-        Ok(p.into_owned())
+        Some(p.into_owned())
     } else {
-        Err(not_found())
+        None
     }
 }
 #[derive(Debug)]
@@ -252,14 +252,14 @@ pub async fn get_cache_file(
     tail: &str,
     host: &str,
     domain_storage: Arc<DomainStorage>,
-) -> Result<(String, Arc<CacheItem>), Response<Body>> {
+) -> Option<(String, Arc<CacheItem>)> {
     let _key = sanitize_path(tail)?;
     let key = _key[1..].to_owned();
     debug!("get file: {host}, tail:{_key}, fixed: {key}");
-    if let Some(cache_item) = domain_storage.get_file(host, &key) {
-        Ok((key, cache_item))
+    if let Some(cache_item) = domain_storage.get_file(host, &key) { 
+        Some((key, cache_item))
     } else {
         debug!("no file for: {}/{}", &host, &key);
-        Err(not_found())
+        None
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -233,7 +233,7 @@ impl FileCache {`
`233`	`233`	`.cloned();`
`234`	`234`	`if let Some(v) = index_opt {`
`235`	`235`	`result.insert(format!("{key_prefix}/"), v.clone());`
`236`		`- // result.insert(key_prefix.to_string(), v);`
	`236`	`+ // result.insert(key_prefix.to_string(), v); //GitHub Action CI would trigger This, but I could not trigger this in my compute`
`237`	`237`	`}`
`238`	`238`	`}`
`239`	`239`	`None => {`