X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/976657583f419a6a204400ea90f9758d15243acb..3bf720f753c0a50e6c5f753a9a786d68fa15af93:/src/domain.sml diff --git a/src/domain.sml b/src/domain.sml index 15903a2..b2c0c5c 100644 --- a/src/domain.sml +++ b/src/domain.sml @@ -1,5 +1,5 @@ (* HCoop Domtool (http://hcoop.sourceforge.net/) - * Copyright (c) 2006, Adam Chlipala + * Copyright (c) 2006-2007, Adam Chlipala * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -97,17 +97,29 @@ fun yourDomainHost s = (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 +fun validEmailUser s = + size s > 0 andalso size s < 50 + andalso CharVector.all (fn ch => Char.isAlphaNum ch + orelse ch = #"." + orelse ch = #"_" + orelse ch = #"-" + orelse ch = #"+") s + val validGroup = validUser val _ = Env.type_one "no_spaces" Env.string - (CharVector.all (fn ch => not (Char.isSpace ch))) + (CharVector.all (fn ch => Char.isPrint ch andalso not (Char.isSpace ch) + andalso ch <> #"\"" andalso ch <> #"'")) val _ = Env.type_one "no_newlines" Env.string - (CharVector.all (fn ch => ch <> #"\n" andalso ch <> #"\r")) + (CharVector.all (fn ch => Char.isPrint ch andalso ch <> #"\n" andalso ch <> #"\r" + andalso ch <> #"\"" andalso ch <> #"'")) val _ = Env.type_one "ip" Env.string @@ -153,6 +165,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 @@ -169,9 +188,15 @@ 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 slavesD = (EList (map (fn s => (EString s, dl)) Config.slaveNodes), dl) + +val _ = Defaults.registerDefault ("Aliases", + (TList (TBase "your_domain", dl), dl), + (fn () => (EList [], dl))) + val _ = Defaults.registerDefault ("Mailbox", (TBase "email", dl), (fn () => (EString (getUser ()), dl))) @@ -180,7 +205,7 @@ val _ = Defaults.registerDefault ("DNS", (TBase "dnsKind", dl), (fn () => multiApp ((EVar "useDns", dl), dl, - [soaD, masterD, (EList [], dl)]))) + [soaD, masterD, slavesD]))) val _ = Defaults.registerDefault ("TTL", (TBase "int", dl), @@ -221,11 +246,14 @@ datatype master = ExternalMaster of string | InternalMaster of string -val ip = fn (EApp ((EVar "ip_of_node", _), e), _) => Option.map nodeIp (Env.string e) - | e => 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 (ip e) + | (EApp ((EVar "internalMaster", _), e), _) => Option.map InternalMaster (Env.string e) | _ => NONE datatype dnsKind = @@ -264,16 +292,57 @@ 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) => "") +val currentPathAli = ref (fn (_ : string, _ : string) => "") val scratch = ref "" fun currentDomain () = !current +val currentsAli = ref ([] : string list) + +fun currentAliasDomains () = !currentsAli +fun currentDomains () = currentDomain () :: currentAliasDomains () + fun domainFile {node, name} = ((*print ("Opening " ^ !currentPath node ^ name ^ "\n");*) TextIO.openOut (!currentPath node ^ name)) +type files = {write : string -> unit, + writeDom : unit -> unit, + close : unit -> unit} + +fun domainsFile {node, name} = + let + val doms = currentDomains () + val files = map (fn dom => (dom, TextIO.openOut (!currentPathAli (dom, node) ^ name))) doms + in + {write = fn s => app (fn (_, outf) => TextIO.output (outf, s)) files, + writeDom = fn () => app (fn (dom, outf) => TextIO.output (outf, dom)) files, + close = fn () => app (fn (_, outf) => TextIO.closeOut outf) files} + end + fun getPath domain = let val toks = String.fields (fn ch => ch = #".") domain @@ -437,58 +506,67 @@ val _ = Env.containerV_one "domain" let val kind = Env.env dnsKind (evs, "DNS") val ttl = Env.env Env.int (evs, "TTL") + val aliases = Env.env (Env.list Env.string) (evs, "Aliases") val path = getPath dom val () = (current := dom; - currentPath := (fn site => path (Config.tmpDir, site))) + currentsAli := Slave.remove (Slave.removeDups aliases, dom); + currentPath := (fn site => path (Config.tmpDir, site)); + currentPathAli := (fn (dom, site) => getPath dom (Config.tmpDir, site))) fun saveSoa (kind, soa : soa) node = let - val outf = domainFile {node = node, name = "soa"} + val {write, writeDom, close} = domainsFile {node = node, name = "soa"} in - TextIO.output (outf, kind); - TextIO.output (outf, "\n"); - TextIO.output (outf, Int.toString ttl); - TextIO.output (outf, "\n"); - TextIO.output (outf, #ns soa); - TextIO.output (outf, "\n"); + write kind; + write "\n"; + write (Int.toString ttl); + write "\n"; + write (#ns soa); + write "\n"; case #serial soa of NONE => () - | SOME n => TextIO.output (outf, Int.toString n); - TextIO.output (outf, "\n"); - TextIO.output (outf, Int.toString (#ref soa)); - TextIO.output (outf, "\n"); - TextIO.output (outf, Int.toString (#ret soa)); - TextIO.output (outf, "\n"); - TextIO.output (outf, Int.toString (#exp soa)); - TextIO.output (outf, "\n"); - TextIO.output (outf, Int.toString (#min soa)); - TextIO.output (outf, "\n"); - TextIO.closeOut outf + | SOME n => write (Int.toString n); + write "\n"; + write (Int.toString (#ref soa)); + write "\n"; + write (Int.toString (#ret soa)); + write "\n"; + write (Int.toString (#exp soa)); + write "\n"; + write (Int.toString (#min soa)); + write "\n"; + close () end - fun saveNamed (kind, soa : soa, masterIp) node = - let - val outf = domainFile {node = node, name = "named.conf"} - in - TextIO.output (outf, "\nzone \""); - TextIO.output (outf, dom); - TextIO.output (outf, "\" IN {\n\ttype "); - TextIO.output (outf, kind); - TextIO.output (outf, ";\n\tfile \""); - 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 { "); - TextIO.output (outf, masterIp); - TextIO.output (outf, " };\n")); - TextIO.output (outf, "};\n"); - TextIO.closeOut outf - end + fun saveNamed (kind, soa : soa, masterIp, slaveIps) node = + if dom = "localhost" then + () + else let + val {write, writeDom, close} = domainsFile {node = node, name = "named.conf"} + in + write "\nzone \""; + writeDom (); + write "\" {\n\ttype "; + write kind; + write ";\n\tfile \""; + write Config.Bind.zonePath_real; + write "/"; + writeDom (); + write ".zone\";\n"; + case kind of + "master" => (write "\tallow-transfer {\n"; + app (fn ip => (write "\t\t"; + write ip; + write ";\n")) slaveIps; + write "\t};\n") + | _ => (write "\tmasters { "; + write masterIp; + write "; };\n"); + write "};\n"; + close () + end in case kind of NoDns => masterNode := NONE @@ -496,19 +574,21 @@ val _ = Env.containerV_one "domain" let val masterIp = case #master dns of - InternalMaster node => valOf (SM.find (nodeMap, node)) + InternalMaster node => nodeIp node | ExternalMaster ip => ip + + val slaveIps = map nodeIp (#slaves dns) in app (saveSoa ("slave", #soa dns)) (#slaves dns); - app (saveNamed ("slave", #soa dns, masterIp)) (#slaves dns); + app (saveNamed ("slave", #soa dns, masterIp, slaveIps)) (#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 + saveNamed ("master", #soa dns, masterIp, slaveIps) node) + | _ => masterNode := NONE + end; + !befores dom end, fn () => !afters (!current)) @@ -525,6 +605,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 () @@ -566,35 +675,6 @@ val () = Env.registerPost (fn () => 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; @@ -602,4 +682,96 @@ val () = Env.registerPost (fn () => 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 deleting 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 + +fun homedirOf uname = + Posix.SysDB.Passwd.home (Posix.SysDB.getpwnam uname) + +fun homedir () = homedirOf (getUser ()) + end