X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matitaB%2Fmatita%2Fmatitadaemon.ml;h=a07e7e16039489d962b2b318890d1fb21960e133;hb=83fa6fc1317f18af956b194b996afae10ec859a7;hp=664a7301c1b727ae26816d9d7f7cb8581a87aaa4;hpb=d8ae533d041cb600993ab2957111c105b6ded21d;p=helm.git diff --git a/matitaB/matita/matitadaemon.ml b/matitaB/matita/matitadaemon.ml index 664a7301c..a07e7e160 100644 --- a/matitaB/matita/matitadaemon.ml +++ b/matitaB/matita/matitadaemon.ml @@ -3,13 +3,11 @@ open Http_types;; module Stack = Continuationals.Stack -let utf8_length = Netconversion.ustring_length `Enc_utf8 +let rt_path () = Helm_registry.get "matita.rt_base_dir" + +let libdir uid = (rt_path ()) ^ "/users/" ^ uid -let utf8_parsed_text s floc = - let start, stop = HExtlib.loc_of_floc floc in - let len = stop - start in - let res = Netconversion.ustring_sub `Enc_utf8 start len s in - res, String.length res +let utf8_length = Netconversion.ustring_length `Enc_utf8 (*** from matitaScript.ml ***) (* let only_dust_RE = Pcre.regexp "^(\\s|\n|%%[^\n]*\n)*$" *) @@ -34,7 +32,7 @@ let eval_statement include_paths (* (buffer : GText.buffer) *) status (* script let _,lend = HExtlib.loc_of_floc floc in let parsed_text, _parsed_text_len = - utf8_parsed_text unparsed_text (HExtlib.floc_of_loc (0,lend)) in + HExtlib.utf8_parsed_text unparsed_text (HExtlib.floc_of_loc (0,lend)) in let byte_parsed_text_len = String.length parsed_text in let unparsed_txt' = String.sub unparsed_text byte_parsed_text_len @@ -47,6 +45,17 @@ let eval_statement include_paths (* (buffer : GText.buffer) *) status (* script (status, parsed_text, unparsed_txt'),"",(*parsed_text_len*) utf8_length parsed_text +(*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 [];; @@ -123,6 +132,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 = @@ -165,17 +191,22 @@ let retrieve (cgi : Netcgi1_compat.Netcgi_types.cgi_activation) = (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 = cgi # argument_value "file" in + *) + 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 () - (read_file filename) in + 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 body = "" ^ body ^ "" in let baseuri, incpaths = try let root, baseuri, _fname, _tgt = @@ -193,52 +224,98 @@ let retrieve (cgi : Netcgi1_compat.Netcgi_types.cgi_activation) = include_paths := incpaths; let status = MatitaAuthentication.get_status sid in MatitaAuthentication.set_status sid (status#set_baseuri baseuri); + cgi # set_header + ~cache:`No_cache + ~content_type:"text/xml; charset=\"utf-8\"" + (); 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\"" + ~content_type:"text/html; charset=\"utf-8\"" ()); cgi#out_channel#commit_work() ;; 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 *) + try eval_statement !include_paths (*buffer*) status (`Raw text) - (* with End_of_file -> raise Margin *) + with + | HExtlib.Localized (_,e) -> raise e + (*| End_of_file -> raise Margin *) in + 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, new_unparsed, st + 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" *) + cgi#out_channel#output_string + ("" + ^ "Redirecting to login page...") + 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 - prerr_endline "1"; assert (cgi#arguments <> []); let uid = cgi#argument_value "userid" in let userpw = cgi#argument_value "password" in - prerr_endline ("2: user = " ^ uid); let pw,_ = MatitaAuthentication.lookup_user uid in - prerr_endline "3"; if pw = userpw then begin - prerr_endline "4"; + 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 ~status:`See_other ~cache:`No_cache ~set_cookies:[cookie] (); - env#set_output_header_field "Location" "/index.html" + (* 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" *) + cgi#out_channel#output_string + ("" + ^ "Redirecting to Matita page...") 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\"" @@ -251,6 +328,99 @@ let login (cgi : Netcgi1_compat.Netcgi_types.cgi_activation) = ;; +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/html; charset=\"utf-8\"" + ()); + cgi#out_channel#commit_work() +;; + +exception File_already_exists;; + +let save (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 + let status = MatitaAuthentication.get_status sid in + let uid = MatitaAuthentication.user_of_session sid in + assert (cgi#arguments <> []); + let locked = cgi#argument_value "locked" in + let unlocked = cgi#argument_value "unlocked" in + let filename = libdir uid ^ "/" ^ (cgi # argument_value "file") in + let force = bool_of_string (cgi#argument_value "force") in + prerr_endline ("Matita will save the file for user " ^ uid); + + if ((not force) && (Sys.file_exists filename)) then + raise File_already_exists; + + let oc = open_out filename in + output_string oc (locked ^ unlocked); + close_out oc; + if MatitaEngine.eos status unlocked then + begin + prerr_endline ("serializing proof objects..."); + GrafiteTypes.Serializer.serialize + ~baseuri:(NUri.uri_of_string status#baseuri) status; + prerr_endline ("adding to the commit queue..."); + MatitaFilesystem.add_user uid; + prerr_endline ("done."); + end; + cgi # set_header + ~cache:`No_cache + ~content_type:"text/xml; charset=\"utf-8\"" + (); + cgi#out_channel#output_string "ok" + with + | File_already_exists -> + cgi#out_channel#output_string "cancelled" + | Sys_error _ -> + cgi # set_header + ~status:`Internal_server_error + ~cache:`No_cache + ~content_type:"text/xml; charset=\"utf-8\"" + ()); + cgi#out_channel#commit_work() +;; + +let initiate_commit (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 errors = MatitaFilesystem.do_global_commit () in + prerr_endline ("commit errors: " ^ (String.concat " " errors)); + cgi # set_header + ~cache:`No_cache + ~content_type:"text/xml; charset=\"utf-8\"" + (); + cgi#out_channel#output_string "ok" + 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) = @@ -259,19 +429,28 @@ let advance (cgi : Netcgi1_compat.Netcgi_types.cgi_activation) = (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_unparsed, new_status = advance0 sid text in + let history = MatitaAuthentication.get_history sid in + let parsed_len, new_parsed, new_unparsed, new_status = advance0 sid text in + MatitaAuthentication.set_history sid (new_status::history); let txt = output_status new_status in let body = - "" ^ txt + "" ^ + new_parsed ^ "" ^ txt ^ "" in prerr_endline ("sending advance response:\n" ^ body); + cgi # set_header + ~cache:`No_cache + ~content_type:"text/xml; charset=\"utf-8\"" + (); cgi#out_channel#output_string body with | Not_found _ -> @@ -289,29 +468,48 @@ let gotoBottom (cgi : Netcgi1_compat.Netcgi_types.cgi_activation) = (try let sid = Uuidm.of_string (Netcgi.Cookie.value (env#cookie "session")) in let sid = HExtlib.unopt sid in + let history = MatitaAuthentication.get_history sid in - let rec aux parsed_len text = + let rec aux parsed_len parsed_txt text = try prerr_endline ("evaluating: " ^ first_line text); - let plen,new_unparsed,_new_status = advance0 sid text in - aux (parsed_len+plen) new_unparsed + let plen,new_parsed,new_unparsed,_new_status = advance0 sid text in + aux (parsed_len+plen) (parsed_txt ^ new_parsed) new_unparsed with - | _ -> parsed_len - in + | End_of_file -> + let status = MatitaAuthentication.get_status sid in + GrafiteTypes.Serializer.serialize + ~baseuri:(NUri.uri_of_string status#baseuri) status; + if parsed_len > 0 then + MatitaAuthentication.set_history sid (status::history); + 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 = aux 0 text in + let parsed_len, new_parsed = aux 0 "" text in let status = MatitaAuthentication.get_status sid in let txt = output_status status in let body = - "" ^ txt + "" ^ + new_parsed ^ "" ^ txt ^ "" in + (*let body = + "" ^ txt + ^ "" + in*) prerr_endline ("sending goto bottom response:\n" ^ body); + cgi # set_header + ~cache:`No_cache + ~content_type:"text/xml; charset=\"utf-8\"" + (); cgi#out_channel#output_string body with Not_found -> cgi#set_header ~status:`Internal_server_error ~cache:`No_cache @@ -322,13 +520,16 @@ let gotoBottom (cgi : Netcgi1_compat.Netcgi_types.cgi_activation) = let retract (cgi : Netcgi1_compat.Netcgi_types.cgi_activation) = let cgi = Netcgi1_compat.Netcgi_types.of_compat_activation cgi in let env = cgi#environment in + prerr_endline "executing retract"; (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 @@ -336,12 +537,18 @@ let retract (cgi : Netcgi1_compat.Netcgi_types.cgi_activation) = history, status | [_] -> (prerr_endline "singleton";failwith "retract") | _ -> (prerr_endline "nil"; assert false) in + prerr_endline "before time_travel"; NCicLibrary.time_travel new_status; + prerr_endline "after time travel"; 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 # set_header + ~cache:`No_cache + ~content_type:"text/xml; charset=\"utf-8\"" + (); cgi#out_channel#output_string body with _ -> cgi#set_header ~status:`Internal_server_error ~cache:`No_cache @@ -350,6 +557,51 @@ let retract (cgi : Netcgi1_compat.Netcgi_types.cgi_activation) = ;; +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 # set_header + ~cache:`No_cache + ~content_type:"text/html; charset=\"utf-8\"" + (); + 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;; (**********************************************************************) @@ -413,6 +665,13 @@ 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; @@ -420,6 +679,41 @@ let start() = 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 do_save = + { Nethttpd_services.dyn_handler = (fun _ -> save); + 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_commit = + { Nethttpd_services.dyn_handler = (fun _ -> initiate_commit); + 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 @@ -427,13 +721,16 @@ let start() = ; "retract", do_retract ; "bottom", goto_bottom ; "open", retrieve - ; "login", do_login ] + ; "register", do_register + ; "login", do_login + ; "logout", do_logout + ; "reset", do_resetlib + ; "viewlib", do_viewlib + ; "save", do_save + ; "commit", do_commit] () in MatitaInit.initialize_all (); - (* test begin *) - MatitaAuthentication.add_user "ricciott" "pippo123"; - MatitaAuthentication.add_user "asperti" "pluto456"; - (* test end *) + MatitaAuthentication.deserialize (); Netplex_main.startup parallelizer Netplex_log.logger_factories (* allow all built-in logging styles *)