X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/5e3ad5d2b6de3ed66e2f4ea4fa4a0de1b4881f1d..fdc43c6c0d3d994d2e186b35684fea500d00ed22:/src/domain.sml

diff --git a/src/domain.sml b/src/domain.sml
index 94eb077..488d7a8 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,38 +77,75 @@ 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] =>
 	n1 >= 0 andalso n1 < 256 andalso n2 >= 0 andalso n2 < 256 andalso n3 >= 0 andalso n3 < 256 andalso n4 >= 0 andalso n4 < 256
       | _ => false
 
+fun isHexDigit ch = Char.isDigit ch orelse (ord ch >= ord #"a" andalso ord ch <= ord #"f")
+
+fun validIpv6 s =
+    let
+	val fields = String.fields (fn ch => ch = #":") s
+
+	val empties = foldl (fn ("", n) => n + 1
+			      | (_, n) => n) 0 fields
+
+	fun noIpv4 maxLen =
+	    length fields >= 2
+	    andalso length fields <= maxLen
+	    andalso empties <= 1
+	    andalso List.all (fn "" => true
+			       | s => size s <= 4
+				      andalso CharVector.all isHexDigit s) fields
+
+	fun hasIpv4 () =
+	    length fields > 0
+	    andalso
+	    let
+		val maybeIpv4 = List.last fields
+		val theRest = List.take (fields, length fields - 1)
+	    in
+		validIp maybeIpv4 andalso noIpv4 6
+	    end
+    in
+	noIpv4 8 orelse hasIpv4 ()
+    end
+
 fun isIdent ch = Char.isLower ch orelse Char.isDigit ch
 
 fun validHost s =
-    size s > 0 andalso size s < 20
+    size s > 0 andalso size s < 50
     andalso CharVector.all (fn ch => isIdent ch orelse ch = #"-") s
 
 fun validDomain s =
-    size s > 0 andalso size s < 100
+    size s > 0 andalso size s < 200
     andalso List.all validHost (String.fields (fn ch => ch = #".") 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
@@ -143,6 +183,10 @@ val _ = Env.type_one "ip"
 	Env.string
 	validIp
 
+val _ = Env.type_one "ipv6"
+	Env.string
+	validIpv6
+
 val _ = Env.type_one "host"
 	Env.string
 	validHost
@@ -611,7 +655,10 @@ val _ = Env.containerV_one "domain"
 								write "\t};\n")
 						 | _ => (write "\tmasters { ";
 							 write masterIp;
-							 write "; };\n");
+							 write "; };\n";
+							 write "// Updated: ";
+							 write (Time.toString (Time.now ()));
+							 write "\n");
 					       write "};\n";
 					       close ()
 					   end
@@ -662,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);