Simple OpenSSL stuff in SML/NJ

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

diff --git a/src/domain.sml b/src/domain.sml
index d2dfbde..27bc806 100644 (file)
--- a/src/domain.sml
+++ b/src/domain.sml
@@ -20,6 +20,30 @@
 
 structure Domain :> DOMAIN = struct
 
 
 structure Domain :> DOMAIN = struct
 

+structure SM = DataStructures.StringMap
+structure SS = DataStructures.StringSet
+
+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
        [SOME n1, SOME n2, SOME n3, SOME n4] =>
 fun validIp s =
     case map Int.fromString (String.fields (fn ch => ch = #".") s) of
        [SOME n1, SOME n2, SOME n3, SOME n4] =>


@@ -36,7 +60,39 @@ fun validDomain s =
     size s > 0 andalso size s < 100
     andalso List.all validHost (String.fields (fn ch => ch = #".") s)
 
     size s > 0 andalso size s < 100
     andalso List.all validHost (String.fields (fn ch => ch = #".") s)
 

-fun validNode s = List.exists (fn s' => s = s') Config.nodes
+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 ())
+
+fun yourDomainHost s =
+    yourDomain s
+    orelse let
+       val (pref, suf) = Substring.splitl (fn ch => ch <> #".") (Substring.full s)
+    in
+       Substring.size suf > 0
+       andalso validHost (Substring.string pref)
+       andalso yourDomain (Substring.string
+                               (Substring.slice (suf, 1, NONE)))
+    end
+
+fun validUser s = size s > 0 andalso size s < 20
+                 andalso CharVector.all Char.isAlphaNum s
+
+val validGroup = validUser
+
+val _ = Env.type_one "no_spaces"
+                    Env.string
+                    (CharVector.all (fn ch => not (Char.isSpace ch)))
+val _ = Env.type_one "no_newlines"
+                    Env.string
+                    (CharVector.all (fn ch => ch <> #"\n" andalso ch <> #"\r"))

 
 val _ = Env.type_one "ip"
        Env.string
 
 val _ = Env.type_one "ip"
        Env.string


@@ -50,6 +106,34 @@ val _ = Env.type_one "domain"
        Env.string
        validDomain
 
        Env.string
        validDomain
 

+val _ = Env.type_one "your_domain"
+       Env.string
+       yourDomain
+
+val _ = Env.type_one "your_domain_host"
+       Env.string
+       yourDomainHost
+
+val _ = Env.type_one "user"
+       Env.string
+       validUser
+
+val _ = Env.type_one "group"
+       Env.string
+       validGroup
+
+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
 val _ = Env.type_one "node"
        Env.string
        validNode


@@ -75,13 +159,13 @@ val masterD = (EApp ((EVar "internalMaster", dl),
 
 val _ = Main.registerDefault ("DNS",
                              (TBase "dnsKind", 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),
                                         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,
 
 type soa = {ns : string,
            serial : int option,


@@ -138,6 +222,7 @@ val dnsKind = fn (EApp ((EApp ((EApp
                                    master = mstr,
                                    slaves = slaves})
                    | _ => NONE)
                                    master = mstr,
                                    slaves = slaves})
                    | _ => NONE)

+              | (EVar "noDns", _) => SOME NoDns

               | _ => NONE
 
 val befores = ref (fn (_ : string) => ())
               | _ => NONE
 
 val befores = ref (fn (_ : string) => ())


@@ -199,7 +284,7 @@ fun getPath domain =
                                          handle OS.SysErr _ => OS.FileSys.mkDir tmpPath
                                      end
                              in
                                          handle OS.SysErr _ => OS.FileSys.mkDir tmpPath
                                      end
                              in

-                                 app doNode Config.nodes;
+                                 app doNode nodes;

                                  elems
                              end) [] toks
     in
                                  elems
                              end) [] toks
     in


@@ -361,7 +446,7 @@ val _ = Env.containerV_one "domain"
                                           TextIO.closeOut outf
                                       end
 
                                           TextIO.closeOut outf
                                       end
 

-                                  fun saveNamed (kind, soa : soa) node =
+                                  fun saveNamed (kind, soa : soa, masterIp) node =

                                       let
                                           val outf = domainFile {node = node, name = "named.conf"}
                                       in
                                       let
                                           val outf = domainFile {node = node, name = "named.conf"}
                                       in


@@ -376,40 +461,58 @@ val _ = Env.containerV_one "domain"
                                           TextIO.output (outf, ".zone\";\n");
                                           case kind of
                                               "master" => TextIO.output (outf, "\tallow-update { none; };\n")
                                           TextIO.output (outf, ".zone\";\n");
                                           case kind of
                                               "master" => TextIO.output (outf, "\tallow-update { none; };\n")

-                                            | _ => TextIO.output (outf, "\tmasters { 1.2.3.4; };\n");
-                                          TextIO.output (outf, "}\n");
+                                            | _ => (TextIO.output (outf, "\tmasters { ");
+                                                    TextIO.output (outf, masterIp);
+                                                    TextIO.output (outf, " };\n"));
+                                          TextIO.output (outf, "};\n");

                                           TextIO.closeOut outf
                                       end
                                           TextIO.closeOut outf
                                       end

-
-                                  fun saveBoth ks = (saveSoa ks; saveNamed ks)

                               in
                                   case kind of
                                       NoDns => masterNode := NONE
                                     | UseDns dns =>
                               in
                                   case kind of
                                       NoDns => masterNode := NONE
                                     | UseDns dns =>

-                                      (app (saveSoa ("slave", #soa dns)) (#slaves dns);
-                                       app (saveNamed ("slave", #soa dns)) (#slaves dns);
-                                       case #master dns of
-                                           InternalMaster node =>
-                                           (masterNode := SOME node;
-                                            saveSoa ("master", #soa dns) node;
-                                            saveNamed ("master", #soa dns) node)
-                                         | _ => masterNode := NONE);
-                                  !befores dom
+                                      let
+                                          val masterIp =
+                                              case #master dns of
+                                                  InternalMaster node => valOf (SM.find (nodeMap, node))
+                                                | ExternalMaster ip => ip
+                                      in
+                                          app (saveSoa ("slave", #soa dns)) (#slaves dns);
+                                          app (saveNamed ("slave", #soa dns, masterIp)) (#slaves dns);
+                                          case #master dns of
+                                              InternalMaster node =>
+                                              (masterNode := SOME node;
+                                               saveSoa ("master", #soa dns) node;
+                                               saveNamed ("master", #soa dns, masterIp) node)
+                                            | _ => masterNode := NONE;
+                                          !befores dom
+                                      end

                               end,
                            fn () => !afters (!current))
 
                               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;
                                    app (fn node => OS.FileSys.mkDir
                                                        (OS.Path.joinDirFile {dir = Config.tmpDir,
                                                                              file = node}))
 val () = Env.registerPre (fn () => (ignore (Slave.shellF ([Config.rm, " -rf ", Config.tmpDir, ""],
                                                       fn cl => "Temp file cleanup failed: " ^ cl));
                                    OS.FileSys.mkDir Config.tmpDir;
                                    app (fn node => OS.FileSys.mkDir
                                                        (OS.Path.joinDirFile {dir = Config.tmpDir,
                                                                              file = node}))

-                                       Config.nodes;
+                                       nodes;

                                    app (fn node => OS.FileSys.mkDir
                                                        (OS.Path.joinDirFile {dir = Config.resultRoot,
                                                                              file = node})
                                            handle OS.SysErr _ => ())
                                    app (fn node => OS.FileSys.mkDir
                                                        (OS.Path.joinDirFile {dir = Config.resultRoot,
                                                                              file = node})
                                            handle OS.SysErr _ => ())

-                                       Config.nodes))
+                                       nodes))

 
 val () = Env.registerPost (fn () =>
                              let
 
 val () = Env.registerPost (fn () =>
                              let