Server executing client's requested configuration with the right permissions

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

diff --git a/src/main.sml b/src/main.sml
index 22577ad..e0beaf2 100644 (file)
--- a/src/main.sml
+++ b/src/main.sml
@@ -24,33 +24,16 @@ open Ast Print
 
 structure SM = StringMap
 
 
 structure SM = StringMap
 

-val dmy = ErrorMsg.dummyLoc
-
-val defaultT : record ref = ref SM.empty
-val defaultV : (unit -> exp) SM.map ref = ref SM.empty
-
-fun registerDefault (name, t, v) =
-    case SM.find (!defaultT, name) of
-       NONE => (defaultT := SM.insert (!defaultT, name, t);
-                defaultV := SM.insert (!defaultV, name, v))
-      | SOME _ => raise Fail "Duplicate default environment variable"
-
-fun tInit () = (TAction ((CRoot, dmy),
-                        !defaultT,
-                        StringMap.empty),
-               dmy)
-
-
+fun init () = Acl.read Config.aclFile

            
 fun check' G fname =
     let
            
 fun check' G fname =
     let

-       (*val _ = print ("Check " ^ fname ^ "\n")*)

        val prog = Parse.parse fname
     in
        if !ErrorMsg.anyErrors then
            G
        else
        val prog = Parse.parse fname
     in
        if !ErrorMsg.anyErrors then
            G
        else

-           Tycheck.checkFile G (tInit ()) prog
+           Tycheck.checkFile G (Defaults.tInit ()) prog

     end
 
 fun basis () =
     end
 
 fun basis () =


@@ -89,13 +72,14 @@ fun check fname =
            (b, NONE)
        else
            let
            (b, NONE)
        else
            let

+               val _ = ErrorMsg.reset ()

                val prog = Parse.parse fname
            in
                if !ErrorMsg.anyErrors then
                    (Env.empty, NONE)
                else
                    let
                val prog = Parse.parse fname
            in
                if !ErrorMsg.anyErrors then
                    (Env.empty, NONE)
                else
                    let

-                       val G' = Tycheck.checkFile b (tInit ()) prog
+                       val G' = Tycheck.checkFile b (Defaults.tInit ()) prog

                    in
                        (G', #3 prog)
                    end
                    in
                        (G', #3 prog)
                    end


@@ -129,7 +113,81 @@ fun eval fname =
        if !ErrorMsg.anyErrors then
            ()
        else
        if !ErrorMsg.anyErrors then
            ()
        else

-           Eval.exec (SM.map (fn f => f ()) (!defaultV)) body'
+           Eval.exec (Defaults.eInit ()) body'

       | NONE => ()
 
       | NONE => ()
 

+val dispatcher =
+    Config.dispatcher ^ ":" ^ Int.toString Config.dispatcherPort
+
+fun request fname =
+    let
+       val uid = Posix.ProcEnv.getuid ()
+       val user = Posix.SysDB.Passwd.name (Posix.SysDB.getpwuid uid)
+
+       val () = Acl.read Config.aclFile
+       val () = Domain.setUser user
+       val _ = check fname
+
+       val context = OpenSSL.context (Config.certDir ^ "/" ^ user ^ ".pem",
+                                      Config.keyDir ^ "/" ^ user ^ ".pem",
+                                      Config.trustStore)
+
+       val bio = OpenSSL.connect (context, dispatcher)
+
+       val inf = TextIO.openIn fname
+
+       fun loop () =
+           case TextIO.inputLine inf of
+               NONE => ()
+             | SOME line => (OpenSSL.writeAll (bio, line);
+                             loop ())
+    in
+       loop ();
+       TextIO.closeIn inf;
+       OpenSSL.close bio
+    end
+    handle ErrorMsg.Error => ()
+
+fun service () =
+    let
+       val () = Acl.read Config.aclFile
+       
+       val context = OpenSSL.context (Config.serverCert,
+                                      Config.serverKey,
+                                      Config.trustStore)
+
+       val sock = OpenSSL.listen (context, Config.dispatcherPort)
+
+       fun loop () =
+           case OpenSSL.accept sock of
+               NONE => ()
+             | SOME bio =>
+               let
+                   val user = OpenSSL.peerCN bio
+                   val () = print ("\nConnection from " ^ user ^ "\n")
+                   val () = Domain.setUser user
+
+                   val outname = OS.FileSys.tmpName ()
+                   val outf = TextIO.openOut outname
+
+                   fun loop' () =
+                       case OpenSSL.readOne bio of
+                           NONE => ()
+                         | SOME line => (TextIO.output (outf, line);
+                                         loop' ())
+               in
+                   (loop' ();
+                    TextIO.closeOut outf;
+                    eval outname
+                    handle ErrorMsg.Error => ();
+                    OS.FileSys.remove outname;
+                    OpenSSL.close bio)
+                   handle OpenSSL.OpenSSL _ => ();
+                   loop ()
+               end
+    in
+       loop ();
+       OpenSSL.shutdown sock
+    end
+

 end
 end