end
handle ErrorMsg.Error => ()
+fun requestPing () =
+ let
+ val (_, bio) = requestBio (fn () => ())
+ in
+ OpenSSL.close bio;
+ OS.Process.success
+ end
+ handle _ => OS.Process.failure
+
+fun requestShutdown () =
+ let
+ val (_, bio) = requestBio (fn () => ())
+ in
+ Msg.send (bio, MsgShutdown);
+ case Msg.recv bio of
+ NONE => print "Server closed connection unexpectedly.\n"
+ | SOME m =>
+ case m of
+ MsgOk => print "Shutdown begun.\n"
+ | MsgError s => print ("Shutdown failed: " ^ s ^ "\n")
+ | _ => print "Unexpected server reply.\n";
+ OpenSSL.close bio
+ end
+
fun requestGrant acl =
let
val (user, bio) = requestBio (fn () => ())
OpenSSL.close bio
end
+fun requestDbPasswd rc =
+ let
+ val (_, bio) = requestBio (fn () => ())
+ in
+ Msg.send (bio, MsgDbPasswd rc);
+ case Msg.recv bio of
+ NONE => print "Server closed connection unexpectedly.\n"
+ | SOME m =>
+ case m of
+ MsgOk => print "Your password has been changed.\n"
+ | MsgError s => print ("Password set failed: " ^ s ^ "\n")
+ | _ => print "Unexpected server reply.\n";
+ OpenSSL.close bio
+ end
+
fun requestDbTable p =
let
val (user, bio) = requestBio (fn () => ())
in
Msg.send (bio, MsgListMailboxes domain);
(case Msg.recv bio of
- NONE => Vmail.Error "Server closed connection unexpectedly.\n"
+ NONE => Vmail.Error "Server closed connection unexpectedly."
| SOME m =>
case m of
MsgMailboxes users => (Msg.send (bio, MsgOk);
Vmail.Listing users)
| MsgError s => Vmail.Error ("Creation failed: " ^ s)
- | _ => Vmail.Error "Unexpected server reply.\n")
+ | _ => Vmail.Error "Unexpected server reply.")
before OpenSSL.close bio
end
OpenSSL.close bio
end
+fun requestSaQuery addr =
+ let
+ val (_, bio) = requestBio (fn () => ())
+ in
+ Msg.send (bio, MsgSaQuery addr);
+ (case Msg.recv bio of
+ NONE => print "Server closed connection unexpectedly.\n"
+ | SOME m =>
+ case m of
+ MsgSaStatus b => (print ("SpamAssassin filtering for " ^ addr ^ " is "
+ ^ (if b then "ON" else "OFF") ^ ".\n");
+ Msg.send (bio, MsgOk))
+ | MsgError s => print ("Query failed: " ^ s ^ "\n")
+ | _ => print "Unexpected server reply.\n")
+ before OpenSSL.close bio
+ end
+
+fun requestSaSet p =
+ let
+ val (_, bio) = requestBio (fn () => ())
+ in
+ Msg.send (bio, MsgSaSet p);
+ case Msg.recv bio of
+ NONE => print "Server closed connection unexpectedly.\n"
+ | SOME m =>
+ case m of
+ MsgOk => print ("SpamAssassin filtering for " ^ #1 p ^ " is now "
+ ^ (if #2 p then "ON" else "OFF") ^ ".\n")
+ | MsgError s => print ("Set failed: " ^ s ^ "\n")
+ | _ => print "Unexpected server reply.\n";
+ OpenSSL.close bio
+ end
+
+fun requestSmtpLog domain =
+ let
+ val (_, bio) = requestBio (fn () => ())
+
+ val _ = Msg.send (bio, MsgSmtpLogReq domain)
+
+ fun loop () =
+ case Msg.recv bio of
+ NONE => print "Server closed connection unexpectedly.\n"
+ | SOME m =>
+ case m of
+ MsgOk => ()
+ | MsgSmtpLogRes line => (print line;
+ loop ())
+ | MsgError s => print ("Log search failed: " ^ s ^ "\n")
+ | _ => print "Unexpected server reply.\n"
+ in
+ loop ();
+ OpenSSL.close bio
+ end
+
fun regenerate context =
let
val b = basis ()
| SOME bio =>
let
val user = OpenSSL.peerCN bio
- val () = print ("\nConnection from " ^ user ^ "\n")
+ val () = print ("\nConnection from " ^ user ^ " at " ^ Date.toString (Date.fromTimeUniv (Time.now ())) ^ "\n")
val () = Domain.setUser user
fun doIt f cleanup =
(fn () => OS.FileSys.remove outname)
end
+ fun checkAddr s =
+ case String.fields (fn ch => ch = #"@") s of
+ [user'] =>
+ if user = user' then
+ SOME (SetSA.User s)
+ else
+ NONE
+ | [user', domain] =>
+ if Domain.validEmailUser user' andalso Domain.yourDomain domain then
+ SOME (SetSA.Email s)
+ else
+ NONE
+ | _ => NONE
+
fun cmdLoop () =
case Msg.recv bio of
NONE => (OpenSSL.close bio
MsgConfig code => doConfig [code]
| MsgMultiConfig codes => doConfig codes
+ | MsgShutdown =>
+ if Acl.query {user = user, class = "priv", value = "all"}
+ orelse Acl.query {user = user, class = "priv", value = "shutdown"} then
+ print ("Domtool dispatcher shutting down at " ^ Date.toString (Date.fromTimeUniv (Time.now ())) ^ "\n\n")
+ else
+ (print "Unauthorized shutdown command!\n";
+ OpenSSL.close bio
+ handle OpenSSL.OpenSSL _ => ();
+ loop ())
+
| MsgGrant acl =>
doIt (fn () =>
if Acl.query {user = user, class = "priv", value = "all"} then
SOME ("Error adding user: " ^ msg)))
(fn () => ())
+ | MsgDbPasswd {dbtype, passwd} =>
+ doIt (fn () =>
+ case Dbms.lookup dbtype of
+ NONE => ("Database passwd request with unknown datatype type " ^ dbtype,
+ SOME ("Unknown database type " ^ dbtype))
+ | SOME handler =>
+ case #passwd handler {user = user, passwd = passwd} of
+ NONE => ("Changed " ^ dbtype ^ " password of user " ^ user ^ ".",
+ NONE)
+ | SOME msg =>
+ ("Error setting " ^ dbtype ^ " password of user " ^ user ^ ": " ^ msg,
+ SOME ("Error adding user: " ^ msg)))
+ (fn () => ())
+
| MsgCreateDbTable {dbtype, dbname} =>
doIt (fn () =>
if Dbms.validDbname dbname then
if not (Domain.yourDomain domain) then
("User wasn't authorized to add a mailbox to " ^ domain,
SOME "You're not authorized to configure that domain.")
- else if not (Domain.validUser emailUser) then
+ else if not (Domain.validEmailUser emailUser) then
("Invalid e-mail username " ^ emailUser,
SOME "Invalid e-mail username")
else if not (CharVector.all Char.isGraph passwd) then
passwd = passwd, mailbox = mailbox} of
NONE => ("Added mailbox " ^ emailUser ^ "@" ^ domain ^ " at " ^ mailbox,
NONE)
- | SOME msg => ("Error adding mailbox: " ^ msg,
+ | SOME msg => ("Error adding mailbox " ^ emailUser ^ "@" ^ domain ^ ": " ^ msg,
SOME msg))
(fn () => ())
if not (Domain.yourDomain domain) then
("User wasn't authorized to change password of a mailbox for " ^ domain,
SOME "You're not authorized to configure that domain.")
- else if not (Domain.validUser emailUser) then
+ else if not (Domain.validEmailUser emailUser) then
("Invalid e-mail username " ^ emailUser,
SOME "Invalid e-mail username")
else if not (CharVector.all Char.isGraph passwd) then
passwd = passwd} of
NONE => ("Changed password of mailbox " ^ emailUser ^ "@" ^ domain,
NONE)
- | SOME msg => ("Error changing mailbox password: " ^ msg,
+ | SOME msg => ("Error changing mailbox password for " ^ emailUser ^ "@" ^ domain ^ ": " ^ msg,
SOME msg))
(fn () => ())
if not (Domain.yourDomain domain) then
("User wasn't authorized to change password of a mailbox for " ^ domain,
SOME "You're not authorized to configure that domain.")
- else if not (Domain.validUser emailUser) then
+ else if not (Domain.validEmailUser emailUser) then
("Invalid e-mail username " ^ emailUser,
SOME "Invalid e-mail username")
else
case Vmail.rm {domain = domain, user = emailUser} of
NONE => ("Deleted mailbox " ^ emailUser ^ "@" ^ domain,
NONE)
- | SOME msg => ("Error deleting mailbox: " ^ msg,
+ | SOME msg => ("Error deleting mailbox " ^ emailUser ^ "@" ^ domain ^ ": " ^ msg,
SOME msg))
(fn () => ())
+ | MsgSaQuery addr =>
+ doIt (fn () =>
+ case checkAddr addr of
+ NONE => ("User tried to query SA filtering for " ^ addr,
+ SOME "You aren't allowed to configure SA filtering for that recipient.")
+ | SOME addr' => (Msg.send (bio, MsgSaStatus (SetSA.query addr'));
+ ("Queried SA filtering status for " ^ addr,
+ NONE)))
+ (fn () => ())
+
+ | MsgSaSet (addr, b) =>
+ doIt (fn () =>
+ case checkAddr addr of
+ 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);
+ Msg.send (bio, MsgOk);
+ ("Set SA filtering status for " ^ addr ^ " to "
+ ^ (if b then "ON" else "OFF"),
+ NONE)))
+ (fn () => ())
+
+ | MsgSmtpLogReq domain =>
+ doIt (fn () =>
+ if not (Domain.yourDomain domain) then
+ ("Unauthorized user tried to request SMTP logs for " ^ domain,
+ SOME "You aren't authorized to configure that domain.")
+ else
+ (SmtpLog.search (fn line => Msg.send (bio, MsgSmtpLogRes line))
+ domain;
+ ("Requested SMTP logs for " ^ domain,
+ NONE)))
+ (fn () => ())
+
| _ =>
doIt (fn () => ("Unexpected command",
SOME "Unexpected command"))
handle OpenSSL.OpenSSL _ => ();
loop ())
in
+ print ("Domtool dispatcher starting up at " ^ Date.toString (Date.fromTimeUniv (Time.now ())) ^ "\n");
print "Listening for connections....\n";
loop ();
OpenSSL.shutdown sock
HCoop / hcoop / domtool2.git / blobdiff