Server executing client's requested configuration with the right permissions

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

diff --git a/src/domain.sml b/src/domain.sml
index 4b4042f..2d566a3 100644 (file)
--- a/src/domain.sml
+++ b/src/domain.sml
@@ -29,7 +29,6 @@ val nodeMap = foldl (fn ((node, ip), mp) => SM.insert (mp, node, ip))
 fun nodeIp node = valOf (SM.find (nodeMap, node))
 
 val usr = ref ""
-fun setUser ur = usr := ur
 fun getUser () = !usr
 
 val your_doms = ref SS.empty
@@ -44,6 +43,17 @@ fun your_groups () = !your_grps
 val your_pths = ref SS.empty
 fun your_paths () = !your_pths
 
+fun setUser user =
+    (usr := Config.testUser;
+     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"})
+
 fun validIp s =
     case map Int.fromString (String.fields (fn ch => ch = #".") s) of
        [SOME n1, SOME n2, SOME n3, SOME n4] =>
@@ -72,13 +82,14 @@ fun yourPath path =
     andalso SS.exists (fn s' => path = s' orelse String.isPrefix (s' ^ "/") path) (your_paths ())
 
 fun yourDomainHost s =
-    let
+    yourDomain s
+    orelse let
        val (pref, suf) = Substring.splitl (fn ch => ch <> #".") (Substring.full s)
     in
        Substring.size suf > 0
        andalso validHost (Substring.string pref)
        andalso yourDomain (Substring.string
-                              (Substring.slice (suf, 1, NONE)))
+                               (Substring.slice (suf, 1, NONE)))
     end
 
 fun validUser s = size s > 0 andalso size s < 20
@@ -156,15 +167,15 @@ val masterD = (EApp ((EVar "internalMaster", dl),
                     (EString Config.defaultNode, dl)),
               dl)
 
-val _ = Main.registerDefault ("DNS",
-                             (TBase "dnsKind", dl),
-                             (fn () => multiApp ((EVar "useDns", dl),
-                                        dl,
-                                        [soaD, masterD, (EList [], dl)])))
+val _ = Defaults.registerDefault ("DNS",
+                                 (TBase "dnsKind", dl),
+                                 (fn () => multiApp ((EVar "useDns", dl),
+                                                     dl,
+                                                     [soaD, masterD, (EList [], dl)])))
 
-val _ = Main.registerDefault ("TTL",
-                             (TBase "int", dl),
-                             (fn () => (EInt Config.Bind.defaultTTL, dl)))
+val _ = Defaults.registerDefault ("TTL",
+                                 (TBase "int", dl),
+                                 (fn () => (EInt Config.Bind.defaultTTL, dl)))
 
 type soa = {ns : string,
            serial : int option,
@@ -221,6 +232,7 @@ val dnsKind = fn (EApp ((EApp ((EApp
                                    master = mstr,
                                    slaves = slaves})
                    | _ => NONE)
+              | (EVar "noDns", _) => SOME NoDns
               | _ => NONE
 
 val befores = ref (fn (_ : string) => ())
@@ -488,17 +500,6 @@ val _ = Env.containerV_one "domain"
                               end,
                            fn () => !afters (!current))
 
-val () = Env.registerPreTycheck (fn () => (setUser Config.testUser;
-                                          Acl.read Config.aclFile;
-                                          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"}))
-
 val () = Env.registerPre (fn () => (ignore (Slave.shellF ([Config.rm, " -rf ", Config.tmpDir, ""],
                                                       fn cl => "Temp file cleanup failed: " ^ cl));
                                    OS.FileSys.mkDir Config.tmpDir;
@@ -545,9 +546,9 @@ val () = Env.registerPost (fn () =>
                                  if !ErrorMsg.anyErrors then
                                      ()
                                  else
-                                     Slave.handleChanges (map #2 diffs)(*;
+                                     Slave.handleChanges (map #2 diffs);
                                  ignore (Slave.shellF ([Config.rm, " -rf ", Config.tmpDir, ""],
-                                                    fn cl => "Temp file cleanup failed: " ^ cl))*)
+                                                    fn cl => "Temp file cleanup failed: " ^ cl))
                              end)