Merge branch 'main' into ci

Author: wa5i

.github/workflows/rust.yml

@@ -35,6 +35,8 @@ jobs:
       run: ulimit -n 65535
     - name: Run tests
       run: cargo test --verbose
+    - name: Run tests with sync_handler features
+      run: cargo test --features sync_handler --verbose
     - name: Run Clippy
       run: cargo clippy -- -D warnings
     - name: Install tarpaulin
@@ -74,6 +76,10 @@ jobs:
       run : |
         export LD_LIBRARY_PATH=${RUNNER_TEMP}/tongsuo/lib
         OPENSSL_DIR=${RUNNER_TEMP}/tongsuo RUSTFLAGS="-C link-args=-Wl,-rpath,${RUNNER_TEMP}/tongsuo/lib" cargo test --verbose --features crypto_adaptor_tongsuo --no-default-features
+    - name: Run tests with sync_handler features
+      run : |
+        export LD_LIBRARY_PATH=${RUNNER_TEMP}/tongsuo/lib
+        OPENSSL_DIR=${RUNNER_TEMP}/tongsuo RUSTFLAGS="-C link-args=-Wl,-rpath,${RUNNER_TEMP}/tongsuo/lib" cargo test --verbose --features crypto_adaptor_tongsuo --features sync_handler --no-default-features
 
   unix-mysql-test:
     strategy:
@@ -126,6 +132,8 @@ jobs:
       run: cargo build --verbose
     - name: Run tests
       run: cargo test --verbose
+    - name: Run tests with sync_handler features
+      run: cargo test --features sync_handler --verbose
 
   windows-mysql-test:
     strategy:

Cargo.toml

@@ -75,9 +75,9 @@ prettytable = "0.10"
 rpassword = "7.3"
 async-trait = "0.1"
 stretto = "0.8"
-itertools = "0.14"
 priority-queue = "2.1"
 crossbeam-channel = "0.5"
+maybe-async = { version = "0.2", optional = false }
 
 # optional dependencies
 openssl = { version = "*", optional = true }
@@ -96,6 +96,7 @@ default = ["crypto_adaptor_openssl"]
 storage_mysql = ["diesel", "r2d2", "r2d2-diesel"]
 crypto_adaptor_openssl = ["dep:openssl", "dep:openssl-sys"]
 crypto_adaptor_tongsuo = ["dep:openssl", "dep:openssl-sys"]
+sync_handler = ["maybe-async/is_sync"]
 
 [target.'cfg(unix)'.dependencies]
 daemonize = "0.5"

netlify.toml

@@ -59,7 +59,7 @@ impl Server {
                 Ok(_) => EXIT_CODE_OK,
                 Err(e) => {
                     println!("server error: {:?}", e);
-                    EXIT_CODE_LOAD_CONFIG_FAILURE
+                    std::process::exit(EXIT_CODE_LOAD_CONFIG_FAILURE as i32);
                 }
             };
         }

src/cli/command/server.rs

@@ -107,6 +107,7 @@ impl Default for Core {
     }
 }
 
+#[maybe_async::maybe_async]
 impl Core {
     pub fn config(&mut self, core: Arc<RwLock<Core>>, config: Option<&Config>) -> Result<(), RvError> {
         if let Some(conf) = config {
@@ -411,6 +412,7 @@ impl Core {
         Ok(())
     }
 
+    #[maybe_async::maybe_async]
     pub async fn handle_request(&self, req: &mut Request) -> Result<Option<Response>, RvError> {
         let mut resp = None;
         let mut err: Option<RvError> = None;

src/core.rs

@@ -6,7 +6,6 @@
 //! The `Handler` trait should be implemented in other module, such as the `rusty_vault::router`
 //! for instance.
 
-use async_trait::async_trait;
 use derive_more::Display;
 
 use crate::{
@@ -16,7 +15,7 @@ use crate::{
     logical::{request::Request, response::Response, Auth},
 };
 
-#[async_trait]
+#[maybe_async::maybe_async]
 pub trait Handler: Send + Sync {
     fn name(&self) -> String;
 
@@ -41,7 +40,7 @@ pub trait Handler: Send + Sync {
     }
 }
 
-#[async_trait]
+#[maybe_async::maybe_async]
 pub trait AuthHandler: Send + Sync {
     fn name(&self) -> String;
 

src/handler.rs

@@ -81,8 +81,12 @@ async fn logical_request_handler(
             r.operation = Operation::List;
         }
     }
+    #[cfg(feature = "sync_handler")]
+    let ret = core.read()?.handle_request(&mut r)?;
+    #[cfg(not(feature = "sync_handler"))]
+    let ret = core.read()?.handle_request(&mut r).await?;
 
-    match core.read()?.handle_request(&mut r).await? {
+    match ret {
         Some(resp) => response_logical(&resp, &r.path),
         None => {
             if matches!(r.operation, Operation::Read | Operation::List) {

src/http/logical.rs

@@ -199,6 +199,9 @@ pub fn response_json_ok<T: Serialize>(cookie: Option<Cookie>, body: T) -> HttpRe
 
 pub async fn handle_request(core: web::Data<Arc<RwLock<Core>>>, req: &mut Request) -> Result<HttpResponse, RvError> {
     let core = core.read()?;
+    #[cfg(feature = "sync_handler")]
+    let resp = core.handle_request(req)?;
+    #[cfg(not(feature = "sync_handler"))]
     let resp = core.handle_request(req).await?;
     if resp.is_none() {
         Ok(response_ok(None, None))

src/http/mod.rs

@@ -9,7 +9,6 @@ use std::{
     time::{Duration, SystemTime, UNIX_EPOCH},
 };
 
-use async_trait::async_trait;
 use better_default::Default;
 use humantime::parse_duration;
 use lazy_static::lazy_static;
@@ -727,7 +726,7 @@ impl TokenStore {
     }
 }
 
-#[async_trait]
+#[maybe_async::maybe_async]
 impl Handler for TokenStore {
     fn name(&self) -> String {
         "auth_token".to_string()

src/modules/auth/token_store.rs

@@ -216,6 +216,7 @@ mod test {
         test_utils::{test_delete_api, test_mount_auth_api, test_read_api, test_rusty_vault_init, test_write_api},
     };
 
+    #[maybe_async::maybe_async]
     pub async fn test_read_role(
         core: &Core,
         token: &str,
@@ -227,6 +228,7 @@ mod test {
         resp
     }
 
+    #[maybe_async::maybe_async]
     pub async fn test_write_role(
         core: &Core,
         token: &str,
@@ -257,12 +259,13 @@ mod test {
                 .await;
     }
 
+    #[maybe_async::maybe_async]
     pub async fn test_delete_role(core: &Core, token: &str, path: &str, role_name: &str) {
-        assert!(test_delete_api(core, token, format!("auth/{}/role/{}", path, role_name).as_str(), true, None)
-            .await
-            .is_ok());
+        let resp = test_delete_api(core, token, format!("auth/{}/role/{}", path, role_name).as_str(), true, None).await;
+        assert!(resp.is_ok());
     }
 
+    #[maybe_async::maybe_async]
     pub async fn generate_secret_id(core: &Core, token: &str, path: &str, role_name: &str) -> (String, String) {
         let resp =
             test_write_api(core, token, format!("auth/{}/role/{}/secret-id", path, role_name).as_str(), true, None)
@@ -275,6 +278,7 @@ mod test {
         (secret_id.to_string(), secret_id_accessor.to_string())
     }
 
+    #[maybe_async::maybe_async]
     pub async fn test_login(
         core: &Core,
         path: &str,
@@ -308,6 +312,7 @@ mod test {
         resp
     }
 
+    #[maybe_async::maybe_async]
     async fn test_approle(core: &Core, token: &str, path: &str, role_name: &str) {
         // Create a role
         let resp = test_write_api(core, token, format!("auth/{}/role/{}", path, role_name).as_str(), true, None).await;
@@ -460,6 +465,7 @@ mod test {
         let _ = test_login(core, path, role_id, &secret_id, false).await;
     }
 
+    #[maybe_async::maybe_async]
     async fn test_approle_role_service(core: &Core, token: &str, path: &str, role_name: &str) {
         // Create a role
         let mut data = json!({
@@ -549,7 +555,7 @@ mod test {
         println!("resp_data: {:?}", resp_data);
     }
 
-    #[tokio::test]
+    #[maybe_async::test(feature = "sync_handler", async(all(not(feature = "sync_handler")), tokio::test))]
     async fn test_credential_approle_module() {
         let (root_token, core) = test_rusty_vault_init("test_approle_module");
         let core = core.read().unwrap();