X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/b25161c70648676e61db4eead37a84f460182576..aaf70d454f58acba03a931ff915f83d435a85ef3:/src/domain.sml diff --git a/src/domain.sml b/src/domain.sml index ed26bcd..3ecf883 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 @@ -48,16 +48,26 @@ fun your_groups () = !your_grps val your_pths = ref SS.empty fun your_paths () = !your_pths +val world_readable = SS.addList (SS.empty, Config.worldReadable) +val readable_pths = ref SS.empty +fun readable_paths () = !readable_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"}) + let + val () = usr := user + + val your_paths = Acl.class {user = getUser (), + class = "path"} + in + 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 := your_paths; + readable_pths := SS.union (your_paths, world_readable) + end fun validIp s = case map Int.fromString (String.fields (fn ch => ch = #".") s) of @@ -80,11 +90,13 @@ 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 = +fun checkPath paths 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 ()) + andalso SS.exists (fn s' => path = s' orelse String.isPrefix (s' ^ "/") path) (paths ()) +val yourPath = checkPath your_paths +val readablePath = checkPath readable_paths fun yourDomainHost s = yourDomain s @@ -114,10 +126,12 @@ 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 @@ -159,6 +173,10 @@ val _ = Env.type_one "your_path" Env.string yourPath +val _ = Env.type_one "readable_path" + Env.string + readablePath + val _ = Env.type_one "node" Env.string validNode @@ -385,7 +403,7 @@ datatype file_action' = | Delete' of string | Modify' of {src : string, dst : string} -fun findDiffs (site, dom, acts) = +fun findDiffs (prefixes, site, dom, acts) = let val gp = getPath dom val realPath = gp (Config.resultRoot, site) @@ -413,8 +431,10 @@ fun findDiffs (site, dom, acts) = loopReal acts else loopReal ((site, dom, realPath, Modify' {src = tmp, dst = real}) :: acts) - else + else if List.exists (fn prefix => String.isPrefix prefix realPath) prefixes then loopReal ((site, dom, realPath, Delete' real) :: acts) + else + loopReal acts end val acts = loopReal acts @@ -445,7 +465,7 @@ fun findDiffs (site, dom, acts) = acts end -fun findAllDiffs () = +fun findAllDiffs prefixes = let val dir = Posix.FileSys.opendir Config.tmpDir val len = length (String.fields (fn ch => ch = #"/") Config.tmpDir) + 1 @@ -477,7 +497,7 @@ fun findAllDiffs () = file = name} in explore (dname', - findDiffs (site, dom, diffs)) + findDiffs (prefixes, site, dom, diffs)) end else diffs) @@ -498,10 +518,14 @@ fun findAllDiffs () = val masterNode : string option ref = ref NONE fun dnsMaster () = !masterNode +val seenDomains : string list ref = ref [] + val _ = Env.containerV_one "domain" ("domain", Env.string) (fn (evs, dom) => let + val () = seenDomains := dom :: !seenDomains + 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") @@ -590,7 +614,8 @@ val _ = Env.containerV_one "domain" end, fn () => !afters (!current)) -val () = Env.registerPre (fn () => (ignore (Slave.shellF ([Config.rm, " -rf ", Config.tmpDir, ""], +val () = Env.registerPre (fn () => (seenDomains := []; + ignore (Slave.shellF ([Config.rm, " -rf ", Config.tmpDir, ""], fn cl => "Temp file cleanup failed: " ^ cl)); OS.FileSys.mkDir Config.tmpDir; app (fn node => OS.FileSys.mkDir @@ -634,7 +659,15 @@ fun handleSite (site, files) = val () = Env.registerPost (fn () => let - val diffs = findAllDiffs () + val prefixes = List.map (fn dom => + let + val pieces = String.tokens (fn ch => ch = #".") dom + val path = String.concatWith "/" (rev pieces) + in + Config.resultRoot ^ "/" ^ path ^ "/" + end) (!seenDomains) + + val diffs = findAllDiffs prefixes val diffs = map (fn (site, dom, dir, Add' {src, dst}) => (Slave.shellF ([Config.cp, " ", src, " ", dst], @@ -649,7 +682,7 @@ val () = Env.registerPost (fn () => handle OS.SysErr _ => ErrorMsg.error NONE ("Delete failed for " ^ dst); (site, - {action = Slave.Delete, + {action = Slave.Delete true, domain = dom, dir = dir, file = dst})) @@ -697,11 +730,11 @@ val _ = Env.type_one "mail_node" orelse (hasPriv "mail" andalso List.exists (fn x => x = node) Config.mailNodes_admin)) -fun rmdom doms = +fun rmdom' delete resultRoot doms = let fun doNode (node, _) = let - val dname = OS.Path.joinDirFile {dir = Config.resultRoot, + val dname = OS.Path.joinDirFile {dir = resultRoot, file = node} fun doDom (dom, actions) = @@ -725,18 +758,18 @@ fun rmdom doms = loop (visitDom (fname ^ "." ^ dom, fnameFull, actions)) - else - loop ({action = Slave.Delete, - domain = dom, - dir = dname, - file = fnameFull} :: actions) + else + loop ({action = Slave.Delete 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"); + handle OS.SysErr (s, _) => + (print ("Warning: System error deleting domain " ^ dom ^ " on " ^ node ^ ": " ^ s ^ "\n"); actions) in visitDom (dom, dname, actions) @@ -753,11 +786,14 @@ fun rmdom doms = fun doDom dom = let val domPath = String.concatWith "/" (rev (String.fields (fn ch => ch = #".") dom)) - val dname = OS.Path.joinDirFile {dir = Config.resultRoot, + val dname = OS.Path.joinDirFile {dir = resultRoot, file = node} val dname = OS.Path.concat (dname, domPath) in - ignore (OS.Process.system (Config.rm ^ " -rf " ^ dname)) + if delete then + ignore (OS.Process.system (Config.rm ^ " -rf " ^ dname)) + else + () end in app doDom doms @@ -767,9 +803,108 @@ fun rmdom doms = app cleanupNode Config.nodeIps end +val rmdom = rmdom' true Config.resultRoot +val rmdom' = rmdom' false + fun homedirOf uname = Posix.SysDB.Passwd.home (Posix.SysDB.getpwnam uname) fun homedir () = homedirOf (getUser ()) +type subject = {node : string, domain : string} + +val describers : (subject -> string) list ref = ref [] + +fun registerDescriber f = describers := f :: !describers + +fun describeOne arg = String.concat (map (fn f => f arg) (rev (!describers))) + +val line = "--------------------------------------------------------------\n" +val dline = "==============================================================\n" + +fun describe dom = + String.concat (List.mapPartial + (fn node => + case describeOne {node = node, domain = dom} of + "" => NONE + | s => + SOME (String.concat [dline, "Node ", node, "\n", dline, "\n", s])) + nodes) + +datatype description = + Filename of { filename : string, heading : string, showEmpty : bool } + | Extension of { extension : string, heading : string -> string } + +fun considerAll ds {node, domain} = + let + val ds = map (fn d => (d, ref [])) ds + + val path = Config.resultRoot + val jdf = OS.Path.joinDirFile + val path = jdf {dir = path, file = node} + val path = foldr (fn (more, path) => jdf {dir = path, file = more}) + path (String.tokens (fn ch => ch = #".") domain) + in + if Posix.FileSys.access (path, []) then + let + val dir = Posix.FileSys.opendir path + + fun loop () = + case Posix.FileSys.readdir dir of + NONE => () + | SOME fname => + (app (fn (d, entries) => + let + fun readFile showEmpty entries' = + let + val fname = OS.Path.joinDirFile {dir = path, + file = fname} + + val inf = TextIO.openIn fname + + fun loop (seenOne, entries') = + case TextIO.inputLine inf of + NONE => if seenOne orelse showEmpty then + "\n" :: entries' + else + !entries + | SOME line => loop (true, line :: entries') + in + loop (false, entries') + before TextIO.closeIn inf + end + in + case d of + Filename {filename, heading, showEmpty} => + if fname = filename then + entries := readFile showEmpty ("\n" :: line :: ":\n" :: heading :: line :: !entries) + else + () + | Extension {extension, heading} => + let + val {base, ext} = OS.Path.splitBaseExt fname + in + case ext of + NONE => () + | SOME extension' => + if extension' = extension then + entries := readFile true ("\n" :: line :: ":\n" :: heading base :: line :: !entries) + else + () + end + end) ds; + loop ()) + in + loop (); + Posix.FileSys.closedir dir; + String.concat (List.concat (map (fn (_, entries) => rev (!entries)) ds)) + end + else + "" + end + +val () = registerDescriber (considerAll [Filename {filename = "soa", + heading = "DNS SOA", + showEmpty = false}]) + end