'-fake' flag added to 'domtool'

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

diff --git a/src/domain.sml b/src/domain.sml
index 8384f85..f31d704 100644 (file)
--- a/src/domain.sml
+++ b/src/domain.sml
@@ -35,6 +35,8 @@ fun nodeIp node = valOf (SM.find (nodeMap, node))
 
 val usr = ref ""
 fun getUser () = !usr
+val fakePrivs = ref false
+val isClient = ref false
 
 val your_doms = ref SS.empty
 fun your_domains () = !your_doms
@@ -62,6 +64,7 @@ fun setUser user =
        val your_paths = Acl.class {user = getUser (),
                                    class = "path"}
     in
+       fakePrivs := false;
        your_doms := Acl.class {user = getUser (),
                                class = "domain"};
        your_usrs := Acl.class {user = getUser (),
@@ -74,6 +77,12 @@ fun setUser user =
                                class = "ip"}
     end
 
+fun declareClient () = isClient := true
+fun fakePrivileges () = if !isClient then
+                           fakePrivs := true
+                       else
+                           raise Fail "Tried to fake privileges as non-client"
+
 fun validIp s =
     case map Int.fromString (String.fields (fn ch => ch = #".") s) of
        [SOME n1, SOME n2, SOME n3, SOME n4] =>
@@ -113,29 +122,31 @@ fun validIpv6 s =
 fun isIdent ch = Char.isLower ch orelse Char.isDigit ch
 
 fun validHost s =
-    size s > 0 andalso size s < 20
+    size s > 0 andalso size s < 50
     andalso CharVector.all (fn ch => isIdent ch orelse ch = #"-") s
 
 fun validDomain s =
-    size s > 0 andalso size s < 100
+    size s > 0 andalso size s < 200
     andalso List.all validHost (String.fields (fn ch => ch = #".") s)
 
 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 yourDomain s = !fakePrivs orelse SS.member (your_domains (), 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 =
-    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 ())
+    !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 = SS.member (your_ips (), s)
+fun yourIp s = !fakePrivs orelse SS.member (your_ips (), s)
 
 fun yourDomainHost s =
-    yourDomain s
+    !fakePrivs
+    orelse yourDomain s
     orelse let
        val (pref, suf) = Substring.splitl (fn ch => ch <> #".") (Substring.full s)
     in
@@ -645,7 +656,10 @@ val _ = Env.containerV_one "domain"
                                                                write "\t};\n")
                                                 | _ => (write "\tmasters { ";
                                                         write masterIp;
-                                                        write "; };\n");
+                                                        write "; };\n";
+                                                        write "// Updated: ";
+                                                        write (Time.toString (Time.now ()));
+                                                        write "\n");
                                               write "};\n";
                                               close ()
                                           end
@@ -696,10 +710,10 @@ fun handleSite (site, files) =
        if site = Config.defaultNode then
            Slave.handleChanges files
        else let
-               val bio = OpenSSL.connect (valOf (!ssl_context),
-                                          nodeIp site
-                                          ^ ":"
-                                          ^ Int.toString Config.slavePort)
+               val bio = OpenSSL.connect true (valOf (!ssl_context),
+                                               nodeIp site
+                                               ^ ":"
+                                               ^ Int.toString Config.slavePort)
            in
                app (fn file => Msg.send (bio, MsgFile file)) files;
                Msg.send (bio, MsgDoFiles);