structure SM = StringMap
fun init () = Acl.read Config.aclFile
-
+
+fun isLib fname = OS.Path.file fname = "lib.dtl"
+
+fun wrapFile (fname, file) =
+ case (isLib fname, file) of
+ (true, (comment, ds, SOME e)) =>
+ let
+ val (_, loc) = e
+ in
+ (comment, ds, SOME (ELocal (e, (ESkip, loc)), loc))
+ end
+ | _ => file
+
fun check' G fname =
let
val prog = Parse.parse fname
+ val prog = wrapFile (fname, prog)
in
if !ErrorMsg.anyErrors then
G
else
- Tycheck.checkFile G (Defaults.tInit ()) prog
+ (if isLib fname then
+ ()
+ else
+ Option.app (Unused.check G) (#3 prog);
+ Tycheck.checkFile G (Defaults.tInit prog) prog)
end
fun basis () =
before Tycheck.disallowExterns ())
end
-fun check fname =
+(* val b = basis () *)
+
+fun check G fname =
let
val _ = ErrorMsg.reset ()
val _ = Env.preTycheck ()
-
- val b = basis ()
in
if !ErrorMsg.anyErrors then
raise ErrorMsg.Error
val _ = Tycheck.disallowExterns ()
val _ = ErrorMsg.reset ()
val prog = Parse.parse fname
+ val prog = wrapFile (fname, prog)
in
if !ErrorMsg.anyErrors then
raise ErrorMsg.Error
else
let
- val G' = Tycheck.checkFile b (Defaults.tInit ()) prog
+ val G' = Tycheck.checkFile G (Defaults.tInit prog) prog
in
if !ErrorMsg.anyErrors then
raise ErrorMsg.Error
else
- (G', #3 prog)
+ (if isLib fname then
+ ()
+ else
+ Option.app (Unused.check G) (#3 prog);
+ (G', #3 prog))
end
end
end
String.sub (s, 0) <> #"."
andalso CharVector.all (fn ch => Char.isAlphaNum ch orelse ch = #"." orelse ch = #"_" orelse ch = #"-") s
-fun checkDir dname =
+fun setupUser () =
+ let
+ val user =
+ case Posix.ProcEnv.getenv "DOMTOOL_USER" of
+ NONE =>
+ let
+ val uid = Posix.ProcEnv.getuid ()
+ in
+ Posix.SysDB.Passwd.name (Posix.SysDB.getpwuid uid)
+ end
+ | SOME user => user
+ in
+ Acl.read Config.aclFile;
+ Domain.setUser user;
+ user
+ end
+
+fun checkDir' dname =
let
val b = basis ()
())
end
-fun reduce fname =
+fun checkDir dname =
+ (setupUser ();
+ checkDir' dname)
+
+fun reduce G fname =
let
- val (G, body) = check fname
+ 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 body'
+ (G, SOME body')
end
- | _ => NONE
+ | _ => (G, NONE)
end
-fun eval fname =
- case reduce fname of
- (SOME body') =>
- if !ErrorMsg.anyErrors then
- raise ErrorMsg.Error
- else
- Eval.exec (Defaults.eInit ()) body'
- | NONE => raise ErrorMsg.Error
+(*(Defaults.eInit ())*)
-fun eval' fname =
- case reduce fname of
- (SOME body') =>
+fun eval G evs fname =
+ case reduce G fname of
+ (G, SOME body') =>
if !ErrorMsg.anyErrors then
raise ErrorMsg.Error
else
- ignore (Eval.exec' (Defaults.eInit ()) body')
- | NONE => raise ErrorMsg.Error
+ let
+ val evs' = Eval.exec' evs body'
+ in
+ (G, evs')
+ end
+ | (G, NONE) => (G, evs)
val dispatcher =
Config.dispatcher ^ ":" ^ Int.toString Config.dispatcherPort
print ("Additional information: " ^ s ^ "\n");
raise e)
-fun setupUser () =
- let
- val user =
- case Posix.ProcEnv.getenv "DOMTOOL_USER" of
- NONE =>
- let
- val uid = Posix.ProcEnv.getuid ()
- in
- Posix.SysDB.Passwd.name (Posix.SysDB.getpwuid uid)
- end
- | SOME user => user
- in
- Acl.read Config.aclFile;
- Domain.setUser user;
- user
- end
-
fun requestContext f =
let
val user = setupUser ()
(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 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 _ = ErrorMsg.reset ()
- val (user, bio) = requestBio (fn () => checkDir dname)
+ val (user, bio) = requestBio (fn () => checkDir' dname)
val b = basis ()
val (_, files) = Order.order (SOME b) files
val _ = if !ErrorMsg.anyErrors then
- raise ErrorMsg.Error
+ (print "J\n";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 () =
before OpenSSL.close bio
end
-fun regenerate context =
+fun requestDescribe dom =
+ let
+ val (_, bio) = requestBio (fn () => ())
+ in
+ Msg.send (bio, MsgDescribe dom);
+ case Msg.recv bio of
+ NONE => print "Server closed connection unexpectedly.\n"
+ | SOME m =>
+ case m of
+ MsgDescription s => print s
+ | MsgError s => print ("Description failed: " ^ s ^ "\n")
+ | _ => print "Unexpected server reply.\n";
+ OpenSSL.close bio
+ end
+
+structure SS = StringSet
+
+fun domainList dname =
+ let
+ val dir = Posix.FileSys.opendir dname
+
+ fun visitNode dset =
+ case Posix.FileSys.readdir dir of
+ NONE => dset
+ | SOME node =>
+ let
+ val path = OS.Path.joinDirFile {dir = dname,
+ file = node}
+
+ fun visitDomains (path, bfor, dset) =
+ let
+ val dir = Posix.FileSys.opendir path
+
+ fun loop dset =
+ case Posix.FileSys.readdir dir of
+ NONE => dset
+ | SOME dname =>
+ let
+ val path = OS.Path.joinDirFile {dir = path,
+ file = dname}
+ in
+ if Posix.FileSys.ST.isDir (Posix.FileSys.stat path) then
+ let
+ val bfor = dname :: bfor
+ in
+ loop (visitDomains (path, bfor,
+ SS.add (dset,
+ String.concatWith "." bfor)))
+ end
+ else
+ loop dset
+ end
+ in
+ loop dset
+ before Posix.FileSys.closedir dir
+ end
+ in
+ visitNode (visitDomains (path, [], dset))
+ end
+ in
+ visitNode SS.empty
+ before Posix.FileSys.closedir dir
+ end
+
+fun regenerateEither tc checker context =
let
+ val () = print "Starting regeneration....\n"
+
+ val domainsBefore =
+ if tc then
+ SS.empty
+ else
+ domainList Config.resultRoot
+
+ fun ifReal f =
+ if tc then
+ ()
+ else
+ f ()
+
val _ = ErrorMsg.reset ()
val b = basis ()
val () = Tycheck.disallowExterns ()
- val () = Domain.resetGlobal ()
+ val () = ifReal (fn () =>
+ (ignore (OS.Process.system ("rm -rf " ^ Config.oldResultRoot ^ "/*"));
+ ignore (OS.Process.system ("cp -r " ^ Config.resultRoot
+ ^ "/* " ^ Config.oldResultRoot ^ "/"));
+ Domain.resetGlobal ()))
val ok = ref true
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
val files = loop []
val (_, files) = Order.order (SOME b) files
+
+ fun checker' (file, (G, evs)) =
+ checker G evs file
in
if !ErrorMsg.anyErrors then
(ErrorMsg.reset ();
- print ("User " ^ user ^ "'s configuration has errors!\n"))
+ print ("User " ^ user ^ "'s configuration has errors!\n");
+ ok := false)
else
- app eval' files
+ ();
+ ignore (foldl checker' (basis (), Defaults.eInit ()) files)
end
+ else if String.isSuffix "_admin" user then
+ ()
else
- ()
+ (print ("Couldn't access " ^ user ^ "'s ~/.domtool directory.\n");
+ ok := false)
end
handle IO.Io {name, function, ...} =>
(print ("IO error processing user " ^ user ^ ": " ^ function ^ ": " ^ name ^ "\n");
ok := false)
- | OS.SysErr (s, _) => (print ("System error processing user " ^ user ^ ": " ^ s ^ "\n");
- ok := false)
+ | exn as OS.SysErr (s, _) => (print ("System error processing user " ^ user ^ ": " ^ s ^ "\n");
+ ok := false)
| ErrorMsg.Error => (ErrorMsg.reset ();
print ("User " ^ user ^ " had a compilation error.\n");
ok := false)
| _ => (print "Unknown exception during regeneration!\n";
ok := false)
in
- app contactNode Config.nodeIps;
- Env.pre ();
+ ifReal (fn () => (app contactNode Config.nodeIps;
+ Env.pre ()));
app doUser (Acl.users ());
- Env.post ();
+ ifReal (fn () =>
+ let
+ val domainsAfter = domainList Config.resultRoot
+ val domainsGone = SS.difference (domainsBefore, domainsAfter)
+ in
+ if SS.isEmpty domainsGone then
+ ()
+ else
+ (print "Domains to kill:";
+ SS.app (fn s => (print " "; print s)) domainsGone;
+ print "\n";
+
+ Domain.rmdom' Config.oldResultRoot (SS.listItems domainsGone));
+
+ Env.post ()
+ end);
!ok
end
-fun regenerateTc context =
- let
- val _ = ErrorMsg.reset ()
-
- val b = basis ()
- val () = Tycheck.disallowExterns ()
-
- val () = Domain.resetGlobal ()
-
- val ok = ref true
-
- fun doUser user =
- let
- val _ = Domain.setUser user
- val _ = ErrorMsg.reset ()
-
- val dname = Config.domtoolDir user
- in
- if Posix.FileSys.access (dname, []) then
- let
- val dir = Posix.FileSys.opendir dname
-
- fun loop files =
- case Posix.FileSys.readdir dir of
- NONE => (Posix.FileSys.closedir dir;
- files)
- | SOME fname =>
- if notTmp fname then
- loop (OS.Path.joinDirFile {dir = dname,
- file = fname}
- :: files)
- else
- loop files
-
- val files = loop []
- val (_, files) = Order.order (SOME b) files
- in
- if !ErrorMsg.anyErrors then
- (ErrorMsg.reset ();
- print ("User " ^ user ^ "'s configuration has errors!\n");
- ok := false)
- else
- app (ignore o check) files
- end
- else
- ()
- end
- handle IO.Io _ => ()
- | OS.SysErr (s, _) => print ("System error processing user " ^ user ^ ": " ^ s ^ "\n")
- | ErrorMsg.Error => (ErrorMsg.reset ();
- print ("User " ^ user ^ " had a compilation error.\n"))
- | _ => print "Unknown exception during -tc regeneration!\n"
- in
- app doUser (Acl.users ());
- !ok
- end
+val regenerate = regenerateEither false eval
+val regenerateTc = regenerateEither true
+ (fn G => fn evs => fn file =>
+ (#1 (check G file), evs))
fun rmuser user =
let
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
val outname = OS.FileSys.tmpName ()
- fun doOne code =
+ fun doOne (code, (G, evs)) =
let
val outf = TextIO.openOut outname
in
TextIO.output (outf, code);
TextIO.closeOut outf;
- eval' outname
+ eval G evs outname
end
in
doIt (fn () => (Env.pre ();
- app doOne codes;
+ ignore (foldl doOne (basis (), Defaults.eInit ()) codes);
Env.post ();
Msg.send (bio, MsgOk);
("Configuration complete.", NONE)))
| 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)))
SOME "Script execution failed."))
(fn () => ())
+ | MsgDescribe dom =>
+ doIt (fn () => if not (Domain.validDomain dom) then
+ ("Requested description of invalid domain " ^ dom,
+ SOME "Invalid domain name")
+ else if not (Domain.yourDomain dom
+ orelse Acl.query {user = user, class = "priv", value = "all"}) then
+ ("Requested description of " ^ dom ^ ", but not allowed access",
+ SOME "Access denied")
+ else
+ (Msg.send (bio, MsgDescription (Domain.describe dom));
+ ("Sent description of domain " ^ dom,
+ NONE)))
+ (fn () => ())
+
| _ =>
doIt (fn () => ("Unexpected command",
SOME "Unexpected command"))
OpenSSL.close bio
handle OpenSSL.OpenSSL _ => ();
loop ())
+ | OS.Path.InvalidArc =>
+ (print "Invalid arc\n";
+ OpenSSL.close bio
+ handle OpenSSL.OpenSSL _ => ();
+ loop ())
| e =>
(print "Unknown exception in main loop!\n";
app (fn x => print (x ^ "\n")) (SMLofNJ.exnHistory e);
| _ => (OpenSSL.close bio;
loop ())
end handle OpenSSL.OpenSSL s =>
- (print ("OpenSSL error: "^ s ^ "\n");
+ (print ("OpenSSL error: " ^ s ^ "\n");
OpenSSL.close bio
handle OpenSSL.OpenSSL _ => ();
loop ())
OpenSSL.close bio
handle OpenSSL.OpenSSL _ => ();
loop ())
+ | IO.Io {function, name, ...} =>
+ (print ("IO error: " ^ function ^ ": " ^ name ^ "\n");
+ OpenSSL.close bio
+ handle OpenSSL.OpenSSL _ => ();
+ loop ())
+ | e =>
+ (app (fn s => print (s ^ "\n")) (SMLofNJ.exnHistory e);
+ print "Uncaught exception!\n";
+ OpenSSL.close bio
+ handle OpenSSL.OpenSSL _ => ();
+ loop ())
in
loop ();
OpenSSL.shutdown sock