X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/201b83c73c5a4e09dcf4c3f2f9b94ded360c78c6..b7c96dd38a17463ea57a5527b4837571dbc61cba:/src/main.sml

diff --git a/src/main.sml b/src/main.sml
index 1552791..0a241fa 100644
--- a/src/main.sml
+++ b/src/main.sml
@@ -51,11 +51,12 @@ fun check' G fname =
 		 ()
 	     else
 		 Option.app (Unused.check G) (#3 prog);
-	     Tycheck.checkFile G (Defaults.tInit prog) prog)
+	     Tycheck.checkFile G prog)
     end
 
 fun basis () =
     let
+	val _ = ErrorMsg.reset ()
 	val dir = Posix.FileSys.opendir Config.libRoot
 
 	fun loop files =
@@ -101,7 +102,7 @@ fun check G fname =
 		    raise ErrorMsg.Error
 		else
 		    let
-			val G' = Tycheck.checkFile G (Defaults.tInit prog) prog
+			val G' = Tycheck.checkFile G prog
 		    in
 			if !ErrorMsg.anyErrors then
 			    raise ErrorMsg.Error
@@ -194,6 +195,8 @@ fun reduce G fname =
 
 (*(Defaults.eInit ())*)
 
+val toplevel = Env.initialDynEnvVals Reduce.reduceExp
+
 fun eval G evs fname =
     case reduce G fname of
 	(G, SOME body') =>
@@ -201,7 +204,7 @@ fun eval G evs fname =
 	    raise ErrorMsg.Error
 	else
 	    let
-		val evs' = Eval.exec' evs body'
+		val evs' = Eval.exec' (toplevel G, evs) body'
 	    in
 		(G, evs')
 	    end
@@ -665,6 +668,22 @@ fun requestPasswdMailbox p =
 	OpenSSL.close bio
     end
 
+fun requestPortalPasswdMailbox p =
+    let
+	val (_, bio) = requestBio (fn () => ())
+    in
+	(Msg.send (bio, MsgPortalPasswdMailbox p);
+	 case Msg.recv bio of
+	     NONE => (print "Server closed connection unexpectedly.\n"; OS.Process.failure)
+	   | SOME m =>
+	     case m of
+		 MsgOk => (print ("The password for " ^ #user p ^ "@" ^ #domain p ^ " has been changed.\n");
+			   OS.Process.success)
+	       | MsgError s => (print ("Set failed: " ^ s ^ "\n"); OS.Process.failure)
+	       | _ => (print "Unexpected server reply.\n"; OS.Process.failure))
+	before OpenSSL.close bio
+    end 
+
 fun requestRmMailbox p =
     let
 	val (_, bio) = requestBio (fn () => ())
@@ -1149,9 +1168,11 @@ fun regenerateEither tc checker context =
 			     ok := false)
 			else
 			    ();
-			ignore (foldl checker' (basis (), Defaults.eInit ()) files)
+			let val basis' = basis () in
+			    ignore (foldl checker' (basis', SM.empty) files)
+			end
 		    end
-		else if String.isSuffix "_admin" user then
+		else if (String.isSuffix "_admin" user) orelse (String.isSuffix ".daemon" user) then
 		    ()    
 		else
 		    (print ("Couldn't access " ^ user ^ "'s ~/.domtool directory.\n");
@@ -1314,7 +1335,9 @@ fun service () =
 				 end
 			 in
 			     doIt (fn () => (Env.pre ();
-					     ignore (foldl doOne (basis (), Defaults.eInit ()) codes);
+					     let val basis' = basis () in
+						 ignore (foldl doOne (basis', SM.empty) codes)
+					     end;
 					     Env.post ();
 					     Msg.send (bio, MsgOk);
 					     ("Configuration complete.", NONE)))
@@ -1514,6 +1537,27 @@ fun service () =
 							       SOME msg))
 				      (fn () => ())
 
+			       | MsgPortalPasswdMailbox {domain, user = emailUser, oldpasswd, newpasswd} =>
+				 doIt (fn () =>
+					  if not (Acl.query {user = user, class = "priv", value = "vmail"}) then
+						 ("User is not authorized to run portal vmail password",
+					       SOME "You're not authorized to use the portal password command")
+					  else if not (Domain.validEmailUser emailUser) then
+					      ("Invalid e-mail username " ^ emailUser,
+					       SOME "Invalid e-mail username")
+					  else if not (CharVector.all Char.isGraph oldpasswd
+						      andalso CharVector.all Char.isGraph newpasswd) then
+					      ("Invalid password",
+					       SOME "Invalid password; may only contain printable, non-space characters")
+					  else
+					      case Vmail.portalpasswd {domain = domain, user = emailUser,
+								       oldpasswd = oldpasswd, newpasswd = newpasswd} of
+						  NONE => ("Changed password of mailbox " ^ emailUser ^ "@" ^ domain,
+							   NONE)
+						| SOME msg => ("Error changing mailbox password for " ^ emailUser ^ "@" ^ domain ^ ": " ^ msg,
+							       SOME msg))
+				      (fn () => ())
+
 			       | MsgRmMailbox {domain, user = emailUser} =>
 				 doIt (fn () =>
 					  if not (Domain.yourDomain domain) then
@@ -1546,6 +1590,7 @@ fun service () =
 					      NONE => ("User tried to set SA filtering for " ^ addr,
 						       SOME "You aren't allowed to configure SA filtering for that recipient.")
 					    | SOME addr' => (SetSA.set (addr', b);
+							     SetSA.rebuild ();
 							     Msg.send (bio, MsgOk);
 							     ("Set SA filtering status for " ^ addr ^ " to "
 							      ^ (if b then "ON" else "OFF"),
@@ -1685,6 +1730,10 @@ fun slave () =
 								 Msg.send (bio, MsgOk)
 							     else
 								 Msg.send (bio, MsgError "userdb update failed"))
+				       | MsgSaChanged => (if Slave.shell [Config.SpamAssassin.postReload] then
+							      Msg.send (bio, MsgOk)
+							  else
+							      Msg.send (bio, MsgError "Error reloading SpamAssassin addresses"))
 				       | _ => (print "Dispatcher sent unexpected command\n";
 					       Msg.send (bio, MsgError "Unexpected command"))
 			 in