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

Be consistent in the api

Browse Source
This commit is contained in:
Nadja Reitzenstein 2021-09-21 22:55:18 +02:00
parent 75f8911c1f
commit 14402d627c
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/api/machines.rs
View File

@ -104,8 +104,8 @@ impl machines::Server for Machines {
builder.set_use(capnp_rpc::new_client(machineapi.clone())); builder.set_use(capnp_rpc::new_client(machineapi.clone()));
} }
if perms.manage { if perms.manage {
builder.set_transfer(capnp_rpc::new_client(machineapi.clone())); //builder.set_transfer(capnp_rpc::new_client(machineapi.clone()));
builder.set_check(capnp_rpc::new_client(machineapi.clone())); //builder.set_check(capnp_rpc::new_client(machineapi.clone()));
builder.set_manage(capnp_rpc::new_client(machineapi.clone())); builder.set_manage(capnp_rpc::new_client(machineapi.clone()));
} }
if permissions.iter().any(|r| r.match_perm(&admin_perm())) { if permissions.iter().any(|r| r.match_perm(&admin_perm())) {
@ -150,12 +150,13 @@ impl machines::Server for Machines {
} }
let machineapi = Machine::new(user.clone(), perms, machine.clone()); let machineapi = Machine::new(user.clone(), perms, machine.clone());
if perms.write { let state = machine.get_status().await;
if perms.write && state == Status::Free {
builder.set_use(capnp_rpc::new_client(machineapi.clone())); builder.set_use(capnp_rpc::new_client(machineapi.clone()));
} }
if perms.manage { if perms.manage {
builder.set_transfer(capnp_rpc::new_client(machineapi.clone())); //builder.set_transfer(capnp_rpc::new_client(machineapi.clone()));
builder.set_check(capnp_rpc::new_client(machineapi.clone())); //builder.set_check(capnp_rpc::new_client(machineapi.clone()));
builder.set_manage(capnp_rpc::new_client(machineapi.clone())); builder.set_manage(capnp_rpc::new_client(machineapi.clone()));
} }
if permissions.iter().any(|r| r.match_perm(&admin_perm())) { if permissions.iter().any(|r| r.match_perm(&admin_perm())) {