X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/e0b0abd209a1ecbd9266cfcf8735af171f96869b..411a85f26421358c20b11839310cce6caff8cf77:/src/domain.sml diff --git a/src/domain.sml b/src/domain.sml index d2dfbde..85dcd67 100644 --- a/src/domain.sml +++ b/src/domain.sml @@ -20,6 +20,45 @@ 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 getUser () = !usr + +val your_doms = ref SS.empty +fun your_domains () = !your_doms + +val your_usrs = ref SS.empty +fun your_users () = !your_usrs + +val your_grps = ref SS.empty +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] => @@ -36,7 +75,39 @@ fun validDomain s = size s > 0 andalso size s < 100 andalso List.all validHost (String.fields (fn ch => ch = #".") s) -fun validNode s = List.exists (fn s' => s = s') Config.nodes +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 yourPath 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) (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 @@ -50,6 +121,34 @@ val _ = Env.type_one "domain" Env.string validDomain +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 + +val _ = Env.type_one "your_group" + Env.string + yourGroup + +val _ = Env.type_one "your_path" + Env.string + yourPath + val _ = Env.type_one "node" Env.string validNode @@ -70,18 +169,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), - (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), - (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, @@ -118,7 +223,10 @@ datatype master = ExternalMaster of string | InternalMaster of string -val master = fn (EApp ((EVar "externalMaster", _), e), _) => Option.map ExternalMaster (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 (Env.string e) | _ => NONE @@ -138,6 +246,7 @@ val dnsKind = fn (EApp ((EApp ((EApp master = mstr, slaves = slaves}) | _ => NONE) + | (EVar "noDns", _) => SOME NoDns | _ => NONE val befores = ref (fn (_ : string) => ()) @@ -199,7 +308,7 @@ fun getPath domain = handle OS.SysErr _ => OS.FileSys.mkDir tmpPath end in - app doNode Config.nodes; + app doNode nodes; elems end) [] toks in @@ -313,8 +422,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 [] @@ -361,7 +470,7 @@ val _ = Env.containerV_one "domain" TextIO.closeOut outf end - fun saveNamed (kind, soa : soa) node = + fun saveNamed (kind, soa : soa, masterIp) node = let val outf = domainFile {node = node, name = "named.conf"} in @@ -370,31 +479,38 @@ 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"); case kind of "master" => TextIO.output (outf, "\tallow-update { none; };\n") - | _ => TextIO.output (outf, "\tmasters { 1.2.3.4; };\n"); - TextIO.output (outf, "}\n"); + | _ => (TextIO.output (outf, "\tmasters { "); + TextIO.output (outf, masterIp); + TextIO.output (outf, "; };\n")); + TextIO.output (outf, "};\n"); TextIO.closeOut outf end - - fun saveBoth ks = (saveSoa ks; saveNamed ks) in case kind of NoDns => masterNode := NONE | UseDns dns => - (app (saveSoa ("slave", #soa dns)) (#slaves dns); - app (saveNamed ("slave", #soa dns)) (#slaves dns); - case #master dns of - InternalMaster node => - (masterNode := SOME node; - saveSoa ("master", #soa dns) node; - saveNamed ("master", #soa dns) node) - | _ => masterNode := NONE); - !befores dom + let + val masterIp = + case #master dns of + InternalMaster node => valOf (SM.find (nodeMap, node)) + | ExternalMaster ip => ip + in + app (saveSoa ("slave", #soa dns)) (#slaves dns); + app (saveNamed ("slave", #soa dns, masterIp)) (#slaves dns); + case #master dns of + InternalMaster node => + (masterNode := SOME node; + saveSoa ("master", #soa dns) node; + saveNamed ("master", #soa dns, masterIp) node) + | _ => masterNode := NONE; + !befores dom + end end, fn () => !afters (!current)) @@ -404,12 +520,12 @@ val () = Env.registerPre (fn () => (ignore (Slave.shellF ([Config.rm, " -rf ", C app (fn node => OS.FileSys.mkDir (OS.Path.joinDirFile {dir = Config.tmpDir, file = node})) - Config.nodes; + nodes; app (fn node => OS.FileSys.mkDir (OS.Path.joinDirFile {dir = Config.resultRoot, file = node}) handle OS.SysErr _ => ()) - Config.nodes)) + nodes)) val () = Env.registerPost (fn () => let @@ -443,12 +559,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)) end) - - end