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
(setupUser ();
checkDir' dname)
-fun reduce fname =
+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
(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 requestSlaveBio () = requestSlaveBio' true
+
fun request fname =
let
- val (user, bio) = requestBio (fn () => ignore (check fname))
+ val (user, bio) = requestBio (fn () => ignore (check (basis ()) fname))
val inf = TextIO.openIn fname
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 () =
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 ();
ok := false)
else
();
- app checker 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
end
-val regenerate = regenerateEither false eval'
-val regenerateTc = regenerateEither true (ignore o check)
+val regenerate = regenerateEither false eval
+val regenerateTc = regenerateEither true
+ (fn G => fn evs => fn file =>
+ (#1 (check G file), evs))
fun rmuser user =
let
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)))
| _ => (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
HCoop / hcoop / domtool2.git / blobdiff