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
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
Env.string
yourPath
+val _ = Env.type_one "readable_path"
+ Env.string
+ readablePath
+
val _ = Env.type_one "node"
Env.string
validNode
handle OS.SysErr _ =>
ErrorMsg.error NONE ("Delete failed for " ^ dst);
(site,
- {action = Slave.Delete,
+ {action = Slave.Delete true,
domain = dom,
dir = dir,
file = dst}))
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) =
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)
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
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
HCoop / hcoop / domtool2.git / blobdiff