From 04c9aa4d08ead7e5a699d7b0eca09f3e1b2f9999 Mon Sep 17 00:00:00 2001
From: Nadja Reitzenstein <me@dequbed.space>
Date: Fri, 4 Feb 2022 14:20:15 +0100
Subject: [PATCH] Disclose machines that are used by yourself

---
 Cargo.toml          |  2 +-
 src/api/machines.rs | 40 ++++++++++++++++++++++++++++------------
 2 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index eeb5ca6..328ff95 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "diflouroborane"
-version = "0.2.1"
+version = "0.2.3"
 authors = [ "dequbed <me@dequbed.space>"
           , "Kai Jan Kriegel <kai@kjkriegel.de>"
           , "Joseph Langosch <thejoklla@gmail.com>"
diff --git a/src/api/machines.rs b/src/api/machines.rs
index 878b57d..9068283 100644
--- a/src/api/machines.rs
+++ b/src/api/machines.rs
@@ -52,16 +52,6 @@ impl machines::Server for Machines {
         let session = self.session.borrow();
         if session.deref().is_some() {
             let v: Vec<(String, crate::machine::Machine)> = self.network.machines.iter()
-                .filter(|(_name, machine)| {
-                    let required_disclose = &machine.desc.privs.disclose;
-                    for perm_rule in session.as_ref().unwrap().perms.iter() {
-                        if perm_rule.match_perm(required_disclose) {
-                            return true;
-                        }
-                    }
-
-                    false
-                })
                 .map(|(n,m)| (n.clone(), m.clone()))
                 .collect();
 
@@ -70,8 +60,34 @@ impl machines::Server for Machines {
                 let user = &session.as_ref().unwrap().authzid;
                 let permissions = &session.as_ref().unwrap().perms;
 
-                let mut machines = results.get().init_machine_list(v.len() as u32);
-                for (i, (id, machine)) in v.into_iter().enumerate() {
+                let mut filtered_v = Vec::with_capacity(v.len());
+                for (id, machine) in v.into_iter() {
+                    match machine.get_status().await {
+                        // Always show a machine if they're in use by myself
+                        Status::InUse(ref bywho) =>
+                            if bywho.is_some() && bywho.as_ref().filter(|bywho| *bywho == user).is_some()
+                            {
+                                filtered_v.push((id, machine));
+                            }
+                        Status::Reserved(ref bywho) => if bywho == user {
+                            filtered_v.push((id, machine));
+                        }
+
+                        // The rest depends on the actual priviledges below
+                        _ => {
+                            let required_disclose = &machine.desc.privs.disclose;
+                            if session.as_ref().unwrap().perms.iter()
+                                .any(|rule| rule.match_perm(required_disclose))
+                            {
+                                filtered_v.push((id, machine));
+                            }
+                        }
+                    }
+
+                }
+
+                let mut machines = results.get().init_machine_list(filtered_v.len() as u32);
+                for (i, (id, machine)) in filtered_v.into_iter().enumerate() {
                     let mut builder = machines.reborrow().get(i as u32);
                     fill_machine_builder(
                         &mut builder,