X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/16c5174bf6aeb5be5122390678094cbb8387e6d5..563e77927eb5faaae4571bd2b0811de590368581:/src/domain.sml

diff --git a/src/domain.sml b/src/domain.sml
index 8960bf9..63b039c 100644
--- a/src/domain.sml
+++ b/src/domain.sml
@@ -35,6 +35,8 @@ fun nodeIp node = valOf (SM.find (nodeMap, node))
 
 val usr = ref ""
 fun getUser () = !usr
+val fakePrivs = ref false
+val isClient = ref false
 
 val your_doms = ref SS.empty
 fun your_domains () = !your_doms
@@ -62,6 +64,7 @@ fun setUser user =
 	val your_paths = Acl.class {user = getUser (),
 				    class = "path"}
     in
+	fakePrivs := false;
 	your_doms := Acl.class {user = getUser (),
 				class = "domain"};
 	your_usrs := Acl.class {user = getUser (),
@@ -74,6 +77,12 @@ fun setUser user =
 				class = "ip"}
     end
 
+fun declareClient () = isClient := true
+fun fakePrivileges () = if !isClient then
+			    fakePrivs := true
+			else
+			    raise Fail "Tried to fake privileges as non-client"
+
 fun validIp s =
     case map Int.fromString (String.fields (fn ch => ch = #".") s) of
 	[SOME n1, SOME n2, SOME n3, SOME n4] =>
@@ -122,20 +131,21 @@ fun validDomain s =
 
 fun validNode s = List.exists (fn s' => s = s') nodes
 
-fun yourDomain s = SS.member (your_domains (), s)
+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 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) (paths ())
+    (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 = SS.member (your_ips (), s)
+fun yourIp s = !fakePrivs orelse SS.member (your_ips (), s)
 
 fun yourDomainHost s =
-    yourDomain s
+    !fakePrivs
+    orelse yourDomain s
     orelse let
 	val (pref, suf) = Substring.splitl (fn ch => ch <> #".") (Substring.full s)
     in
@@ -599,7 +609,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";
@@ -699,10 +709,10 @@ fun handleSite (site, files) =
 	if site = Config.defaultNode then
 	    Slave.handleChanges files
 	else let
-		val bio = OpenSSL.connect (valOf (!ssl_context),
-					   nodeIp site
-					   ^ ":"
-					   ^ Int.toString Config.slavePort)
+		val bio = OpenSSL.connect true (valOf (!ssl_context),
+						nodeIp site
+						^ ":"
+						^ Int.toString Config.slavePort)
 	    in
 		app (fn file => Msg.send (bio, MsgFile file)) files;
 		Msg.send (bio, MsgDoFiles);
@@ -969,7 +979,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}])
 
@@ -979,4 +989,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