fix: cached key not decrypted beforehand

Author: nmluci

crates/backend/src/config/cache.rs

@@ -1,18 +1,18 @@
 use crate::parameter;
 use async_trait::async_trait;
-use redis::aio::ConnectionManager;
+use redis::aio::{MultiplexedConnection};
 
 #[derive(Clone)]
 pub struct Cache {
-   conn: ConnectionManager,
+   conn: MultiplexedConnection,
 }
 
 #[async_trait]
 pub trait CacheTrait {
    async fn init() -> Result<Self, redis::RedisError>
    where
       Self: Sized;
-   fn get_cache(&mut self) -> &mut ConnectionManager;
+   fn get_cache(&mut self) -> &mut MultiplexedConnection;
 }
 
 #[async_trait]
@@ -22,14 +22,14 @@ impl CacheTrait for Cache {
       let client = redis::Client::open(cache)
          .unwrap_or_else(|e| panic!("preparing connection to cache err: {}", e));
 
-      let cache_conn = client.get_connection_manager()
+      let cache_conn = client.get_multiplexed_tokio_connection()
          .await
          .unwrap_or_else(|e| panic!("connection to cache err: {}", e));
 
       Ok(Self { conn: cache_conn })
    }
 
-   fn get_cache(&mut self) -> &mut ConnectionManager {
+   fn get_cache(&mut self) -> &mut MultiplexedConnection {
       &mut self.conn
    }
 }

crates/backend/src/service/payload_sec.rs

@@ -300,16 +300,14 @@ impl PayloadSecurityServiceTrait for PayloadSecurityService {
             },
         };
 
-        // let decoded_key = BASE64.decode(get("DB_KEY").as_bytes()).map_err(|e| KeypairError::Yabai(format!("failed to decode key: {e}")))?;
-        // let key: GenericArray<u8, U32> = GenericArray::clone_from_slice(&decoded_key);
-
-        // let mut hashmsg = meta.public_key.clone();
-        // hashmsg.extend(meta.private_key.clone());
+        let decoded_key = BASE64.decode(get("DB_KEY").as_bytes()).map_err(|e| KeypairError::Yabai(format!("failed to decode key: {e}")))?;
+        let key: GenericArray<u8, U32> = GenericArray::clone_from_slice(&decoded_key);
 
-        // let sk = corelib::security::aes256_decrypt(key, &meta.private_key)
-        // .map_err(|e| KeypairError::Yabai(e.to_string()))?;
+        let mut hashmsg = meta.public_key.clone();
+        hashmsg.extend(meta.private_key.clone());
 
-        let sk = meta.private_key;
+        let sk = corelib::security::aes256_decrypt(key, &meta.private_key)
+        .map_err(|e| KeypairError::Yabai(e.to_string()))?;
 
         // validate key
         let key = SecretKey::from_slice(&sk)