X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matitaB%2Fmatita%2Fmatitadaemon.ml;h=5d745eab776b420d377610685122b75ca3e3af13;hb=d8bc6fd4ab18f2995624c75e2889318237e9c17f;hp=ea63e1a084ba6d231695f693559e650a11b06d82;hpb=b4fb1d2a880acc6123c31e8ab70c9089b9f8a270;p=helm.git
diff --git a/matitaB/matita/matitadaemon.ml b/matitaB/matita/matitadaemon.ml
index ea63e1a08..5d745eab7 100644
--- a/matitaB/matita/matitadaemon.ml
+++ b/matitaB/matita/matitadaemon.ml
@@ -3,6 +3,10 @@ open Http_types;;
module Stack = Continuationals.Stack
+let rt_path () = Helm_registry.get "matita.rt_base_dir"
+
+let libdir uid = (rt_path ()) ^ "/users/" ^ uid
+
let utf8_length = Netconversion.ustring_length `Enc_utf8
let utf8_parsed_text s floc =
@@ -47,9 +51,17 @@ let eval_statement include_paths (* (buffer : GText.buffer) *) status (* script
(status, parsed_text, unparsed_txt'),"",(*parsed_text_len*)
utf8_length parsed_text
-
-let status = ref (new MatitaEngine.status "cic:/matita");;
-let history = ref [!status];;
+(*let save_moo status =
+ let script = MatitaScript.current () in
+ let baseuri = status#baseuri in
+ match script#bos, script#eos with
+ | true, _ -> ()
+ | _, true ->
+ GrafiteTypes.Serializer.serialize ~baseuri:(NUri.uri_of_string baseuri)
+ status
+ | _ -> clean_current_baseuri status
+;;*)
+
let sequent_size = ref 40;;
let include_paths = ref [];;
@@ -126,6 +138,23 @@ let output_status s =
String.concat "\n\n" txt
;; *)
+let html_of_matita s =
+ prerr_endline ("input: " ^ s);
+ let patt1 = Str.regexp "\005" in
+ let patt2 = Str.regexp "\006" in
+ let patt3 = Str.regexp "<" in
+ let patt4 = Str.regexp ">" in
+ let res = Str.global_replace patt4 ">" s in
+ prerr_endline ("output: " ^ res);
+ let res = Str.global_replace patt3 "<" res in
+ prerr_endline ("output: " ^ res);
+ let res = Str.global_replace patt2 ">" res in
+ prerr_endline ("output: " ^ res);
+ let res = Str.global_replace patt1 "<" res in
+ prerr_endline ("output: " ^ res);
+ res
+;;
+
let heading_nl_RE = Pcre.regexp "^\\s*\n\\s*";;
let first_line s =
@@ -164,117 +193,309 @@ let load_doc filename outchan =
let retrieve (cgi : Netcgi1_compat.Netcgi_types.cgi_activation) =
let cgi = Netcgi1_compat.Netcgi_types.of_compat_activation cgi in
- cgi # set_header
- ~cache:`No_cache
- ~content_type:"text/xml; charset=\"utf-8\""
- ();
- let filename = cgi # argument_value "file" in
- prerr_endline ("reading file " ^ filename);
- let body =
- Netencoding.Html.encode ~in_enc:`Enc_utf8 ~prefer_name:false ()
- (read_file filename) in
- prerr_endline ("sending:\nBEGIN\n" ^ body ^ "\nEND");
- let body = "" ^ body ^ "" in
- let baseuri, incpaths =
- try
- let root, baseuri, _fname, _tgt =
- Librarian.baseuri_of_script ~include_paths:[] filename in
- let includes =
- try
- Str.split (Str.regexp " ")
- (List.assoc "include_paths" (Librarian.load_root_file (root^"/root")))
- with Not_found -> []
- in
- let rc = root :: includes in
- List.iter (HLog.debug) rc; baseuri, rc
- with
- Librarian.NoRootFor _ | Librarian.FileNotFound _ -> "",[] in
- include_paths := incpaths;
- status := (!status)#set_baseuri baseuri;
- cgi#out_channel#output_string body;
+ let env = cgi#environment in
+ (try
+ let sid = Uuidm.of_string (Netcgi.Cookie.value (env#cookie "session")) in
+ let sid = HExtlib.unopt sid in
+ let uid = MatitaAuthentication.user_of_session sid in
+ cgi # set_header
+ ~cache:`No_cache
+ ~content_type:"text/xml; charset=\"utf-8\""
+ ();
+ let filename = libdir uid ^ "/" ^ (cgi # argument_value "file") in
+ prerr_endline ("reading file " ^ filename);
+ let body =
+ Netencoding.Html.encode ~in_enc:`Enc_utf8 ~prefer_name:false ()
+ (html_of_matita (read_file filename)) in
+
+ (* html_of_matita (read_file filename) in *)
+ prerr_endline ("sending:\nBEGIN\n" ^ body ^ "\nEND");
+ let body = "" ^ body ^ "" in
+ let baseuri, incpaths =
+ try
+ let root, baseuri, _fname, _tgt =
+ Librarian.baseuri_of_script ~include_paths:[] filename in
+ let includes =
+ try
+ Str.split (Str.regexp " ")
+ (List.assoc "include_paths" (Librarian.load_root_file (root^"/root")))
+ with Not_found -> []
+ in
+ let rc = root :: includes in
+ List.iter (HLog.debug) rc; baseuri, rc
+ with
+ Librarian.NoRootFor _ | Librarian.FileNotFound _ -> "",[] in
+ include_paths := incpaths;
+ let status = MatitaAuthentication.get_status sid in
+ MatitaAuthentication.set_status sid (status#set_baseuri baseuri);
+ cgi#out_channel#output_string body;
+ with
+ | Not_found _ ->
+ cgi # set_header
+ ~status:`Internal_server_error
+ ~cache:`No_cache
+ ~content_type:"text/xml; charset=\"utf-8\""
+ ());
cgi#out_channel#commit_work()
;;
-let advance0 text =
+let advance0 sid text =
+ let status = MatitaAuthentication.get_status sid in
+ let history = MatitaAuthentication.get_history sid in
+ let status = status#reset_disambiguate_db () in
let (st,new_statements,new_unparsed),(* newtext TODO *) _,parsed_len =
- (* try *)
- eval_statement !include_paths (*buffer*) !status (`Raw text)
- (* with End_of_file -> raise Margin *)
+ try
+ eval_statement !include_paths (*buffer*) status (`Raw text)
+ with
+ | HExtlib.Localized (_,e) -> raise e
+ (*| End_of_file -> raise Margin *)
in
- status := st;
- history := st :: !history;
- parsed_len, new_unparsed
+ let stringbuf = Ulexing.from_utf8_string new_statements in
+ let interpr = GrafiteDisambiguate.get_interpr st#disambiguate_db in
+ let outstr = ref "" in
+ ignore (SmallLexer.mk_small_printer interpr outstr stringbuf);
+ prerr_endline ("parser output: " ^ !outstr);
+ MatitaAuthentication.set_status sid st;
+ MatitaAuthentication.set_history sid (st::history);
+ parsed_len,
+ Netencoding.Html.encode ~in_enc:`Enc_utf8 ~prefer_name:false
+ () (html_of_matita !outstr), new_unparsed, st
+
+let register (cgi : Netcgi1_compat.Netcgi_types.cgi_activation) =
+ let cgi = Netcgi1_compat.Netcgi_types.of_compat_activation cgi in
+ let env = cgi#environment in
+
+ assert (cgi#arguments <> []);
+ let uid = cgi#argument_value "userid" in
+ let userpw = cgi#argument_value "password" in
+ (try
+ MatitaAuthentication.add_user uid userpw;
+ env#set_output_header_field "Location" "/index.html"
+ with
+ | MatitaAuthentication.UsernameCollision _ ->
+ cgi#set_header
+ ~cache:`No_cache
+ ~content_type:"text/html; charset=\"utf-8\""
+ ();
+ cgi#out_channel#output_string
+ "
Error: User id collision!"
+ | MatitaFilesystem.SvnError msg ->
+ cgi#set_header
+ ~cache:`No_cache
+ ~content_type:"text/html; charset=\"utf-8\""
+ ();
+ cgi#out_channel#output_string
+ ("Error: Svn checkout failed!
"));
+ cgi#out_channel#commit_work()
+;;
+
+let login (cgi : Netcgi1_compat.Netcgi_types.cgi_activation) =
+ let cgi = Netcgi1_compat.Netcgi_types.of_compat_activation cgi in
+ let env = cgi#environment in
+
+ assert (cgi#arguments <> []);
+ let uid = cgi#argument_value "userid" in
+ let userpw = cgi#argument_value "password" in
+ let pw,_ = MatitaAuthentication.lookup_user uid in
+ if pw = userpw then
+ begin
+ let _ = MatitaFilesystem.html_of_library uid in
+ let sid = MatitaAuthentication.create_session uid in
+ (* let cookie = Netcgi.Cookie.make "session" (Uuidm.to_string sid) in
+ cgi#set_header ~set_cookies:[cookie] (); *)
+ env#set_output_header_field
+ "Set-Cookie" ("session=" ^ (Uuidm.to_string sid));
+ env#set_output_header_field "Location" "/index.html"
+ end
+ else
+ begin
+ prerr_endline ("ERROR: received " ^ userpw ^ "but the password is " ^ pw);
+ cgi#set_header
+ ~cache:`No_cache
+ ~content_type:"text/html; charset=\"utf-8\""
+ ();
+ cgi#out_channel#output_string
+ "Authentication error"
+ end;
+
+ cgi#out_channel#commit_work()
+
+;;
+
+let logout (cgi : Netcgi1_compat.Netcgi_types.cgi_activation) =
+ let cgi = Netcgi1_compat.Netcgi_types.of_compat_activation cgi in
+ let env = cgi#environment in
+ (try
+ let sid = Uuidm.of_string (Netcgi.Cookie.value (env#cookie "session")) in
+ let sid = HExtlib.unopt sid in
+ MatitaAuthentication.logout_user sid;
+ cgi # set_header
+ ~cache:`No_cache
+ ~content_type:"text/html; charset=\"utf-8\""
+ ();
+ let text = read_file (rt_path () ^ "/logout.html") in
+ cgi#out_channel#output_string text
+ with
+ | Not_found _ ->
+ cgi # set_header
+ ~status:`Internal_server_error
+ ~cache:`No_cache
+ ~content_type:"text/xml; charset=\"utf-8\""
+ ());
+ cgi#out_channel#commit_work()
+;;
(* returns the length of the executed text and an html representation of the
* current metasenv*)
let advance (cgi : Netcgi1_compat.Netcgi_types.cgi_activation) =
let cgi = Netcgi1_compat.Netcgi_types.of_compat_activation cgi in
- cgi # set_header
- ~cache:`No_cache
- ~content_type:"text/xml; charset=\"utf-8\""
- ();
- let text = cgi#argument_value "body" in
- prerr_endline ("body =\n" ^ text);
- let parsed_len, new_unparsed = advance0 text in
- let txt = output_status !status in
- let body =
- "" ^ txt
- ^ ""
- in
- prerr_endline ("sending advance response:\n" ^ body);
- cgi#out_channel#output_string body;
+ let env = cgi#environment in
+ (try
+ let sid = Uuidm.of_string (Netcgi.Cookie.value (env#cookie "session")) in
+ let sid = HExtlib.unopt sid in
+ cgi # set_header
+ ~cache:`No_cache
+ ~content_type:"text/xml; charset=\"utf-8\""
+ ();
+ let text = cgi#argument_value "body" in
+ prerr_endline ("body =\n" ^ text);
+ let parsed_len, new_parsed, new_unparsed, new_status = advance0 sid text in
+ let txt = output_status new_status in
+ let body =
+ "" ^
+ new_parsed ^ "" ^ txt
+ ^ ""
+ in
+ prerr_endline ("sending advance response:\n" ^ body);
+ cgi#out_channel#output_string body
+ with
+ | Not_found _ ->
+ cgi # set_header
+ ~status:`Internal_server_error
+ ~cache:`No_cache
+ ~content_type:"text/xml; charset=\"utf-8\""
+ ());
cgi#out_channel#commit_work()
;;
let gotoBottom (cgi : Netcgi1_compat.Netcgi_types.cgi_activation) =
- let rec aux parsed_len text =
- try
- prerr_endline ("evaluating: " ^ first_line text);
- let plen,new_unparsed = advance0 text in
- aux (parsed_len+plen) new_unparsed
- with
- | _ -> parsed_len
- in
let cgi = Netcgi1_compat.Netcgi_types.of_compat_activation cgi in
- cgi # set_header
- ~cache:`No_cache
- ~content_type:"text/xml; charset=\"utf-8\""
- ();
- let text = cgi#argument_value "body" in
- prerr_endline ("body =\n" ^ text);
- let parsed_len = aux 0 text in
- let txt = output_status !status in
- let body =
- "" ^ txt
- ^ ""
- in
- prerr_endline ("sending goto bottom response:\n" ^ body);
- cgi#out_channel#output_string body;
+ let env = cgi#environment in
+ (try
+ let sid = Uuidm.of_string (Netcgi.Cookie.value (env#cookie "session")) in
+ let sid = HExtlib.unopt sid in
+
+ let rec aux parsed_len parsed_txt text =
+ try
+ prerr_endline ("evaluating: " ^ first_line text);
+ let plen,new_parsed,new_unparsed,_new_status = advance0 sid text in
+ aux (parsed_len+plen) (parsed_txt ^ new_parsed) new_unparsed
+ with
+ | End_of_file ->
+ let status = MatitaAuthentication.get_status sid in
+ GrafiteTypes.Serializer.serialize
+ ~baseuri:(NUri.uri_of_string status#baseuri) status;
+ parsed_len, parsed_txt
+ | _ -> parsed_len, parsed_txt
+ in
+ cgi # set_header
+ ~cache:`No_cache
+ ~content_type:"text/xml; charset=\"utf-8\""
+ ();
+ let text = cgi#argument_value "body" in
+ prerr_endline ("body =\n" ^ text);
+ let parsed_len, new_parsed = aux 0 "" text in
+ let status = MatitaAuthentication.get_status sid in
+ let txt = output_status status in
+ let body =
+ "" ^
+ new_parsed ^ "" ^ txt
+ ^ ""
+ in
+ (*let body =
+ "" ^ txt
+ ^ ""
+ in*)
+ prerr_endline ("sending goto bottom response:\n" ^ body);
+ cgi#out_channel#output_string body
+ with Not_found -> cgi#set_header ~status:`Internal_server_error
+ ~cache:`No_cache
+ ~content_type:"text/xml; charset=\"utf-8\"" ());
cgi#out_channel#commit_work()
;;
let retract (cgi : Netcgi1_compat.Netcgi_types.cgi_activation) =
let cgi = Netcgi1_compat.Netcgi_types.of_compat_activation cgi in
- cgi # set_header
- ~cache:`No_cache
- ~content_type:"text/xml; charset=\"utf-8\""
- ();
- let new_history,new_status =
- match !history with
- _::(status::_ as history) ->
- history, status
- | [_] -> (prerr_endline "singleton";failwith "retract")
- | _ -> (prerr_endline "nil"; assert false) in
- NCicLibrary.time_travel !status;
- history := new_history;
- status := new_status;
- let body = output_status !status in
- cgi#out_channel#output_string body;
+ let env = cgi#environment in
+ (try
+ let sid = Uuidm.of_string (Netcgi.Cookie.value (env#cookie "session")) in
+ let sid = HExtlib.unopt sid in
+ cgi # set_header
+ ~cache:`No_cache
+ ~content_type:"text/xml; charset=\"utf-8\""
+ ();
+ let history = MatitaAuthentication.get_history sid in
+ let new_history,new_status =
+ match history with
+ _::(status::_ as history) ->
+ history, status
+ | [_] -> (prerr_endline "singleton";failwith "retract")
+ | _ -> (prerr_endline "nil"; assert false) in
+ NCicLibrary.time_travel new_status;
+ MatitaAuthentication.set_history sid new_history;
+ MatitaAuthentication.set_status sid new_status;
+ prerr_endline ("after retract history.length = " ^
+ string_of_int (List.length new_history));
+ let body = output_status new_status in
+ cgi#out_channel#output_string body
+ with _ -> cgi#set_header ~status:`Internal_server_error
+ ~cache:`No_cache
+ ~content_type:"text/xml; charset=\"utf-8\"" ());
cgi#out_channel#commit_work()
;;
+let viewLib (cgi : Netcgi1_compat.Netcgi_types.cgi_activation) =
+ let cgi = Netcgi1_compat.Netcgi_types.of_compat_activation cgi in
+ let env = cgi#environment in
+
+ let sid = Uuidm.of_string (Netcgi.Cookie.value (env#cookie "session")) in
+ let sid = HExtlib.unopt sid in
+ cgi # set_header
+ ~cache:`No_cache
+ ~content_type:"text/html; charset=\"utf-8\""
+ ();
+ let uid = MatitaAuthentication.user_of_session sid in
+
+ let html = MatitaFilesystem.html_of_library uid in
+ cgi#out_channel#output_string
+ ((*
+ "\n" ^
+ "XML Tree Control\n" ^
+ "\n" ^
+ "\n" ^
+ "\n" ^ *)
+ html (* ^ "\n" *) );
+ cgi#out_channel#commit_work()
+
+;;
+
+let resetLib (cgi : Netcgi1_compat.Netcgi_types.cgi_activation) =
+ let cgi = Netcgi1_compat.Netcgi_types.of_compat_activation cgi in
+ MatitaAuthentication.reset ();
+ cgi # set_header
+ ~cache:`No_cache
+ ~content_type:"text/html; charset=\"utf-8\""
+ ();
+
+ cgi#out_channel#output_string
+ ("\n" ^
+ "Matitaweb Reset\n" ^
+ "Reset completed
");
+ cgi#out_channel#commit_work()
+
open Netcgi1_compat.Netcgi_types;;
(**********************************************************************)
@@ -338,15 +559,56 @@ let start() =
dyn_translator = (fun _ -> ""); (* not needed *)
dyn_accept_all_conditionals = false;
} in
+ let do_register =
+ { Nethttpd_services.dyn_handler = (fun _ -> register);
+ dyn_activation = Nethttpd_services.std_activation `Std_activation_buffered;
+ dyn_uri = None; (* not needed *)
+ dyn_translator = (fun _ -> ""); (* not needed *)
+ dyn_accept_all_conditionals = false;
+ } in
+ let do_login =
+ { Nethttpd_services.dyn_handler = (fun _ -> login);
+ dyn_activation = Nethttpd_services.std_activation `Std_activation_buffered;
+ dyn_uri = None; (* not needed *)
+ dyn_translator = (fun _ -> ""); (* not needed *)
+ dyn_accept_all_conditionals = false;
+ } in
+ let do_logout =
+ { Nethttpd_services.dyn_handler = (fun _ -> logout);
+ dyn_activation = Nethttpd_services.std_activation `Std_activation_buffered;
+ dyn_uri = None; (* not needed *)
+ dyn_translator = (fun _ -> ""); (* not needed *)
+ dyn_accept_all_conditionals = false;
+ } in
+ let do_viewlib =
+ { Nethttpd_services.dyn_handler = (fun _ -> viewLib);
+ dyn_activation = Nethttpd_services.std_activation `Std_activation_buffered;
+ dyn_uri = None; (* not needed *)
+ dyn_translator = (fun _ -> ""); (* not needed *)
+ dyn_accept_all_conditionals = false;
+ } in
+ let do_resetlib =
+ { Nethttpd_services.dyn_handler = (fun _ -> resetLib);
+ dyn_activation = Nethttpd_services.std_activation `Std_activation_buffered;
+ dyn_uri = None; (* not needed *)
+ dyn_translator = (fun _ -> ""); (* not needed *)
+ dyn_accept_all_conditionals = false;
+ } in
let nethttpd_factory =
Nethttpd_plex.nethttpd_factory
~handlers:[ "advance", do_advance
; "retract", do_retract
; "bottom", goto_bottom
- ; "open", retrieve ]
+ ; "open", retrieve
+ ; "register", do_register
+ ; "login", do_login
+ ; "logout", do_logout
+ ; "reset", do_resetlib
+ ; "viewlib", do_viewlib]
() in
MatitaInit.initialize_all ();
+ MatitaAuthentication.deserialize ();
Netplex_main.startup
parallelizer
Netplex_log.logger_factories (* allow all built-in logging styles *)