bak

Author: timzaak

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); //GitHub Action CI would trigger This, but I could not trigger this in my compute
+                    result.insert(key_prefix.to_string(), v); //GitHub Action CI would trigger This, but I could not trigger this in my compute
                 }
             }
             None => {

tests/tests/acme_test.rs

@@ -23,8 +23,6 @@ async fn simple_acme_test() {
     let domain = &domain;
     let request_prefix = format!("https://{LOCAL_HOST}:8443/27");
     let request_prefix = &request_prefix;
-    //let https_request_prefix = format!("https://{LOCAL_HOST}:8080/27");
-    //let https_request_prefix = format!("https://{LOCAL_HOST}:8080/27");
     clean_web_domain_dir(domain);
     clean_cert();
     let server = run_server_with_config("server_config_acme.conf");
@@ -42,8 +40,9 @@ async fn simple_acme_test() {
         }
         wait_count +=1;
     }
-
+    
     assert_files(domain, request_prefix, 1, vec!["", "index.html"]).await;
+    assert_files(domain,  &format!("http://{LOCAL_HOST}:8443/27"), 1, vec!["", "index.html"]).await;
     /*
     wait_count = 0;
     server.abort();
@@ -63,3 +62,31 @@ async fn simple_acme_test() {
     assert_files(domain, request_prefix, 1, vec!["", "index.html"]).await;
      */
 }
+
+
+#[tokio::test]
+async fn simple_acme_test2() {
+    let domain = LOCAL_HOST.to_owned();
+    let domain = &domain;
+    let request_prefix = format!("https://{LOCAL_HOST}:8443");
+    let request_prefix = &request_prefix;
+    clean_web_domain_dir(domain);
+    clean_cert();
+    let server = run_server_with_config("server_config_acme.conf");
+    sleep(Duration::from_secs(2)).await;
+    upload_file_and_check(domain, request_prefix, 1, vec![]).await;
+
+    let (api, _) = get_client_api("client_config.conf");
+    let mut wait_count =0;
+    loop {
+        assert!(wait_count < 30, "30 seconds doest not have cert");
+        sleep(Duration::from_secs(1)).await;
+        let cert_info = api.get_acme_cert_info(Some(get_host_path_from_domain(domain).0.to_string())).await.unwrap();
+        if !cert_info.is_empty() {
+            break
+        }
+        wait_count +=1;
+    }
+
+    assert_files(domain, request_prefix, 1, vec!["", "index.html"]).await;
+}