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 cc5b5b5..e0beaf2 100644 (file)
--- a/src/main.sml
+++ b/src/main.sml
@@ -24,33 +24,16 @@ open Ast Print
 
 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
-       (*val _ = print ("Check " ^ fname ^ "\n")*)
        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 () =
@@ -96,7 +79,7 @@ fun check fname =
                    (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
@@ -130,50 +113,27 @@ fun eval fname =
        if !ErrorMsg.anyErrors then
            ()
        else
-           Eval.exec (SM.map (fn f => f ()) (!defaultV)) body'
+           Eval.exec (Defaults.eInit ()) body'
       | NONE => ()
 
 val dispatcher =
     Config.dispatcher ^ ":" ^ Int.toString Config.dispatcherPort
 
-fun ssl_err s =
+fun request fname =
     let
-       val err = F_OpenSSL_SML_get_error.f ()
-
-       val lib = F_OpenSSL_SML_lib_error_string.f err
-       val func = F_OpenSSL_SML_func_error_string.f err
-       val reason = F_OpenSSL_SML_reason_error_string.f err
-    in
-       print s;
-       print "\nReason: ";
-       if C.Ptr.isNull lib then
-           ()
-       else
-           (print (ZString.toML lib);
-            print ":");
-       if C.Ptr.isNull func then
-           ()
-       else
-           (print (ZString.toML func);
-            print ":");
-       if C.Ptr.isNull reason then
-           ()
-       else
-           print (ZString.toML reason);
-       print "\n"
-    end
+       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
 
-fun request fname =
-    let
-       val context = OpenSSL.context ("/home/adamc/fake/clientcert.pem",
-                                      "/home/adamc/fake/clientkey.pem",
+       val context = OpenSSL.context (Config.certDir ^ "/" ^ user ^ ".pem",
+                                      Config.keyDir ^ "/" ^ user ^ ".pem",
                                       Config.trustStore)
 
        val bio = OpenSSL.connect (context, dispatcher)
 
-       val _ = print ("Subject: " ^ OpenSSL.peerCN bio ^ "\n")
-
        val inf = TextIO.openIn fname
 
        fun loop () =
@@ -186,30 +146,43 @@ fun request fname =
        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 (Config.dispatcherPort, Config.queueSize)
+       val sock = OpenSSL.listen (context, Config.dispatcherPort)
 
        fun loop () =
-           case OpenSSL.accept (context, sock) of
+           case OpenSSL.accept sock of
                NONE => ()
              | SOME bio =>
                let
-                   val _ = print ("Subject: " ^ OpenSSL.peerCN bio ^ "\n")
+                   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 => (print line;
+                         | SOME line => (TextIO.output (outf, line);
                                          loop' ())
                in
-                   loop' ();
-                   OpenSSL.close bio;
+                   (loop' ();
+                    TextIO.closeOut outf;
+                    eval outname
+                    handle ErrorMsg.Error => ();
+                    OS.FileSys.remove outname;
+                    OpenSSL.close bio)
+                   handle OpenSSL.OpenSSL _ => ();
                    loop ()
                end
     in