more permission stuff

1 files changed, 40 insertions, 6 deletions

diff --git a/base/src/permission.rs b/base/src/permission.rs
index 382a16e..cc0e32c 100644
--- a/base/src/permission.rs
+++ b/base/src/permission.rs
@@ -1,19 +1,24 @@
 use crate::CONF;
 use anyhow::anyhow;
-use jellycommon::user::{PermissionSet, UserPermission};
+use jellycommon::{
+    user::{PermissionSet, UserPermission},
+    Node,
+};
 
 pub trait PermissionSetExt {
-    fn check(&self, perm: &UserPermission) -> bool;
+    fn check_explicit(&self, perm: &UserPermission) -> Option<bool>;
+    fn check(&self, perm: &UserPermission) -> bool {
+        self.check_explicit(perm).unwrap_or(perm.default_value())
+    }
     fn assert(&self, perm: &UserPermission) -> Result<(), anyhow::Error>;
 }
 
 impl PermissionSetExt for PermissionSet {
-    fn check(&self, perm: &UserPermission) -> bool {
-        *self
-            .0
+    fn check_explicit(&self, perm: &UserPermission) -> Option<bool> {
+        self.0
             .get(&perm)
             .or(CONF.default_permission_set.0.get(&perm))
-            .unwrap_or(&perm.default_value())
+            .map(|v| *v)
     }
     fn assert(&self, perm: &UserPermission) -> Result<(), anyhow::Error> {
         if self.check(perm) {
@@ -25,3 +30,32 @@ impl PermissionSetExt for PermissionSet {
         }
     }
 }
+
+pub trait NodePermissionExt {
+    fn only_if_permitted(self, perms: &PermissionSet) -> Self;
+}
+impl NodePermissionExt for Option<Node> {
+    fn only_if_permitted(self, perms: &PermissionSet) -> Self {
+        self.and_then(|node| {
+            if check_node_permission(perms, &node) {
+                Some(node)
+            } else {
+                None
+            }
+        })
+    }
+}
+fn check_node_permission(perms: &PermissionSet, node: &Node) -> bool {
+    if let Some(v) =
+        perms.check_explicit(&UserPermission::AccessNode(node.public.id.clone().unwrap()))
+    {
+        v
+    } else {
+        for com in node.public.path.clone().into_iter().rev() {
+            if let Some(v) = perms.check_explicit(&UserPermission::AccessNode(com.to_owned())) {
+                return v;
+            }
+        }
+        return false;
+    }
+}