mod_rewrite and ProxyPass

[hcoop/domtool2.git] / src / domain.sml

diff --git a/src/domain.sml b/src/domain.sml
index 6a70c72..91d8005 100644 (file)
--- a/src/domain.sml
+++ b/src/domain.sml
@@ -21,10 +21,28 @@
 structure Domain :> DOMAIN = struct
 
 structure SM = DataStructures.StringMap
+structure SS = DataStructures.StringSet
 
-val nodes = map #2 Config.nodeIps
+val nodes = map #1 Config.nodeIps
 val nodeMap = foldl (fn ((node, ip), mp) => SM.insert (mp, node, ip))
                    SM.empty Config.nodeIps
+fun nodeIp node = valOf (SM.find (nodeMap, node))
+
+val usr = ref ""
+fun setUser ur = usr := ur
+fun getUser () = !usr
+
+val your_doms = ref SS.empty
+fun your_domains () = !your_doms
+
+val your_usrs = ref SS.empty
+fun your_users () = !your_usrs
+
+val your_grps = ref SS.empty
+fun your_groups () = !your_grps
+
+val your_pths = ref SS.empty
+fun your_paths () = !your_pths
 
 fun validIp s =
     case map Int.fromString (String.fields (fn ch => ch = #".") s) of
@@ -44,6 +62,19 @@ fun validDomain s =
 
 fun validNode s = List.exists (fn s' => s = s') nodes
 
+fun yourDomain s = SS.member (your_domains (), s)
+fun yourUser s = SS.member (your_users (), s)
+fun yourGroup s = SS.member (your_groups (), s)
+fun yourPath 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) (your_paths ())
+
+val _ = Env.type_one "no_spaces"
+                    Env.string
+                    (CharVector.all (fn ch => not (Char.isSpace ch)))
+
 val _ = Env.type_one "ip"
        Env.string
        validIp
@@ -56,6 +87,22 @@ val _ = Env.type_one "domain"
        Env.string
        validDomain
 
+val _ = Env.type_one "your_domain"
+       Env.string
+       yourDomain
+
+val _ = Env.type_one "your_user"
+       Env.string
+       yourUser
+
+val _ = Env.type_one "your_group"
+       Env.string
+       yourGroup
+
+val _ = Env.type_one "your_path"
+       Env.string
+       yourPath
+
 val _ = Env.type_one "node"
        Env.string
        validNode
@@ -81,13 +128,13 @@ val masterD = (EApp ((EVar "internalMaster", dl),
 
 val _ = Main.registerDefault ("DNS",
                              (TBase "dnsKind", dl),
-                             (multiApp ((EVar "useDns", dl),
+                             (fn () => multiApp ((EVar "useDns", dl),
                                         dl,
                                         [soaD, masterD, (EList [], dl)])))
 
 val _ = Main.registerDefault ("TTL",
                              (TBase "int", dl),
-                             (EInt Config.Bind.defaultTTL, dl))
+                             (fn () => (EInt Config.Bind.defaultTTL, dl)))
 
 type soa = {ns : string,
            serial : int option,
@@ -411,6 +458,17 @@ val _ = Env.containerV_one "domain"
                               end,
                            fn () => !afters (!current))
 
+val () = Env.registerPreTycheck (fn () => (setUser Config.testUser;
+                                          Acl.read Config.aclFile;
+                                          your_doms := Acl.class {user = getUser (),
+                                                                  class = "domain"};
+                                          your_usrs := Acl.class {user = getUser (),
+                                                                  class = "user"};
+                                          your_grps := Acl.class {user = getUser (),
+                                                                  class = "group"};
+                                          your_pths := Acl.class {user = getUser (),
+                                                                  class = "path"}))
+
 val () = Env.registerPre (fn () => (ignore (Slave.shellF ([Config.rm, " -rf ", Config.tmpDir, ""],
                                                       fn cl => "Temp file cleanup failed: " ^ cl));
                                    OS.FileSys.mkDir Config.tmpDir;
@@ -457,9 +515,9 @@ val () = Env.registerPost (fn () =>
                                  if !ErrorMsg.anyErrors then
                                      ()
                                  else
-                                     Slave.handleChanges (map #2 diffs);
+                                     Slave.handleChanges (map #2 diffs)(*;
                                  ignore (Slave.shellF ([Config.rm, " -rf ", Config.tmpDir, ""],
-                                                    fn cl => "Temp file cleanup failed: " ^ cl))
+                                                    fn cl => "Temp file cleanup failed: " ^ cl))*)
                              end)