X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/fdc43c6c0d3d994d2e186b35684fea500d00ed22..9508ffdf9ea4f8d347068cc6bb01755de7fe9b7d:/src/domain.sml diff --git a/src/domain.sml b/src/domain.sml index 488d7a8..85781a8 100644 --- a/src/domain.sml +++ b/src/domain.sml @@ -27,11 +27,13 @@ structure SS = DataStructures.StringSet 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 @@ -69,8 +71,9 @@ fun setUser user = 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 (), @@ -132,15 +135,18 @@ fun validDomain s = 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 yourDomainHost s = @@ -235,6 +241,10 @@ val _ = Env.type_one "node" Env.string validNode +val _ = Env.type_one "mime_type" + Env.string + (CharVector.exists (fn ch => ch = #"/")) + val _ = Env.registerFunction ("your_ip_to_ip", fn [e] => SOME e | _ => NONE) @@ -262,40 +272,18 @@ val _ = Env.registerFunction ("end_in_slash", | _ => 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 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 _ = Env.registerFunction ("you", + fn [] => SOME (EString (getUser ()), dl) + | _ => NONE) -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, @@ -609,7 +597,7 @@ val _ = Env.containerV_one "domain" fun saveSoa (kind, soa : soa) node = let - val {write, writeDom, close} = domainsFile {node = node, name = "soa"} + val {write, writeDom, close} = domainsFile {node = node, name = "soa.conf"} in write kind; write "\n"; @@ -674,7 +662,6 @@ val _ = Env.containerV_one "domain" 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 => @@ -706,7 +693,7 @@ fun handleSite (site, files) = 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), @@ -808,7 +795,7 @@ val _ = Env.type_one "mail_node" fun rmdom' delete resultRoot doms = let - fun doNode (node, _) = + fun doNode (node, _, _) = let val dname = OS.Path.joinDirFile {dir = resultRoot, file = node} @@ -857,7 +844,7 @@ fun rmdom' delete resultRoot doms = end handle IO.Io _ => print ("Warning: IO error deleting domains on " ^ node ^ ".\n") - fun cleanupNode (node, _) = + fun cleanupNode (node, _, _) = let fun doDom dom = let @@ -886,6 +873,7 @@ fun homedirOf uname = 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} @@ -979,7 +967,7 @@ fun considerAll ds {node, domain} = "" end -val () = registerDescriber (considerAll [Filename {filename = "soa", +val () = registerDescriber (considerAll [Filename {filename = "soa.conf", heading = "DNS SOA:", showEmpty = false}]) @@ -989,4 +977,15 @@ val () = Env.registerAction ("domainHost", (EString (host ^ "." ^ currentDomain ()), dl)) | (_, args) => Env.badArgs ("domainHost", args)) +val ouc = ref (fn () => ()) + +fun registerOnUsersChange f = + let + val f' = !ouc + in + ouc := (fn () => (f' (); f ())) + end + +fun onUsersChange () = !ouc () + end