ip_of_node support
[hcoop/domtool2.git] / src / domain.sml
index 91d8005..15903a2 100644 (file)
 
 structure Domain :> DOMAIN = struct
 
+open MsgTypes
+
 structure SM = DataStructures.StringMap
 structure SS = DataStructures.StringSet
 
+val ssl_context = ref (NONE : OpenSSL.context option)
+fun set_context ctx = ssl_context := SOME ctx
+
 val nodes = map #1 Config.nodeIps
 val nodeMap = foldl (fn ((node, ip), mp) => SM.insert (mp, node, ip))
                    SM.empty Config.nodeIps
 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 +48,17 @@ fun your_groups () = !your_grps
 val your_pths = ref SS.empty
 fun your_paths () = !your_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"})
+
 fun validIp s =
     case map Int.fromString (String.fields (fn ch => ch = #".") s) of
        [SOME n1, SOME n2, SOME n3, SOME n4] =>
@@ -71,9 +86,28 @@ fun yourPath path =
                                     orelse ch = #"-" orelse ch = #"_") path
     andalso SS.exists (fn s' => path = s' orelse String.isPrefix (s' ^ "/") path) (your_paths ())
 
+fun yourDomainHost s =
+    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)))
+    end
+
+fun validUser s = size s > 0 andalso size s < 20
+                 andalso CharVector.all Char.isAlphaNum s
+
+val validGroup = validUser
+
 val _ = Env.type_one "no_spaces"
                     Env.string
                     (CharVector.all (fn ch => not (Char.isSpace ch)))
+val _ = Env.type_one "no_newlines"
+                    Env.string
+                    (CharVector.all (fn ch => ch <> #"\n" andalso ch <> #"\r"))
 
 val _ = Env.type_one "ip"
        Env.string
@@ -91,6 +125,18 @@ val _ = Env.type_one "your_domain"
        Env.string
        yourDomain
 
+val _ = Env.type_one "your_domain_host"
+       Env.string
+       yourDomainHost
+
+val _ = Env.type_one "user"
+       Env.string
+       validUser
+
+val _ = Env.type_one "group"
+       Env.string
+       validGroup
+
 val _ = Env.type_one "your_user"
        Env.string
        yourUser
@@ -126,15 +172,19 @@ 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 ("Mailbox",
+                                 (TBase "email", dl),
+                                 (fn () => (EString (getUser ()), 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,
@@ -171,8 +221,11 @@ datatype master =
         ExternalMaster of string
        | InternalMaster of string
 
-val master = fn (EApp ((EVar "externalMaster", _), e), _) => Option.map ExternalMaster (Env.string e)
-             | (EApp ((EVar "internalMaster", _), e), _) => Option.map InternalMaster (Env.string e)
+val ip = fn (EApp ((EVar "ip_of_node", _), e), _) => Option.map nodeIp (Env.string e)
+         | e => Env.string e
+
+val master = fn (EApp ((EVar "externalMaster", _), e), _) => Option.map ExternalMaster (ip e)
+             | (EApp ((EVar "internalMaster", _), e), _) => Option.map InternalMaster (ip e)
              | _ => NONE
 
 datatype dnsKind =
@@ -191,6 +244,7 @@ val dnsKind = fn (EApp ((EApp ((EApp
                                    master = mstr,
                                    slaves = slaves})
                    | _ => NONE)
+              | (EVar "noDns", _) => SOME NoDns
               | _ => NONE
 
 val befores = ref (fn (_ : string) => ())
@@ -366,8 +420,8 @@ fun findAllDiffs () =
                            before Posix.FileSys.closedir dir
                        end
                in
-                   explore (OS.Path.joinDirFile {dir = Config.tmpDir,
-                                                 file = site}, diffs)
+                   exploreSites (explore (OS.Path.joinDirFile {dir = Config.tmpDir,
+                                                               file = site}, diffs))
                end
     in
        exploreSites []
@@ -423,7 +477,7 @@ val _ = Env.containerV_one "domain"
                                           TextIO.output (outf, "\" IN {\n\ttype ");
                                           TextIO.output (outf, kind);
                                           TextIO.output (outf, ";\n\tfile \"");
-                                          TextIO.output (outf, Config.Bind.zonePath);
+                                          TextIO.output (outf, Config.Bind.zonePath_real);
                                           TextIO.output (outf, "/");
                                           TextIO.output (outf, dom);
                                           TextIO.output (outf, ".zone\";\n");
@@ -458,17 +512,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;
@@ -514,12 +557,49 @@ val () = Env.registerPost (fn () =>
                              in
                                  if !ErrorMsg.anyErrors then
                                      ()
-                                 else
-                                     Slave.handleChanges (map #2 diffs)(*;
+                                 else let
+                                         val changed = foldl (fn ((site, file), changed) =>
+                                                                 let
+                                                                     val ls = case SM.find (changed, site) of
+                                                                                  NONE => []
+                                                                                | SOME ls => ls
+                                                                 in
+                                                                     SM.insert (changed, site, file :: ls)
+                                                                 end) SM.empty diffs
+
+                                         fun handleSite (site, files) =
+                                             let
+                                                 
+                                             in
+                                                 print ("New configuration for node " ^ site ^ "\n");
+                                                 if site = Config.defaultNode then
+                                                     Slave.handleChanges files
+                                                 else let
+                                                         val bio = OpenSSL.connect (valOf (!ssl_context),
+                                                                                    nodeIp site
+                                                                                    ^ ":"
+                                                                                    ^ Int.toString Config.slavePort)
+                                                     in
+                                                         app (fn file => Msg.send (bio, MsgFile file)) files;
+                                                         Msg.send (bio, MsgDoFiles);
+                                                         case Msg.recv bio of
+                                                             NONE => print "Slave closed connection unexpectedly\n"
+                                                           | SOME m =>
+                                                             case m of
+                                                                 MsgOk => print ("Slave " ^ site ^ " finished\n")
+                                                               | MsgError s => print ("Slave " ^ site
+                                                                                      ^ " returned error: " ^
+                                                                                      s ^ "\n")
+                                                               | _ => print ("Slave " ^ site
+                                                                             ^ " returned unexpected command\n");
+                                                         OpenSSL.close bio
+                                                     end
+                                             end
+                                     in
+                                         SM.appi handleSite changed
+                                     end;
                                  ignore (Slave.shellF ([Config.rm, " -rf ", Config.tmpDir, ""],
-                                                    fn cl => "Temp file cleanup failed: " ^ cl))*)
+                                                    fn cl => "Temp file cleanup failed: " ^ cl))
                              end)
 
-
-
 end