(* 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
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
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
Env.string
yourPath
+val _ = Env.type_one "readable_path"
+ Env.string
+ readablePath
+
val _ = Env.type_one "node"
Env.string
validNode
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)))
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
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 =
+ fun saveNamed (kind, soa : soa, masterIp, slaveIps) node =
if dom = "localhost" then
()
else let
- val outf = domainFile {node = node, name = "named.conf"}
+ val {write, writeDom, close} = domainsFile {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");
+ 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" => 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
+ "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
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))