X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/559e89e9adf62c5faeb0e78e6b9fb8fe107b8c72..aa56e112996b3650e8ac343831322d2a9ab0de54:/src/main.sml

diff --git a/src/main.sml b/src/main.sml
index 14eaa4a..e0beaf2 100644
--- a/src/main.sml
+++ b/src/main.sml
@@ -24,39 +24,16 @@ open Ast Print
 
 structure SM = StringMap
 
-val dmy = ErrorMsg.dummyLoc
-
-fun init () = (F_OpenSSL_SML_add_all_algorithms.f' ();
-	       F_OpenSSL_SML_load_error_strings.f' ();
-	       F_OpenSSL_SML_load_BIO_strings.f' ())
-
-val () = init ()
-
-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 () =
@@ -102,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
@@ -136,71 +113,81 @@ 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 : C.rw ZString.zstring' = ZString.dupML' Config.dispatcher
+val dispatcher =
+    Config.dispatcher ^ ":" ^ Int.toString Config.dispatcherPort
 
-fun ssl_err s =
+fun request fname =
     let
-	val err = F_OpenSSL_SML_get_error.f ()
-    in
-	print s;
-	print "\nReason: ";
-	print (ZString.toML (F_OpenSSL_SML_lib_error_string.f err));
-	print ":";
-	print (ZString.toML (F_OpenSSL_SML_func_error_string.f err));
-	print ":";
-	print (ZString.toML (F_OpenSSL_SML_reason_error_string.f err));
-	print "\n"
-    end
+	val uid = Posix.ProcEnv.getuid ()
+	val user = Posix.SysDB.Passwd.name (Posix.SysDB.getpwuid uid)
 
-exception OpenSSL of string
+	val () = Acl.read Config.aclFile
+	val () = Domain.setUser user
+	val _ = check fname
 
-fun writeAll (bio, s) =
-    let
-	val buf = ZString.dupML' s
+	val context = OpenSSL.context (Config.certDir ^ "/" ^ user ^ ".pem",
+				       Config.keyDir ^ "/" ^ user ^ ".pem",
+				       Config.trustStore)
 
-	fun loop (buf, len) =
-	    let
-		val r = F_OpenSSL_SML_write.f' (bio, C.Ptr.inject' buf, len)
-	    in
-		if r = len then
-		    ()
-		else if r <= 0 then
-		    (C.free' buf;
-		     raise OpenSSL "BIO_write failed")
-		else
-		    loop (C.Ptr.|+! C.S.uchar (buf, Int32.toInt r), Int32.- (len, r))
-	    end
+	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 (buf, Int32.fromInt (size s));
-	C.free' buf
+	loop ();
+	TextIO.closeIn inf;
+	OpenSSL.close bio
     end
+    handle ErrorMsg.Error => ()
 
-fun request fname =
+fun service () =
     let
-	val bio = F_OpenSSL_SML_new_connect.f' dispatcher
+	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
-	if C.Ptr.isNull' bio then
-	    (ssl_err ("Error initializating connection to dispatcher at " ^ Config.dispatcher);
-	     F_OpenSSL_SML_free_all.f' bio)
-	else if F_OpenSSL_SML_do_connect.f' bio <= 0 then
-	    (ssl_err ("Error connecting to dispatcher at " ^ Config.dispatcher);
-	     F_OpenSSL_SML_free_all.f' bio)
-	else let
-		val inf = TextIO.openIn fname
-
-		fun loop () =
-		    case TextIO.inputLine inf of
-			NONE => ()
-		      | SOME line => (writeAll (bio, line);
-				      loop ())
-	    in
-		loop ();
-		TextIO.closeIn inf;
-		F_OpenSSL_SML_free_all.f' bio
-	    end
+	loop ();
+	OpenSSL.shutdown sock
     end
 
 end