Adds a way to store a session

This introduces ServiceManager struct.

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

Author: warusadura

server/src/daemon/collection.rs

@@ -14,7 +14,12 @@ use tokio::sync::RwLock;
 use zbus::{interface, zvariant, ObjectServer, SignalContext};
 use zvariant::{ObjectPath, OwnedObjectPath};
 
-use super::{error::ServiceError, prompt::Prompt, Result, Service};
+use super::{
+    error::ServiceError,
+    prompt::Prompt,
+    service::{Service, ServiceManager},
+    Result,
+};
 
 const SECRET_COLLECTION_OBJECTPATH: &str = "/org/freedesktop/secrets.Devel/collection/";
 
@@ -27,6 +32,7 @@ pub struct Collection {
     locked: AtomicBool,
     created: Duration,
     modified: Duration,
+    manager: Arc<ServiceManager>,
     path: OwnedObjectPath,
 }
 
@@ -76,7 +82,13 @@ impl Collection {
 
         let prompt = Prompt::default(); // temp Prompt
 
-        let item = super::item::Item::new(item, self.path(), Arc::clone(&self.keyring)).await;
+        let item = super::item::Item::new(
+            item,
+            self.path(),
+            Arc::clone(&self.keyring),
+            Arc::clone(&self.manager),
+        )
+        .await;
         let path = OwnedObjectPath::from(item.path());
         self.items.write().await.push(item);
 
@@ -125,7 +137,13 @@ impl Collection {
 }
 
 impl Collection {
-    pub fn new(label: &str, alias: &str, created: Duration, keyring: Arc<Keyring>) -> Self {
+    pub fn new(
+        label: &str,
+        alias: &str,
+        created: Duration,
+        keyring: Arc<Keyring>,
+        manager: Arc<ServiceManager>,
+    ) -> Self {
         Self {
             items: Default::default(),
             label: label.to_owned(),
@@ -136,6 +154,7 @@ impl Collection {
             path: OwnedObjectPath::try_from(format!("{}{}", SECRET_COLLECTION_OBJECTPATH, alias))
                 .unwrap(),
             keyring,
+            manager,
         }
     }
 

server/src/daemon/item.rs

@@ -13,14 +13,17 @@ use zbus::{
     ObjectServer,
 };
 
-use super::{collection::Collection, error::ServiceError, prompt::Prompt, Result};
+use super::{
+    collection::Collection, error::ServiceError, prompt::Prompt, service::ServiceManager, Result,
+};
 
 #[derive(Debug)]
 pub struct Item {
     inner: RwLock<portal::Item>,
     path: OwnedObjectPath,
     keyring: Arc<Keyring>,
     locked: bool,
+    manager: Arc<ServiceManager>,
 }
 
 #[zbus::interface(name = "org.freedesktop.Secret.Item")]
@@ -106,12 +109,14 @@ impl Item {
         item: portal::Item,
         collection_path: ObjectPath<'_>,
         keyring: Arc<Keyring>,
+        manager: Arc<ServiceManager>,
     ) -> Self {
         Self {
             path: OwnedObjectPath::try_from(format!("{}/items/{}", collection_path, item.label(),))
                 .unwrap(),
             inner: RwLock::new(item),
             keyring,
+            manager,
             locked: true,
         }
     }

server/src/daemon/service.rs

@@ -24,11 +24,33 @@ use super::{
     collection::Collection, error::ServiceError, prompt::Prompt, session::Session, Result,
 };
 
+#[derive(Debug)]
+pub struct ServiceManager {
+    sessions: HashMap<OwnedObjectPath, Session>,
+}
+
+impl ServiceManager {
+    pub fn new() -> Self {
+        Self {
+            sessions: HashMap::new(),
+        }
+    }
+
+    pub fn sessions(&self) -> &HashMap<OwnedObjectPath, Session> {
+        &self.sessions
+    }
+
+    pub fn set_sessions(&mut self, path: OwnedObjectPath, session: Session) {
+        self.sessions.insert(path, session);
+    }
+}
+
 #[derive(Debug)]
 pub struct Service {
     collections: Vec<Collection>,
     keyring: Arc<Keyring>,
     cnx: Mutex<Option<zbus::Connection>>,
+    manager: Arc<ServiceManager>,
 }
 
 #[zbus::interface(name = "org.freedesktop.Secret.Service")]
@@ -44,6 +66,7 @@ impl Service {
         };
         let (session, key) = Session::new(client_public_key);
         // TODO: clean up the default generated key
+        // TODO call self.manager.set_sessions();
         let key = key
             .map(|k| OwnedValue::from(&k))
             .unwrap_or_else(|| Value::new::<Vec<u8>>(vec![]).try_to_owned().unwrap());
@@ -65,12 +88,14 @@ impl Service {
                 .duration_since(SystemTime::UNIX_EPOCH)
                 .unwrap(),
             Arc::clone(&self.keyring),
+            Arc::clone(&self.manager),
         );
         self.set_collections(Collection::new(
             collection.label(),
             alias,
             Duration::from_secs(collection.created()),
             Arc::clone(&self.keyring),
+            Arc::clone(&self.manager),
         ));
 
         let path = OwnedObjectPath::from(collection.path());
@@ -253,6 +278,7 @@ impl Service {
             collections: Vec::new(),
             keyring: Arc::new(Keyring::load_default().await.unwrap()),
             cnx: Default::default(),
+            manager: Arc::new(ServiceManager::new()),
         }
     }