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 =
(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 ()
(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
- "<html><head></head><body>Error: User id collision!</body></html>");
+ with
+ | MatitaAuthentication.UsernameCollision _ ->
+ cgi#set_header
+ ~cache:`No_cache
+ ~content_type:"text/html; charset=\"utf-8\""
+ ();
+ cgi#out_channel#output_string
+ "<html><head></head><body>Error: User id collision!</body></html>"
+ | MatitaFilesystem.SvnError msg ->
+ cgi#set_header
+ ~cache:`No_cache
+ ~content_type:"text/html; charset=\"utf-8\""
+ ();
+ cgi#out_channel#output_string
+ ("<html><head></head><body><p>Error: Svn checkout failed!<p><p><textarea>"
+ ^ msg ^ "</textarea></p></body></html>"));
cgi#out_channel#commit_work()
;;
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 ~set_cookies:[cookie] (); *)
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\""
;;
+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
+ ((*
+ "<html><head>\n" ^
+ "<title>XML Tree Control</title>\n" ^
+ "<link href=\"treeview/xmlTree.css\" type=\"text/css\" rel=\"stylesheet\">\n" ^
+ "<script src=\"treeview/xmlTree.js\" type=\"text/javascript\"></script>\n" ^
+ "<body>\n" ^ *)
+ html (* ^ "\n</body></html>" *) );
+ 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
+ ("<html><head>\n" ^
+ "<title>Matitaweb Reset</title>\n" ^
+ "<body><H1>Reset completed</H1></body></html>");
+ cgi#out_channel#commit_work()
+
open Netcgi1_compat.Netcgi_types;;
(**********************************************************************)
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
; "open", retrieve
; "register", do_register
; "login", do_login
- ; "logout", do_logout ]
+ ; "logout", do_logout
+ ; "reset", do_resetlib
+ ; "viewlib", do_viewlib]
() in
MatitaInit.initialize_all ();
- prerr_endline (MatitaFilesystem.checkout "ricciott");
MatitaAuthentication.deserialize ();
Netplex_main.startup
parallelizer