Update Secret Session implementation

Session now implements Clone trait.
Has manager field.
client_public_key field now has an Arc

Also, adds remove_session() for ServiceManager

Signed-off-by: Dhanuka Warusadura <dhanuka@gnome.org>

Author: warusadura

server/src/daemon/service.rs

@@ -45,7 +45,7 @@ impl Service {
             Algorithm::Plain => None,
             Algorithm::Encrypted => Some(Key::from(input)),
         };
-        let (session, key) = Session::new(client_public_key);
+        let (session, key) = Session::new(client_public_key, Arc::clone(&self.manager));
         // TODO: clean up the default generated key
         // TODO call self.manager.set_sessions();
         let key = key

server/src/daemon/service_manager.rs

@@ -17,11 +17,20 @@ impl ServiceManager {
         }
     }
 
-    pub async fn session(&self, path: ObjectPath<'_>) -> Option<&Session> {
-        self.sessions.read().await.get(&path.into())
+    pub async fn session(&self, path: ObjectPath<'_>) -> Option<Session> {
+        self.sessions
+            .read()
+            .await
+            .get(&path.into())
+            .to_owned()
+            .cloned()
     }
 
-    pub async fn insert_session(&mut self, path: OwnedObjectPath, session: Session) {
-        self.sessions.write().await.insert(path, session);
+    pub async fn insert_session(&mut self, path: ObjectPath<'_>, session: Session) {
+        self.sessions.write().await.insert(path.into(), session);
+    }
+
+    pub async fn remove_session(&mut self, path: ObjectPath<'_>) {
+        self.sessions.write().await.remove(&path.into());
     }
 }

server/src/daemon/session.rs

@@ -1,12 +1,17 @@
 // org.freedesktop.Secret.Session
 
+use std::sync::Arc;
+
 use oo7::Key;
 use zbus::{fdo, interface, zvariant};
 use zvariant::{ObjectPath, OwnedObjectPath};
 
-#[derive(Debug)]
+use super::service_manager::ServiceManager;
+
+#[derive(Debug, Clone)]
 pub struct Session {
-    client_public_key: Option<Key>,
+    client_public_key: Arc<Option<Key>>,
+    manager: Arc<ServiceManager>,
     pub path: OwnedObjectPath,
 }
 
@@ -22,12 +27,16 @@ impl Session {
 }
 
 impl Session {
-    pub fn new(client_public_key: Option<Key>) -> (Self, Option<Key>) {
+    pub fn new(
+        client_public_key: Option<Key>,
+        manager: Arc<ServiceManager>,
+    ) -> (Self, Option<Key>) {
         // make use of the keys
         let service_key = vec![0];
         let instance = Self {
-            client_public_key,
+            client_public_key: Arc::new(client_public_key),
             path: OwnedObjectPath::try_from(format!("{}", "a")).unwrap(),
+            manager,
         };
 
         (instance, Some(Key::new(service_key)))