X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/d08b9cf26fd841b6ac665ae0eba83d69f53a809c..400fd64b3e8a53f43534eb5cf23ad4cfcf79ce93:/src/domain.sml

diff --git a/src/domain.sml b/src/domain.sml
index 2bcfe15..a84a6d8 100644
--- a/src/domain.sml
+++ b/src/domain.sml
@@ -30,9 +30,10 @@ 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
@@ -54,6 +55,9 @@ fun your_paths () = !your_pths
 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
@@ -70,12 +74,15 @@ 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 (),
-				class = "ip"}
+				class = "ip"};
+	your_ipv6ss := Acl.class {user = getUser (),
+				class = "ipv6"}
     end
 
 fun declareClient () = isClient := true
@@ -133,16 +140,20 @@ 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 yourIpv6 s = !fakePrivs orelse SS.member (your_ipv6s (), s)
 
 fun yourDomainHost s =
     !fakePrivs
@@ -232,6 +243,10 @@ val _ = Env.type_one "your_ip"
 	Env.string
 	yourIp
 
+val _ = Env.type_one "your_ipv6"
+	Env.string
+	yourIpv6
+
 val _ = Env.type_one "node"
 	Env.string
 	validNode
@@ -244,6 +259,10 @@ val _ = Env.registerFunction ("your_ip_to_ip",
 			      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)
@@ -275,6 +294,10 @@ val _  = Env.registerFunction ("defaultMailbox",
 			       fn [] => SOME (EString (getUser ()), dl)
 			       | _ => NONE)
 
+val _  = Env.registerFunction ("defaultMailUser",
+			       fn [] => SOME (EString (getUser ()), dl)
+			       | _ => NONE)
+
 
 type soa = {ns : string,
 	    serial : int option,
@@ -317,6 +340,10 @@ val _ = Env.registerFunction ("ip_of_node",
 			      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
@@ -653,7 +680,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 =>
@@ -685,7 +711,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),
@@ -787,7 +813,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}
@@ -836,7 +862,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
@@ -865,6 +891,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}