vmario/fabaccess-bffh
1
0
Fork 0
mirror of https://gitlab.com/fabinfra/fabaccess/bffh.git synced 2024-11-23 23:27:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Disclose machines that are used by yourself

Browse Source
This commit is contained in:
Nadja Reitzenstein 2022-02-04 14:20:15 +01:00
parent cd42130c2f
commit 04c9aa4d08
2 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "diflouroborane" name = "diflouroborane"
version = "0.2.1" version = "0.2.3"
authors = [ "dequbed <me@dequbed.space>" authors = [ "dequbed <me@dequbed.space>"
, "Kai Jan Kriegel <kai@kjkriegel.de>" , "Kai Jan Kriegel <kai@kjkriegel.de>"
, "Joseph Langosch <thejoklla@gmail.com>" , "Joseph Langosch <thejoklla@gmail.com>"

40
src/api/machines.rs
View File

@ -52,16 +52,6 @@ impl machines::Server for Machines {
let session = self.session.borrow(); let session = self.session.borrow();
if session.deref().is_some() { if session.deref().is_some() {
let v: Vec<(String, crate::machine::Machine)> = self.network.machines.iter() 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())) .map(|(n,m)| (n.clone(), m.clone()))
.collect(); .collect();
@ -70,8 +60,34 @@ impl machines::Server for Machines {
let user = &session.as_ref().unwrap().authzid; let user = &session.as_ref().unwrap().authzid;
let permissions = &session.as_ref().unwrap().perms; let permissions = &session.as_ref().unwrap().perms;
let mut machines = results.get().init_machine_list(v.len() as u32); let mut filtered_v = Vec::with_capacity(v.len());
for (i, (id, machine)) in v.into_iter().enumerate() { 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); let mut builder = machines.reborrow().get(i as u32);
fill_machine_builder( fill_machine_builder(
&mut builder, &mut builder,