bak it

Author: timzaak

server/src/web_server.rs

@@ -62,29 +62,29 @@ fn alias_redirect(uri: &Uri, https: bool, host: &str, external_port: u16, res: &
 
 #[handler]
 async fn file_resp(req: &mut Request, depot: &mut Depot, res: &mut Response, _ctrl: &mut FlowCtrl) {
-    let domain_storage = depot.obtain::<DomainStorage>().unwrap();
-    let service_config = depot.obtain::<ServiceConfig>().unwrap();
-    let config = depot.obtain::<Config>().unwrap();
+    let domain_storage = depot.obtain::<Arc<DomainStorage>>().unwrap();
+    let service_config = depot.obtain::<Arc<ServiceConfig>>().unwrap();
+    let config = depot.obtain::<Arc<Config>>().unwrap();
 
     let author_opt = get_authority(req);
     if let Some(author) = author_opt {
         let origin_host = author.host();
 
-        let (is_alias, host) = if let Some(alias) = service_config.host_alias.get(origin_host) {
+        let (_is_alias, host) = if let Some(alias) = service_config.host_alias.get(origin_host) {
             (true, alias.as_str())
         } else {
             (false, origin_host)
         };
-        if is_alias {
-            let redirect_https = config.http.redirect_https.unwrap_or(false);
-            let external_port =
-                config
-                    .http
-                    .external_port
-                    .unwrap_or(if redirect_https { 443 } else { 80 });
-            alias_redirect(req.uri(), redirect_https, host, external_port, res);
-            return;
-        }
+        // if is_alias {
+        //     let redirect_https = config.http.redirect_https.unwrap_or(false);
+        //     let external_port =
+        //         config
+        //             .http
+        //             .external_port
+        //             .unwrap_or(if redirect_https { 443 } else { 80 });
+        //     alias_redirect(req.uri(), redirect_https, host, external_port, res);
+        //     return;
+        // }
 
         let uri = req.uri();
 
@@ -123,7 +123,11 @@ pub async fn init_http_server(
 
     // StaticDir::new();
     let router = Router::with_hoop(trailing_slash::add_slash())
-        .hoop(affix_state::inject(service_config.clone()).inject(storage.clone()))
+        .hoop(
+            affix_state::inject(service_config.clone())
+                .inject(storage.clone())
+                .inject(conf.clone()),
+        )
         .path("{*path}")
         .get(file_resp);
 

tests/tests/common.rs

@@ -1,16 +1,13 @@
-//use opentelemetry::trace::TracerProvider as _;
-//use opentelemetry_sdk::trace::TracerProvider;
-//use opentelemetry_stdout::SpanExporter;
 use reqwest::header::{CACHE_CONTROL, LOCATION};
 use reqwest::redirect::Policy;
-use reqwest::{Certificate, Client, ClientBuilder, StatusCode, Url};
+use reqwest::{Client, ClientBuilder, StatusCode, Url};
 use spa_client::api::API;
 use std::path::{Path, PathBuf};
 use std::sync::OnceLock;
 use std::{env, fs, io};
-//use tokio::sync::oneshot;
 use tokio::task::JoinHandle;
 use tracing::{debug, error};
+use tracing_subscriber::EnvFilter;
 
 pub const LOCAL_HOST: &str = "local.fornetcode.com";
 pub const LOCAL_HOST2: &str = "local2.fornetcode.com";
@@ -61,9 +58,6 @@ fn get_tls_config() -> ClientConfig {
 
  */
 
-fn get_root_cert(path: PathBuf) -> Certificate {
-    Certificate::from_pem(&fs::read(&path).unwrap()).unwrap()
-}
 pub fn run_server_with_config(config_file_name: &str) -> JoinHandle<()> {
     env::set_var(
         "SPA_CONFIG",
@@ -84,16 +78,15 @@ pub fn run_server_with_config(config_file_name: &str) -> JoinHandle<()> {
         .with(tracing_subscriber::fmt::layer().compact())
         .with(telemetry)
         .try_init();
-
-    // let _ = tracing_subscriber::fmt()
-    //     .with_env_filter(
-    //         EnvFilter::try_from_default_env()
-    //             .unwrap_or_else(|_| "info,spa_server=debug,spa_client=debug".into()),
-    //     )
-    //     .with_test_writer()
-    //     .try_init();
-
      */
+    let _ = tracing_subscriber::fmt()
+        .with_env_filter(
+            EnvFilter::try_from_default_env()
+                .unwrap_or_else(|_| "info,spa_server=debug,spa_client=debug".into()),
+        )
+        .with_test_writer()
+        .try_init();
+
     tokio::spawn(async move {
         let result = spa_server::run_server().await;
         if result.is_err() {
@@ -210,9 +203,6 @@ pub fn get_http_client() -> &'static Client {
     static CLIENT: OnceLock<Client> = OnceLock::new();
     CLIENT.get_or_init(|| {
         ClientBuilder::new()
-            .add_root_certificate(get_root_cert(
-                get_test_dir().join("pebble/certs/pebble.minica.pem"),
-            ))
             .tls_built_in_root_certs(false)
             //.use_rustls_tls()
             //.min_tls_version(Version::TLS_1_3)
@@ -227,10 +217,6 @@ pub fn get_http_no_redirect_client() -> &'static Client {
     static CLIENT: OnceLock<Client> = OnceLock::new();
     CLIENT.get_or_init(|| {
         ClientBuilder::new()
-            .add_root_certificate(get_root_cert(
-                get_test_dir().join("pebble/certs/pebble.minica.pem"),
-            ))
-            .tls_built_in_root_certs(false)
             //.use_rustls_tls()
             //.min_tls_version(Version::TLS_1_3)
             //.add_root_certificate(get_root_cert(get_test_dir().join("cert/cacerts.pem")))

tests/tests/http_test.rs

@@ -24,18 +24,19 @@ async fn start_server_and_client_upload_file() {
 
     tokio::time::sleep(Duration::from_secs(1)).await;
 
-    upload_file_and_check(domain, request_prefix, 1, vec!["", "index.html"]).await;
+    // upload_file_and_check(domain, request_prefix, 1, vec!["", "index.html"]).await;
+    upload_file_and_check(domain, request_prefix, 1, vec![]).await;
     assert_redirect_correct(request_prefix, "/27/").await;
 
-    assert_expired(
-        request_prefix,
-        vec![
-            ("1.html", Some(0)),
-            ("test.js", Some(30 * 24 * 60 * 60)),
-            ("test.bin", None),
-        ],
-    )
-    .await;
+    // assert_expired(
+    //     request_prefix,
+    //     vec![
+    //         ("1.html", Some(0)),
+    //         ("test.js", Some(30 * 24 * 60 * 60)),
+    //         ("test.bin", None),
+    //     ],
+    // )
+    // .await;
 
     upload_file_and_check(domain, request_prefix, 2, vec!["index.html", "2.html"]).await;
 
@@ -316,6 +317,7 @@ async fn revoke_version() {
     assert_files_no_exists(request_prefix, vec!["3.html"]).await;
 }
 
+/*
 #[tokio::test(flavor = "multi_thread", worker_threads = 3)]
 async fn alias_start_server_and_client_upload_file() {
     let domain = LOCAL_HOST.to_owned() + "/27";
@@ -333,6 +335,7 @@ async fn alias_start_server_and_client_upload_file() {
     )
     .await
 }
+ */
 
 #[tokio::test]
 async fn cors() {