let user_tbl = (ref [] : user list ref)
-(* session table: (user id, session id), matita status *)
-type session = session_id * (MatitaEngine.status * MatitaEngine.status list)
+(* session table: session id, (user id, matita status, matita history *)
+type session = session_id * (string * MatitaEngine.status * MatitaEngine.status list)
let session_tbl = (ref [] : session list ref)
let lookup_user uid = List.assoc uid !user_tbl
+let user_of_session sid = let res,_,_ = List.assoc sid !session_tbl in res
+
let create_session uid =
let status = new MatitaEngine.status (Some uid) "cic:/matita" in
let history = [status] in
List.remove_assoc sid' !session_tbl
| _ -> !session_tbl
in
- session_tbl := (new_session,(status,history))::clean_stbl;
+ session_tbl := (new_session,(uid,status,history))::clean_stbl;
new_session
;;
-let get_status sid = fst (List.assoc sid !session_tbl)
+let get_session_owner sid =
+ let uid,_,_ = List.assoc sid !session_tbl
+ in uid
+
+let get_status sid =
+ let _,st,_ = List.assoc sid !session_tbl
+ in st
-let get_history sid = snd (List.assoc sid !session_tbl)
+let get_history sid =
+ let _,_,hist = List.assoc sid !session_tbl
+ in hist
let set_status sid st =
- let oldst, hist = List.assoc sid !session_tbl in
- session_tbl := (sid,(st,hist))::(List.remove_assoc sid !session_tbl)
+ let uid, oldst, hist = List.assoc sid !session_tbl in
+ session_tbl := (sid,(uid,st,hist))::(List.remove_assoc sid !session_tbl)
let set_history sid hist =
- let st, oldhist = List.assoc sid !session_tbl in
- session_tbl := (sid,(st,hist))::(List.remove_assoc sid !session_tbl)
-
-let logout_user uid =
- match List.assoc uid !user_tbl with
- | _,None -> ()
- | pw, Some sid ->
- user_tbl := (uid,(pw,None))::List.remove_assoc uid !user_tbl;
- session_tbl := List.remove_assoc sid !session_tbl
+ let uid, st, oldhist = List.assoc sid !session_tbl in
+ session_tbl := (sid,(uid,st,hist))::(List.remove_assoc sid !session_tbl)
+
+let logout_user sid =
+ let uid,st,hist = List.assoc sid !session_tbl in
+ let pw,_ = List.assoc uid !user_tbl in
+ user_tbl := (uid,(pw,None))::List.remove_assoc uid !user_tbl;
+ session_tbl := List.remove_assoc sid !session_tbl
;;
let remove_user uid =
;;
let deserialize () =
- let utbl_ch = open_in (config_path () ^ "/usertable.dump") in
- user_tbl := Marshal.from_channel utbl_ch;
- close_in utbl_ch;
+ (try
+ let utbl_ch = open_in (config_path () ^ "/usertable.dump") in
+ user_tbl := Marshal.from_channel utbl_ch;
+ close_in utbl_ch;
+ with
+ | Sys_error _ ->
+ user_tbl := []; serialize());
(* old_sessions are now invalid *)
session_tbl := [];
;;
let _ = lookup_user uid in
raise (UsernameCollision uid)
with Not_found ->
+ MatitaFilesystem.checkout uid;
user_tbl := (uid,(pw,None))::!user_tbl;
serialize ()
;;
+
+let reset () =
+ user_tbl := [];
+ session_tbl := [];
+ MatitaFilesystem.reset_lib ();
+ serialize ();
+;;