Add read-only path type

[hcoop/domtool2.git] / src / domain.sml

diff --git a/src/domain.sml b/src/domain.sml
index b2c0c5c..4944a34 100644 (file)
--- a/src/domain.sml
+++ b/src/domain.sml
@@ -48,16 +48,26 @@ fun your_groups () = !your_grps
 val your_pths = ref SS.empty
 fun your_paths () = !your_pths
 
+val world_readable = SS.addList (SS.empty, Config.worldReadable)
+val readable_pths = ref SS.empty
+fun readable_paths () = !readable_pths
+
 fun setUser user =
-    (usr := user;
-     your_doms := Acl.class {user = getUser (),
-                            class = "domain"};
-     your_usrs := Acl.class {user = getUser (),
-                            class = "user"};
-     your_grps := Acl.class {user = getUser (),
-                            class = "group"};
-     your_pths := Acl.class {user = getUser (),
-                            class = "path"})
+    let
+       val () = usr := user
+
+       val your_paths = Acl.class {user = getUser (),
+                                   class = "path"}
+    in
+       your_doms := Acl.class {user = getUser (),
+                               class = "domain"};
+       your_usrs := Acl.class {user = getUser (),
+                               class = "user"};
+       your_grps := Acl.class {user = getUser (),
+                               class = "group"};
+       your_pths := your_paths;
+       readable_pths := SS.union (your_paths, world_readable)
+    end
 
 fun validIp s =
     case map Int.fromString (String.fields (fn ch => ch = #".") s) of
@@ -80,11 +90,13 @@ fun validNode s = List.exists (fn s' => s = s') nodes
 fun yourDomain s = SS.member (your_domains (), s)
 fun yourUser s = SS.member (your_users (), s)
 fun yourGroup s = SS.member (your_groups (), s)
-fun yourPath path =
+fun checkPath paths path =
     List.all (fn s => s <> "..") (String.fields (fn ch => ch = #"/") path)
     andalso CharVector.all (fn ch => Char.isAlphaNum ch orelse ch = #"." orelse ch = #"/"
                                     orelse ch = #"-" orelse ch = #"_") path
-    andalso SS.exists (fn s' => path = s' orelse String.isPrefix (s' ^ "/") path) (your_paths ())
+    andalso SS.exists (fn s' => path = s' orelse String.isPrefix (s' ^ "/") path) (paths ())
+val yourPath = checkPath your_paths
+val readablePath = checkPath readable_paths
 
 fun yourDomainHost s =
     yourDomain s
@@ -161,6 +173,10 @@ val _ = Env.type_one "your_path"
        Env.string
        yourPath
 
+val _ = Env.type_one "readable_path"
+       Env.string
+       readablePath
+
 val _ = Env.type_one "node"
        Env.string
        validNode