X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/edd380241e9ba2b750eb9a1f82ffd6feeab6252f..e69e60ccf1aa77a40cd5b15c4361f378ce332a42:/src/domain.sml diff --git a/src/domain.sml b/src/domain.sml index 224755f..04ee532 100644 --- a/src/domain.sml +++ b/src/domain.sml @@ -20,16 +20,20 @@ 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] => @@ -72,16 +87,23 @@ 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 - print ("pref[" ^ Substring.string pref ^ "] suf[" ^ Substring.string suf ^ "]\n"); Substring.size suf > 0 andalso validHost (Substring.string pref) andalso yourDomain (Substring.string - (Substring.slice (suf, 1, NONE))) + (Substring.slice (suf, 1, NONE))) end +val yourDomain = yourDomainHost + +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))) @@ -109,6 +131,14 @@ 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 @@ -125,6 +155,13 @@ val _ = Env.type_one "node" Env.string validNode +val _ = Env.registerFunction ("dns_node_to_node", + fn [e] => SOME e + | _ => NONE) + +val _ = Env.registerFunction ("mail_node_to_node", + fn [e] => SOME e + | _ => NONE) open Ast val dl = ErrorMsg.dummyLoc @@ -141,18 +178,24 @@ val soaD = multiApp ((EVar "soa", dl), [nsD, serialD, refD, retD, expD, minD]) val masterD = (EApp ((EVar "internalMaster", dl), - (EString Config.defaultNode, dl)), + (EString Config.masterNode, dl)), dl) -val _ = Main.registerDefault ("DNS", - (TBase "dnsKind", dl), - (fn () => multiApp ((EVar "useDns", dl), - dl, - [soaD, masterD, (EList [], dl)]))) +val slavesD = (EList (map (fn s => (EString s, dl)) Config.slaveNodes), dl) + +val _ = Defaults.registerDefault ("Mailbox", + (TBase "email", dl), + (fn () => (EString (getUser ()), dl))) -val _ = Main.registerDefault ("TTL", - (TBase "int", dl), - (fn () => (EInt Config.Bind.defaultTTL, dl))) +val _ = Defaults.registerDefault ("DNS", + (TBase "dnsKind", dl), + (fn () => multiApp ((EVar "useDns", dl), + dl, + [soaD, masterD, slavesD]))) + +val _ = Defaults.registerDefault ("TTL", + (TBase "int", dl), + (fn () => (EInt Config.Bind.defaultTTL, dl))) type soa = {ns : string, serial : int option, @@ -189,7 +232,13 @@ datatype master = ExternalMaster of string | InternalMaster of string -val master = fn (EApp ((EVar "externalMaster", _), e), _) => Option.map ExternalMaster (Env.string e) +val ip = Env.string + +val _ = Env.registerFunction ("ip_of_node", + fn [(EString node, _)] => SOME (EString (nodeIp node), dl) + | _ => NONE) + +val master = fn (EApp ((EVar "externalMaster", _), e), _) => Option.map ExternalMaster (ip e) | (EApp ((EVar "internalMaster", _), e), _) => Option.map InternalMaster (Env.string e) | _ => NONE @@ -209,6 +258,7 @@ val dnsKind = fn (EApp ((EApp ((EApp master = mstr, slaves = slaves}) | _ => NONE) + | (EVar "noDns", _) => SOME NoDns | _ => NONE val befores = ref (fn (_ : string) => ()) @@ -228,6 +278,27 @@ fun registerAfter f = afters := (fn x => (old x; f x)) end +val globals = ref (fn () => ()) +val locals = ref (fn () => ()) + +fun registerResetGlobal f = + let + val old = !globals + in + globals := (fn x => (old x; f x)) + end + +fun registerResetLocal f = + let + val old = !locals + in + locals := (fn x => (old x; f x)) + end + +fun resetGlobal () = (!globals (); + ignore (OS.Process.system (Config.rm ^ " -rf " ^ Config.resultRoot ^ "/*"))) +fun resetLocal () = !locals () + val current = ref "" val currentPath = ref (fn (_ : string) => "") @@ -384,8 +455,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 [] @@ -441,7 +512,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"); @@ -449,7 +520,7 @@ val _ = Env.containerV_one "domain" "master" => TextIO.output (outf, "\tallow-update { none; };\n") | _ => (TextIO.output (outf, "\tmasters { "); TextIO.output (outf, masterIp); - TextIO.output (outf, " };\n")); + TextIO.output (outf, "; };\n")); TextIO.output (outf, "};\n"); TextIO.closeOut outf end @@ -476,17 +547,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; @@ -500,6 +560,35 @@ val () = Env.registerPre (fn () => (ignore (Slave.shellF ([Config.rm, " -rf ", C handle OS.SysErr _ => ()) nodes)) +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 + val () = Env.registerPost (fn () => let val diffs = findAllDiffs () @@ -532,12 +621,107 @@ 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 + 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) +fun hasPriv priv = Acl.query {user = getUser (), class = "priv", value = "all"} + orelse Acl.query {user = getUser (), class = "priv", value = priv} +val _ = Env.type_one "dns_node" + Env.string + (fn node => + List.exists (fn x => x = node) Config.dnsNodes_all + orelse (hasPriv "dns" + andalso List.exists (fn x => x = node) Config.dnsNodes_admin)) + +val _ = Env.type_one "mail_node" + Env.string + (fn node => + List.exists (fn x => x = node) Config.mailNodes_all + orelse (hasPriv "mail" + andalso List.exists (fn x => x = node) Config.mailNodes_admin)) + +fun rmdom doms = + let + fun doNode (node, _) = + let + val dname = OS.Path.joinDirFile {dir = Config.resultRoot, + file = node} + + fun doDom (dom, actions) = + let + val domPath = String.concatWith "/" (rev (String.fields (fn ch => ch = #".") dom)) + val dname = OS.Path.concat (dname, domPath) + + fun visitDom (dom, dname, actions) = + let + val dir = Posix.FileSys.opendir dname + + fun loop actions = + case Posix.FileSys.readdir dir of + NONE => actions + | SOME fname => + let + val fnameFull = OS.Path.joinDirFile {dir = dname, + file = fname} + in + if Posix.FileSys.ST.isDir (Posix.FileSys.stat fnameFull) then + loop (visitDom (fname ^ "." ^ dom, + fnameFull, + actions)) + else + loop ({action = Slave.Delete, + domain = dom, + dir = dname, + file = fnameFull} :: actions) + end + in + loop actions + before Posix.FileSys.closedir dir + end + handle OS.SysErr _ => + (print ("Warning: System error deleteing domain " ^ dom ^ " on " ^ node ^ ".\n"); + actions) + in + visitDom (dom, dname, actions) + end + + val actions = foldl doDom [] doms + in + handleSite (node, actions) + end + handle IO.Io _ => print ("Warning: IO error deleting domains on " ^ node ^ ".\n") + + fun cleanupNode (node, _) = + let + fun doDom dom = + let + val domPath = String.concatWith "/" (rev (String.fields (fn ch => ch = #".") dom)) + val dname = OS.Path.joinDirFile {dir = Config.resultRoot, + file = node} + val dname = OS.Path.concat (dname, domPath) + in + ignore (OS.Process.system (Config.rm ^ " -rf " ^ dname)) + end + in + app doDom doms + end + in + app doNode Config.nodeIps; + app cleanupNode Config.nodeIps + end end