Proper username determination in requests

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

diff --git a/src/main.sml b/src/main.sml
index 734b10a..59607bb 100644 (file)
--- a/src/main.sml
+++ b/src/main.sml
@@ -53,7 +53,7 @@ fun basis () =
                    loop files
 
        val files = loop []
-       val files = Order.order files
+       val (_, files) = Order.order files
     in
        if !ErrorMsg.anyErrors then
            Env.empty
@@ -138,10 +138,14 @@ fun request fname =
 
        val () = Acl.read Config.aclFile
        val () = Domain.setUser user
+
        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",
-                                      Config.keyDir ^ "/" ^ user ^ ".pem",
+                                      Config.keyDir ^ "/" ^ user ^ "/key.pem",
                                       Config.trustStore)
 
        val bio = OpenSSL.connect (context, dispatcher)
@@ -234,6 +238,7 @@ fun service () =
                    cmdLoop ()
                end
     in
+       print "Listening for connections....\n";
        loop ();
        OpenSSL.shutdown sock
     end
@@ -243,7 +248,7 @@ fun slave () =
        val host = hostname ()
 
        val context = OpenSSL.context (Config.certDir ^ "/" ^ host ^ ".pem",
-                                      Config.keyDir ^ "/" ^ host ^ ".pem",
+                                      Config.keyDir ^ "/" ^ host ^ "/key.pem",
                                       Config.trustStore)
 
        val sock = OpenSSL.listen (context, Config.slavePort)
@@ -277,10 +282,35 @@ fun slave () =
                            OpenSSL.close bio;
                            loop ()
                        end
-               end
+               end handle OpenSSL.OpenSSL s =>
+                          (print ("OpenSSL 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