uqbar-dao/nectar
1
1
Fork 0
mirror of https://github.com/uqbar-dao/nectar.git synced 2024-12-24 09:06:10 +03:00
Code Issues Packages Projects Releases Wiki Activity

vfs: root caps fix

Browse Source
This commit is contained in:
bitful-pannul 2023-12-26 15:31:20 -03:00
parent a45d14470d
commit a13f116698
1 changed files with 25 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/vfs.rs
View File

@ -558,6 +558,25 @@ async fn check_caps(
let src_package_id = PackageId::new(source.process.package(), source.process.publisher()); let src_package_id = PackageId::new(source.process.package(), source.process.publisher());
let (send_cap_bool, recv_cap_bool) = tokio::sync::oneshot::channel(); let (send_cap_bool, recv_cap_bool) = tokio::sync::oneshot::channel();
// check for root cap (todo make temp buffer so this is more efficient?)
send_to_caps_oracle
.send(CapMessage::Has {
on: source.process.clone(),
cap: Capability {
issuer: Address {
node: our_node.clone(),
process: VFS_PROCESS_ID.clone(),
},
params: serde_json::to_string(&serde_json::json!({
"root": true,
}))
.unwrap(),
},
responder: send_cap_bool,
})
.await?;
let has_root_cap = recv_cap_bool.await?;
match &request.action { match &request.action {
VfsAction::CreateDir VfsAction::CreateDir
| VfsAction::CreateDirAll | VfsAction::CreateDirAll
@ -579,25 +598,7 @@ async fn check_caps(
if src_package_id == package_id { if src_package_id == package_id {
return Ok(()); return Ok(());
} }
send_to_caps_oracle if !has_root_cap {
.send(CapMessage::Has {
on: source.process.clone(),
cap: Capability {
issuer: Address {
node: our_node.clone(),
process: VFS_PROCESS_ID.clone(),
},
params: serde_json::to_string(&serde_json::json!({
"kind": "write",
"drive": drive,
}))
.unwrap(),
},
responder: send_cap_bool,
})
.await?;
let has_cap = recv_cap_bool.await?;
if !has_cap {
return Err(VfsError::NoCap { return Err(VfsError::NoCap {
action: request.action.to_string(), action: request.action.to_string(),
path: path.display().to_string(), path: path.display().to_string(),
@ -617,6 +618,10 @@ async fn check_caps(
if src_package_id == package_id { if src_package_id == package_id {
return Ok(()); return Ok(());
} }
if has_root_cap {
return Ok(());
}
let (send_cap_bool, recv_cap_bool) = tokio::sync::oneshot::channel();
send_to_caps_oracle send_to_caps_oracle
.send(CapMessage::Has { .send(CapMessage::Has {
on: source.process.clone(), on: source.process.clone(),
@ -645,25 +650,7 @@ async fn check_caps(
} }
VfsAction::CreateDrive => { VfsAction::CreateDrive => {
if src_package_id != package_id { if src_package_id != package_id {
// might have root caps if !has_root_cap {
send_to_caps_oracle
.send(CapMessage::Has {
on: source.process.clone(),
cap: Capability {
issuer: Address {
node: our_node.clone(),
process: VFS_PROCESS_ID.clone(),
},
params: serde_json::to_string(&serde_json::json!({
"root": true,
}))
.unwrap(),
},
responder: send_cap_bool,
})
.await?;
let has_cap = recv_cap_bool.await?;
if !has_cap {
return Err(VfsError::NoCap { return Err(VfsError::NoCap {
action: request.action.to_string(), action: request.action.to_string(),
path: path.display().to_string(), path: path.display().to_string(),