val ssl_context = ref (NONE : OpenSSL.context option)
fun set_context ctx = ssl_context := SOME ctx
+fun get_context () = valOf (!ssl_context)
val nodes = map #1 Config.nodeIps
-val nodeMap = foldl (fn ((node, ip), mp) => SM.insert (mp, node, ip))
+val nodeMap = foldl (fn ((node, ip, ipv6), mp) => SM.insert (mp, node, (ip, ipv6)))
SM.empty Config.nodeIps
-fun nodeIp node = valOf (SM.find (nodeMap, node))
+fun nodeIp node = #1 (valOf (SM.find (nodeMap, node)))
+fun nodeIpv6 node = #2 (valOf (SM.find (nodeMap, node)))
val usr = ref ""
fun getUser () = !usr
val your_ipss = ref SS.empty
fun your_ips () = !your_ipss
+val your_ipv6ss = ref SS.empty
+fun your_ipv6s () = !your_ipv6ss
+
val world_readable = SS.addList (SS.empty, Config.worldReadable)
val readable_pths = ref world_readable
fun readable_paths () = !readable_pths
class = "domain"};
your_usrs := Acl.class {user = getUser (),
class = "user"};
- your_grps := Acl.class {user = getUser (),
- class = "group"};
+ your_grps := SS.add (Acl.class {user = getUser (),
+ class = "group"},
+ "nogroup");
your_pths := your_paths;
readable_pths := SS.union (your_paths, world_readable);
your_ipss := Acl.class {user = getUser (),
- class = "ip"}
+ class = "ip"};
+ your_ipv6ss := Acl.class {user = getUser (),
+ class = "ipv6"}
end
fun declareClient () = isClient := true
fun validNode s = List.exists (fn s' => s = s') nodes
fun yourDomain s = !fakePrivs orelse SS.member (your_domains (), s)
-fun yourUser s = SS.member (your_users (), s)
-fun yourGroup s = SS.member (your_groups (), s)
+fun yourUser s = !fakePrivs orelse SS.member (your_users (), s)
+fun yourGroup s = !fakePrivs orelse SS.member (your_groups (), s)
+
fun checkPath paths path =
+ !fakePrivs orelse
(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) (paths ()))
val yourPath = checkPath your_paths
val readablePath = checkPath readable_paths
+
fun yourIp s = !fakePrivs orelse SS.member (your_ips (), s)
+fun yourIpv6 s = !fakePrivs orelse SS.member (your_ipv6s (), s)
fun yourDomainHost s =
!fakePrivs
Env.string
yourIp
+val _ = Env.type_one "your_ipv6"
+ Env.string
+ yourIpv6
+
val _ = Env.type_one "node"
Env.string
validNode
fn [e] => SOME e
| _ => NONE)
+val _ = Env.registerFunction ("your_ipv6_to_ipv6",
+ fn [e] => SOME e
+ | _ => NONE)
+
val _ = Env.registerFunction ("dns_node_to_node",
fn [e] => SOME e
| _ => NONE)
| _ => NONE)
-val nsD = (EString Config.defaultNs, dl)
-val serialD = (EVar "serialAuto", dl)
-val refD = (EInt Config.defaultRefresh, dl)
-val retD = (EInt Config.defaultRetry, dl)
-val expD = (EInt Config.defaultExpiry, dl)
-val minD = (EInt Config.defaultMinimum, dl)
+val _ = Env.registerFunction ("you",
+ fn [] => SOME (EString (getUser ()), dl)
+ | _ => NONE)
-val soaD = multiApp ((EVar "soa", dl),
- dl,
- [nsD, serialD, refD, retD, expD, minD])
-
-val masterD = (EApp ((EVar "internalMaster", 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)))
+val _ = Env.registerFunction ("defaultMailbox",
+ fn [] => SOME (EString (getUser ()), dl)
+ | _ => NONE)
-val _ = Defaults.registerDefault ("DNS",
- (TBase "dnsKind", dl),
- (fn () => multiApp ((EVar "useDns", dl),
- dl,
- [soaD, masterD, slavesD])))
+val _ = Env.registerFunction ("defaultMailUser",
+ fn [] => SOME (EString (getUser ()), dl)
+ | _ => NONE)
-val _ = Defaults.registerDefault ("TTL",
- (TBase "int", dl),
- (fn () => (EInt Config.Bind.defaultTTL, dl)))
type soa = {ns : string,
serial : int option,
fn [(EString node, _)] => SOME (EString (nodeIp node), dl)
| _ => NONE)
+val _ = Env.registerFunction ("ipv6_of_node",
+ fn [(EString node, _)] => SOME (EString (nodeIpv6 node), dl)
+ | _ => NONE)
+
val master = fn (EApp ((EVar "externalMaster", _), e), _) => Option.map ExternalMaster (ip e)
| (EApp ((EVar "internalMaster", _), e), _) => Option.map InternalMaster (Env.string e)
| _ => NONE
val slaveIps = map nodeIp (#slaves dns)
in
- app (saveSoa ("slave", #soa dns)) (#slaves dns);
app (saveNamed ("slave", #soa dns, masterIp, slaveIps)) (#slaves dns);
case #master dns of
InternalMaster node =>
in
print ("New configuration for node " ^ site ^ "\n");
- if site = Config.defaultNode then
+ if site = Config.dispatcherName then
Slave.handleChanges files
else let
val bio = OpenSSL.connect true (valOf (!ssl_context),
fun rmdom' delete resultRoot doms =
let
- fun doNode (node, _) =
+ fun doNode (node, _, _) =
let
val dname = OS.Path.joinDirFile {dir = resultRoot,
file = node}
end
handle IO.Io _ => print ("Warning: IO error deleting domains on " ^ node ^ ".\n")
- fun cleanupNode (node, _) =
+ fun cleanupNode (node, _, _) =
let
fun doDom dom =
let
Posix.SysDB.Passwd.home (Posix.SysDB.getpwnam uname)
fun homedir () = homedirOf (getUser ())
+ handle e => if !fakePrivs then "/tmp" else raise e
type subject = {node : string, domain : string}
HCoop / hcoop / domtool2.git / blobdiff