(* HCoop Domtool (http://hcoop.sourceforge.net/)
- * Copyright (c) 2006-2007, Adam Chlipala
+ * Copyright (c) 2006-2009, Adam Chlipala
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
val (G, body) = check G fname
in
if !ErrorMsg.anyErrors then
- NONE
+ (G, NONE)
else
case body of
SOME body =>
[PD.string "Result:",
PD.space 1,
p_exp body']))*)
- SOME (G, body')
+ (G, SOME body')
end
- | _ => NONE
+ | _ => (G, NONE)
end
(*(Defaults.eInit ())*)
fun eval G evs fname =
case reduce G fname of
- SOME (G, body') =>
+ (G, SOME body') =>
if !ErrorMsg.anyErrors then
raise ErrorMsg.Error
else
in
(G, evs')
end
- | NONE => (G, evs)
+ | (G, NONE) => (G, evs)
val dispatcher =
Config.dispatcher ^ ":" ^ Int.toString Config.dispatcherPort
(user, context)
end
-fun requestBio f =
+fun requestBio' printErr f =
let
val (user, context) = requestContext f
in
- (user, OpenSSL.connect (context, dispatcher))
+ (user, OpenSSL.connect printErr (context, dispatcher))
end
-fun requestSlaveBio () =
+val requestBio = requestBio' true
+
+fun requestSlaveBio' printErr =
let
val (user, context) = requestContext (fn () => ())
in
- (user, OpenSSL.connect (context, self))
+ (user, OpenSSL.connect printErr (context, self))
end
-fun request fname =
- let
- val (user, bio) = requestBio (fn () => ignore (check (basis ()) fname))
+fun requestSlaveBio () = requestSlaveBio' true
- val inf = TextIO.openIn fname
+fun request (fname, libOpt) =
+ let
+ val (user, bio) = requestBio (fn () =>
+ let
+ val env = basis ()
+ val env = case libOpt of
+ NONE => env
+ | SOME lib => #1 (check env lib)
+ in
+ ignore (check env fname)
+ end)
+
+ fun readFile fname =
+ let
+ val inf = TextIO.openIn fname
- fun loop lines =
- case TextIO.inputLine inf of
- NONE => String.concat (List.rev lines)
- | SOME line => loop (line :: lines)
+ fun loop lines =
+ case TextIO.inputLine inf of
+ NONE => String.concat (rev lines)
+ | SOME line => loop (line :: lines)
+ in
+ loop []
+ before TextIO.closeIn inf
+ end
- val code = loop []
+ val code = readFile fname
+ val msg = case libOpt of
+ NONE => MsgConfig code
+ | SOME fname' => MsgMultiConfig [readFile fname', code]
in
- TextIO.closeIn inf;
- Msg.send (bio, MsgConfig code);
+ Msg.send (bio, msg);
case Msg.recv bio of
NONE => print "Server closed connection unexpectedly.\n"
| SOME m =>
val (_, files) = Order.order (SOME b) files
val _ = if !ErrorMsg.anyErrors then
- (print "J\n";raise ErrorMsg.Error)
+ raise ErrorMsg.Error
else
()
fun requestPing () =
let
- val (_, bio) = requestBio (fn () => ())
+ val (_, bio) = requestBio' false (fn () => ())
in
OpenSSL.close bio;
OS.Process.success
in
Msg.send (bio, MsgShutdown);
case Msg.recv bio of
- NONE => print "Server closed connection unexpectedly.\n"
+ NONE => ()
| SOME m =>
case m of
MsgOk => print "Shutdown begun.\n"
fun requestSlavePing () =
let
- val (_, bio) = requestSlaveBio ()
+ val (_, bio) = requestSlaveBio' false
in
OpenSSL.close bio;
OS.Process.success
in
Msg.send (bio, MsgShutdown);
case Msg.recv bio of
- NONE => print "Server closed connection unexpectedly.\n"
+ NONE => ()
| SOME m =>
case m of
MsgOk => print "Shutdown begun.\n"
fun requestApt {node, pkg} =
let
val (user, context) = requestContext (fn () => ())
- val bio = OpenSSL.connect (context, if node = Config.masterNode then
- dispatcher
- else
- Domain.nodeIp node ^ ":" ^ Int.toString Config.slavePort)
+ val bio = OpenSSL.connect true (context, if node = Config.masterNode then
+ dispatcher
+ else
+ Domain.nodeIp node ^ ":" ^ Int.toString Config.slavePort)
val _ = Msg.send (bio, MsgQuery (QApt pkg))
fun requestCron {node, uname} =
let
val (user, context) = requestContext (fn () => ())
- val bio = OpenSSL.connect (context, if node = Config.masterNode then
- dispatcher
- else
- Domain.nodeIp node ^ ":" ^ Int.toString Config.slavePort)
+ val bio = OpenSSL.connect true (context, if node = Config.masterNode then
+ dispatcher
+ else
+ Domain.nodeIp node ^ ":" ^ Int.toString Config.slavePort)
val _ = Msg.send (bio, MsgQuery (QCron uname))
fun requestFtp {node, uname} =
let
val (user, context) = requestContext (fn () => ())
- val bio = OpenSSL.connect (context, if node = Config.masterNode then
- dispatcher
- else
- Domain.nodeIp node ^ ":" ^ Int.toString Config.slavePort)
+ val bio = OpenSSL.connect true (context, if node = Config.masterNode then
+ dispatcher
+ else
+ Domain.nodeIp node ^ ":" ^ Int.toString Config.slavePort)
val _ = Msg.send (bio, MsgQuery (QFtp uname))
fun requestTrustedPath {node, uname} =
let
val (user, context) = requestContext (fn () => ())
- val bio = OpenSSL.connect (context, if node = Config.masterNode then
- dispatcher
- else
- Domain.nodeIp node ^ ":" ^ Int.toString Config.slavePort)
+ val bio = OpenSSL.connect true (context, if node = Config.masterNode then
+ dispatcher
+ else
+ Domain.nodeIp node ^ ":" ^ Int.toString Config.slavePort)
val _ = Msg.send (bio, MsgQuery (QTrustedPath uname))
fun requestSocketPerm {node, uname} =
let
val (user, context) = requestContext (fn () => ())
- val bio = OpenSSL.connect (context, if node = Config.masterNode then
- dispatcher
- else
- Domain.nodeIp node ^ ":" ^ Int.toString Config.slavePort)
+ val bio = OpenSSL.connect true (context, if node = Config.masterNode then
+ dispatcher
+ else
+ Domain.nodeIp node ^ ":" ^ Int.toString Config.slavePort)
val _ = Msg.send (bio, MsgQuery (QSocket uname))
fun requestFirewall {node, uname} =
let
val (user, context) = requestContext (fn () => ())
- val bio = OpenSSL.connect (context, if node = Config.masterNode then
- dispatcher
- else
- Domain.nodeIp node ^ ":" ^ Int.toString Config.slavePort)
-
+ val bio = OpenSSL.connect true (context, if node = Config.masterNode then
+ dispatcher
+ else
+ Domain.nodeIp node ^ ":" ^ Int.toString Config.slavePort)
+
val _ = Msg.send (bio, MsgQuery (QFirewall uname))
fun loop () =
OpenSSL.close bio
end
+fun requestReUsers () =
+ let
+ val (_, bio) = requestBio (fn () => ())
+ in
+ Msg.send (bio, MsgReUsers);
+ case Msg.recv bio of
+ NONE => print "Server closed connection unexpectedly.\n"
+ | SOME m =>
+ case m of
+ MsgOk => print "Callbacks run.\n"
+ | MsgError s => print ("Failed: " ^ s ^ "\n")
+ | _ => print "Unexpected server reply.\n";
+ OpenSSL.close bio
+ end
+
structure SS = StringSet
fun domainList dname =
if node = Config.defaultNode then
Domain.resetLocal ()
else let
- val bio = OpenSSL.connect (context,
- ip
- ^ ":"
- ^ Int.toString Config.slavePort)
+ val bio = OpenSSL.connect true (context,
+ ip
+ ^ ":"
+ ^ Int.toString Config.slavePort)
in
Msg.send (bio, MsgRegenerate);
case Msg.recv bio of
(fn G => fn evs => fn file =>
(#1 (check G file), evs))
+fun usersChanged () =
+ (Domain.onUsersChange ();
+ ignore (OS.Process.system Config.publish_reusers))
+
fun rmuser user =
let
val doms = Acl.class {user = user, class = "domain"}
| _ => false) (StringSet.listItems doms)
in
Acl.rmuser user;
- Domain.rmdom doms
+ Domain.rmdom doms;
+ usersChanged ()
end
fun now () = Date.toString (Date.fromTimeUniv (Time.now ()))
fun service () =
let
+ val host = Slave.hostname ()
+
val () = Acl.read Config.aclFile
-
- val context = context (Config.serverCert,
- Config.serverKey,
+
+ val context = context (Config.certDir ^ "/" ^ host ^ ".pem",
+ Config.keyDir ^ "/" ^ host ^ "/key.pem",
Config.trustStore)
val _ = Domain.set_context context
if Acl.query {user = user, class = "priv", value = "all"} then
(Acl.grant acl;
Acl.write Config.aclFile;
+ if #class acl = "user" then
+ usersChanged ()
+ else
+ ();
("Granted permission " ^ #value acl ^ " to " ^ #user acl ^ " in " ^ #class acl ^ ".",
NONE))
else
| MsgRmdom doms =>
doIt (fn () =>
if Acl.query {user = user, class = "priv", value = "all"}
- orelse List.all (fn dom => Acl.query {user = user, class = "domain", value = dom}) doms then
+ orelse List.all (fn dom => Domain.validDomain dom
+ andalso Acl.queryDomain {user = user, domain = dom}) doms then
(Domain.rmdom doms;
- app (fn dom =>
+ (*app (fn dom =>
Acl.revokeFromAll {class = "domain", value = dom}) doms;
- Acl.write Config.aclFile;
+ Acl.write Config.aclFile;*)
("Removed domains" ^ foldl (fn (d, s) => s ^ " " ^ d) "" doms ^ ".",
NONE))
else
SOME ("Error adding user: " ^ msg)))
(fn () => ())
- | MsgCreateDb {dbtype, dbname} =>
+ | MsgCreateDb {dbtype, dbname, encoding} =>
doIt (fn () =>
if Dbms.validDbname dbname then
case Dbms.lookup dbtype of
NONE => ("Database creation request with unknown datatype type " ^ dbtype,
SOME ("Unknown database type " ^ dbtype))
| SOME handler =>
- case #createdb handler {user = user, dbname = dbname} of
- NONE => ("Created database " ^ user ^ "_" ^ dbname ^ ".",
- NONE)
- | SOME msg => ("Error creating database " ^ user ^ "_" ^ dbname ^ ": " ^ msg,
- SOME ("Error creating database: " ^ msg))
+ if not (Dbms.validEncoding encoding) then
+ ("Invalid encoding " ^ valOf encoding ^ " requested for database creation.",
+ SOME "Invalid encoding")
+ else
+ case #createdb handler {user = user, dbname = dbname, encoding = encoding} of
+ NONE => ("Created database " ^ user ^ "_" ^ dbname ^ ".",
+ NONE)
+ | SOME msg => ("Error creating database " ^ user ^ "_" ^ dbname ^ ": " ^ msg,
+ SOME ("Error creating database: " ^ msg))
else
("Invalid database name " ^ user ^ "_" ^ dbname,
SOME ("Invalid database name " ^ dbname)))
(fn () => ())
| MsgMysqlFixperms =>
- doIt (fn () => if OS.Process.isSuccess
- (OS.Process.system "/usr/bin/sudo -H /afs/hcoop.net/common/etc/scripts/mysql-grant-table-drop") then
- ("Requested mysql-fixperms",
- NONE)
+ (print "Starting mysql-fixperms\n";
+ doIt (fn () => if OS.Process.isSuccess
+ (OS.Process.system "/usr/bin/sudo -H /afs/hcoop.net/common/etc/scripts/mysql-grant-table-drop") then
+ ("Requested mysql-fixperms",
+ NONE)
else
("Requested mysql-fixperms, but execution failed!",
SOME "Script execution failed."))
- (fn () => ())
+ (fn () => ()))
| MsgDescribe dom =>
doIt (fn () => if not (Domain.validDomain dom) then
NONE)))
(fn () => ())
+ | MsgReUsers =>
+ doIt (fn () => (usersChanged ();
+ ("Users change callbacks run", NONE)))
+ (fn () => ())
+
| _ =>
doIt (fn () => ("Unexpected command",
SOME "Unexpected command"))
HCoop / hcoop / domtool2.git / blobdiff