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

diff --git a/src/domain.sml b/src/domain.sml
index d1046b7..2bcfe15 100644
--- a/src/domain.sml
+++ b/src/domain.sml
@@ -27,6 +27,7 @@ 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))
@@ -35,6 +36,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 +65,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 +78,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 +132,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
@@ -225,6 +236,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)
@@ -252,40 +267,14 @@ 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 _ = Defaults.registerDefault ("DNS",
-				  (TBase "dnsKind", dl),
-				  (fn () => multiApp ((EVar "useDns", dl),
-						      dl,
-						      [soaD, masterD, slavesD])))
+val _  = Env.registerFunction ("defaultMailbox",
+			       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,
@@ -599,7 +588,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";
@@ -969,7 +958,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 +968,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