ip_of_node support
[hcoop/domtool2.git] / src / main.sml
index e0beaf2..490f66d 100644 (file)
@@ -20,7 +20,7 @@
 
 structure Main :> MAIN = struct
 
 
 structure Main :> MAIN = struct
 
-open Ast Print
+open Ast MsgTypes Print
 
 structure SM = StringMap
 
 
 structure SM = StringMap
 
@@ -53,7 +53,7 @@ fun basis () =
                    loop files
 
        val files = loop []
                    loop files
 
        val files = loop []
-       val files = Order.order files
+       val (_, files) = Order.order files
     in
        if !ErrorMsg.anyErrors then
            Env.empty
     in
        if !ErrorMsg.anyErrors then
            Env.empty
@@ -69,19 +69,22 @@ fun check fname =
        val b = basis ()
     in
        if !ErrorMsg.anyErrors then
        val b = basis ()
     in
        if !ErrorMsg.anyErrors then
-           (b, NONE)
+           raise ErrorMsg.Error
        else
            let
                val _ = ErrorMsg.reset ()
                val prog = Parse.parse fname
            in
                if !ErrorMsg.anyErrors then
        else
            let
                val _ = ErrorMsg.reset ()
                val prog = Parse.parse fname
            in
                if !ErrorMsg.anyErrors then
-                   (Env.empty, NONE)
+                   raise ErrorMsg.Error
                else
                    let
                        val G' = Tycheck.checkFile b (Defaults.tInit ()) prog
                    in
                else
                    let
                        val G' = Tycheck.checkFile b (Defaults.tInit ()) prog
                    in
-                       (G', #3 prog)
+                       if !ErrorMsg.anyErrors then
+                           raise ErrorMsg.Error
+                       else
+                           (G', #3 prog)
                    end
            end
     end
                    end
            end
     end
@@ -111,14 +114,23 @@ fun eval fname =
     case reduce fname of
        (SOME body') =>
        if !ErrorMsg.anyErrors then
     case reduce fname of
        (SOME body') =>
        if !ErrorMsg.anyErrors then
-           ()
+           raise ErrorMsg.Error
        else
            Eval.exec (Defaults.eInit ()) body'
        else
            Eval.exec (Defaults.eInit ()) body'
-      | NONE => ()
+      | NONE => raise ErrorMsg.Error
 
 val dispatcher =
     Config.dispatcher ^ ":" ^ Int.toString Config.dispatcherPort
 
 
 val dispatcher =
     Config.dispatcher ^ ":" ^ Int.toString Config.dispatcherPort
 
+fun hostname () =
+    let
+       val inf = TextIO.openIn "/etc/hostname"
+    in
+       case TextIO.inputLine inf of
+           NONE => (TextIO.closeIn inf; raise Fail "No line in /etc/hostname")
+         | SOME line => (TextIO.closeIn inf; String.substring (line, 0, size line - 1))
+    end
+
 fun request fname =
     let
        val uid = Posix.ProcEnv.getuid ()
 fun request fname =
     let
        val uid = Posix.ProcEnv.getuid ()
@@ -126,24 +138,36 @@ fun request fname =
 
        val () = Acl.read Config.aclFile
        val () = Domain.setUser user
 
        val () = Acl.read Config.aclFile
        val () = Domain.setUser user
+
        val _ = check fname
 
        val _ = check fname
 
+       val uid = Posix.ProcEnv.getuid ()
+       val user = Posix.SysDB.Passwd.name (Posix.SysDB.getpwuid uid)
+
        val context = OpenSSL.context (Config.certDir ^ "/" ^ user ^ ".pem",
        val context = OpenSSL.context (Config.certDir ^ "/" ^ user ^ ".pem",
-                                      Config.keyDir ^ "/" ^ user ^ ".pem",
+                                      Config.keyDir ^ "/" ^ user ^ "/key.pem",
                                       Config.trustStore)
 
        val bio = OpenSSL.connect (context, dispatcher)
 
        val inf = TextIO.openIn fname
 
                                       Config.trustStore)
 
        val bio = OpenSSL.connect (context, dispatcher)
 
        val inf = TextIO.openIn fname
 
-       fun loop () =
+       fun loop lines =
            case TextIO.inputLine inf of
            case TextIO.inputLine inf of
-               NONE => ()
-             | SOME line => (OpenSSL.writeAll (bio, line);
-                             loop ())
+               NONE => String.concat (List.rev lines)
+             | SOME line => loop (line :: lines)
+
+       val code = loop []
     in
     in
-       loop ();
        TextIO.closeIn inf;
        TextIO.closeIn inf;
+       Msg.send (bio, MsgConfig code);
+       case Msg.recv bio of
+           NONE => print "Server closed connection unexpectedly.\n"
+         | SOME m =>
+           case m of
+               MsgOk => print "Configuration succeeded.\n"
+             | MsgError s => print ("Configuration failed: " ^ s ^ "\n")
+             | _ => print "Unexpected server reply.\n";
        OpenSSL.close bio
     end
     handle ErrorMsg.Error => ()
        OpenSSL.close bio
     end
     handle ErrorMsg.Error => ()
@@ -155,6 +179,7 @@ fun service () =
        val context = OpenSSL.context (Config.serverCert,
                                       Config.serverKey,
                                       Config.trustStore)
        val context = OpenSSL.context (Config.serverCert,
                                       Config.serverKey,
                                       Config.trustStore)
+       val _ = Domain.set_context context
 
        val sock = OpenSSL.listen (context, Config.dispatcherPort)
 
 
        val sock = OpenSSL.listen (context, Config.dispatcherPort)
 
@@ -167,27 +192,140 @@ fun service () =
                    val () = print ("\nConnection from " ^ user ^ "\n")
                    val () = Domain.setUser user
 
                    val () = print ("\nConnection from " ^ user ^ "\n")
                    val () = Domain.setUser user
 
-                   val outname = OS.FileSys.tmpName ()
-                   val outf = TextIO.openOut outname
+                   fun cmdLoop () =
+                       case Msg.recv bio of
+                           NONE => (OpenSSL.close bio
+                                    handle OpenSSL.OpenSSL _ => ();
+                                    loop ())
+                         | SOME m =>
+                           case m of
+                               MsgConfig code =>
+                               let
+                                   val _ = print "Configuration:\n"
+                                   val _ = print code
+                                   val _ = print "\n"
 
 
-                   fun loop' () =
-                       case OpenSSL.readOne bio of
-                           NONE => ()
-                         | SOME line => (TextIO.output (outf, line);
-                                         loop' ())
+                                   val outname = OS.FileSys.tmpName ()
+                                   val outf = TextIO.openOut outname
+                               in
+                                   TextIO.output (outf, code);
+                                   TextIO.closeOut outf;
+                                   (eval outname;
+                                    Msg.send (bio, MsgOk))
+                                   handle ErrorMsg.Error =>
+                                          (print "Compilation error\n";
+                                           Msg.send (bio,
+                                                     MsgError "Error during configuration evaluation"))
+                                        | OpenSSL.OpenSSL s =>
+                                          (print "OpenSSL error\n";
+                                           Msg.send (bio,
+                                                     MsgError
+                                                         ("Error during configuration evaluation: "
+                                                          ^ s)));
+                                          OS.FileSys.remove outname;
+                                          (ignore (OpenSSL.readChar bio);
+                                           OpenSSL.close bio)
+                                          handle OpenSSL.OpenSSL _ => ();
+                                          loop ()
+                               end
+                             | _ =>
+                               (Msg.send (bio, MsgError "Unexpected command")
+                                handle OpenSSL.OpenSSL _ => ();
+                                OpenSSL.close bio
+                                handle OpenSSL.OpenSSL _ => ();
+                                loop ())
                in
                in
-                   (loop' ();
-                    TextIO.closeOut outf;
-                    eval outname
-                    handle ErrorMsg.Error => ();
-                    OS.FileSys.remove outname;
-                    OpenSSL.close bio)
-                   handle OpenSSL.OpenSSL _ => ();
-                   loop ()
+                   cmdLoop ()
                end
                end
+                   handle OpenSSL.OpenSSL s =>
+                          (print ("OpenSSL error: " ^ s ^ "\n");
+                           OpenSSL.close bio
+                           handle OpenSSL.OpenSSL _ => ();
+                           loop ())
+                        | OS.SysErr (s, _) =>
+                          (print ("System error: " ^ s ^ "\n");
+                           OpenSSL.close bio
+                           handle OpenSSL.OpenSSL _ => ();
+                           loop ())
     in
     in
+       print "Listening for connections....\n";
        loop ();
        OpenSSL.shutdown sock
     end
 
        loop ();
        OpenSSL.shutdown sock
     end
 
+fun slave () =
+    let
+       val host = hostname ()
+
+       val context = OpenSSL.context (Config.certDir ^ "/" ^ host ^ ".pem",
+                                      Config.keyDir ^ "/" ^ host ^ "/key.pem",
+                                      Config.trustStore)
+
+       val sock = OpenSSL.listen (context, Config.slavePort)
+
+       fun loop () =
+           case OpenSSL.accept sock of
+               NONE => ()
+             | SOME bio =>
+               let
+                   val peer = OpenSSL.peerCN bio
+                   val () = print ("\nConnection from " ^ peer ^ "\n")
+               in
+                   if peer <> Config.dispatcherName then
+                       (print "Not authorized!\n";
+                        OpenSSL.close bio;
+                        loop ())
+                   else let
+                           fun loop' files =
+                               case Msg.recv bio of
+                                   NONE => print "Dispatcher closed connection unexpectedly\n"
+                                 | SOME m =>
+                                   case m of
+                                       MsgFile file => loop' (file :: files)
+                                     | MsgDoFiles => (Slave.handleChanges files;
+                                                      Msg.send (bio, MsgOk))
+                                     | _ => (print "Dispatcher sent unexpected command\n";
+                                             Msg.send (bio, MsgError "Unexpected command"))
+                       in
+                           loop' [];
+                           ignore (OpenSSL.readChar bio);
+                           OpenSSL.close bio;
+                           loop ()
+                       end
+               end handle OpenSSL.OpenSSL s =>
+                          (print ("OpenSSL error: "^ s ^ "\n");
+                           OpenSSL.close bio
+                                         handle OpenSSL.OpenSSL _ => ();
+                           loop ())
+                        | OS.SysErr (s, _) =>
+                          (print ("System error: "^ s ^ "\n");
+                           OpenSSL.close bio
+                           handle OpenSSL.OpenSSL _ => ();
+                           loop ())
+    in
+       loop ();
+       OpenSSL.shutdown sock
+    end
+
+fun autodocBasis outdir =
+    let
+       val dir = Posix.FileSys.opendir Config.libRoot
+
+       fun loop files =
+           case Posix.FileSys.readdir dir of
+               NONE => (Posix.FileSys.closedir dir;
+                        files)
+             | SOME fname =>
+               if String.isSuffix ".dtl" fname then
+                   loop (OS.Path.joinDirFile {dir = Config.libRoot,
+                                              file = fname}
+                         :: files)
+               else
+                   loop files
+
+       val files = loop []
+    in
+       Autodoc.autodoc {outdir = outdir, infiles = files}
+    end
+
 end
 end