Allow faking your_{user,path,group} and homedir

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

diff --git a/src/domain.sml b/src/domain.sml
index 2bcfe15..7286b2e 100644 (file)
--- a/src/domain.sml
+++ b/src/domain.sml
@@ -70,8 +70,9 @@ fun setUser user =
                                class = "domain"};
        your_usrs := Acl.class {user = getUser (),
                                class = "user"};
-       your_grps := Acl.class {user = getUser (),
-                               class = "group"};
+       your_grps := SS.add (Acl.class {user = getUser (),
+                                       class = "group"},
+                            "nogroup");
        your_pths := your_paths;
        readable_pths := SS.union (your_paths, world_readable);
        your_ipss := Acl.class {user = getUser (),
@@ -133,15 +134,18 @@ fun validDomain s =
 fun validNode s = List.exists (fn s' => s = s') nodes
 
 fun yourDomain s = !fakePrivs orelse SS.member (your_domains (), s)
-fun yourUser s = SS.member (your_users (), s)
-fun yourGroup s = SS.member (your_groups (), s)
+fun yourUser s = !fakePrivs orelse SS.member (your_users (), s)
+fun yourGroup s = !fakePrivs orelse SS.member (your_groups (), s)
+
 fun checkPath paths path =
+    !fakePrivs orelse
     (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) (paths ()))
 val yourPath = checkPath your_paths
 val readablePath = checkPath readable_paths
+
 fun yourIp s = !fakePrivs orelse SS.member (your_ips (), s)
 
 fun yourDomainHost s =
@@ -865,6 +869,7 @@ fun homedirOf uname =
     Posix.SysDB.Passwd.home (Posix.SysDB.getpwnam uname)
 
 fun homedir () = homedirOf (getUser ())
+                handle e => if !fakePrivs then "/tmp" else raise e
 
 type subject = {node : string, domain : string}