X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matitaB%2Fmatita%2Fmatitadaemon.ml;h=d98a21e9b1e59a56536818617d66409f74cb7d96;hb=ac44bd2f74e5fc606fb6833f949bb36ed4c2fd69;hp=65ddaf2cc4e3cce064ed1e6e54920cf1f0ee44a3;hpb=7f28a5e47bd10355fee4332fe77bbfcca15f39d6;p=helm.git

diff --git a/matitaB/matita/matitadaemon.ml b/matitaB/matita/matitadaemon.ml
index 65ddaf2cc..d98a21e9b 100644
--- a/matitaB/matita/matitadaemon.ml
+++ b/matitaB/matita/matitadaemon.ml
@@ -3,8 +3,18 @@ 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 =
+  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
+
 (*** from matitaScript.ml ***)
 (* let only_dust_RE = Pcre.regexp "^(\\s|\n|%%[^\n]*\n)*$" *)
 
@@ -27,8 +37,8 @@ let eval_statement include_paths (* (buffer : GText.buffer) *) status (* script
   | GrafiteAst.Comment (loc, _) -> loc in
   
   let _,lend = HExtlib.loc_of_floc floc in 
-  let parsed_text, parsed_text_len = 
-    MatitaGtkMisc.utf8_parsed_text unparsed_text (HExtlib.floc_of_loc (0,lend)) in
+  let parsed_text, _parsed_text_len = 
+    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 
@@ -41,11 +51,9 @@ let eval_statement include_paths (* (buffer : GText.buffer) *) status (* script
   (status, parsed_text, unparsed_txt'),"",(*parsed_text_len*)
     utf8_length parsed_text
 
+let sequent_size = ref 40;;
 
-let status = ref (new MatitaEngine.status "cic:/matita");;
-let history = ref [!status];;
-
-let include_paths = ["/home/barolo/matitaB/matita/lib"];;
+let include_paths = ref [];;
 
 (* <metasenv>
  *   <meta number="...">
@@ -68,7 +76,7 @@ let output_status s =
   | Stack.Open i ->
       let meta = List.assoc i metasenv in
       snd (ApplyTransformation.ntxt_of_cic_sequent 
-        ~metasenv ~subst ~map_unicode_to_tex:false 80 s (i,meta))
+        ~metasenv ~subst ~map_unicode_to_tex:false !sequent_size s (i,meta))
   | Stack.Closed _ -> "This goal has already been closed."
   in
   let render_sequent is_loc acc depth tag (pos,sw) =
@@ -155,121 +163,288 @@ let load_doc filename outchan =
   Http_daemon.respond ~headers:["Content-Type", contenttype] ~code:(`Code 200) ~body:s outchan
 ;;
 
-let call_service outchan =
-  try 
-   (ignore(MatitaEngine.assert_ng 
-     ~include_paths:["/home/barolo/matitaB/matita/lib"] (* ~outch:outchan *)
-    "/home/barolo/matitaB/matita/lib/basics/pts.ma");
-    prerr_endline "fatto";
-    let s = read_file "/home/barolo/matitaB/matita/lib/basics/pts.ma.mad"
-    in
-    Http_daemon.respond ~headers:["Content-Type", "text/html"] ~code:(`Code 200) ~body:s outchan
-   )
-  with
-  e -> Http_daemon.respond ~code:(`Code 500) 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 = "<file>" ^ body ^ "</file>" in
-  let _,baseuri,_,_ = 
-    Librarian.baseuri_of_script ~include_paths:[] filename
-  in
-  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 () 
+        (read_file filename) in
+    prerr_endline ("sending:\nBEGIN\n" ^ body ^ "\nEND");
+    let body = "<file>" ^ body ^ "</file>" 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 (st,new_statements,new_unparsed),(* newtext TODO *) _,parsed_len =
        (* try *)
-         eval_statement include_paths (*buffer*) !status (`Raw text)
+         eval_statement !include_paths (*buffer*) status (`Raw text)
        (* with End_of_file -> raise Margin *)
      in
-  status := st;
-  history := st :: !history;
-  parsed_len, new_unparsed
+  MatitaAuthentication.set_status sid st;
+  MatitaAuthentication.set_history sid (st::history);
+  parsed_len, 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
+      "<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 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
+      "<html><head></head><body>Authentication error</body></html>"
+   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 = 
-     "<response><parsed length=\"" ^ (string_of_int parsed_len) ^ "\" />" ^ txt 
-     ^ "</response>"
-  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_unparsed, new_status = advance0 sid text in
+    let txt = output_status new_status in
+    let body = 
+       "<response><parsed length=\"" ^ (string_of_int parsed_len) ^ "\" />" ^ txt 
+       ^ "</response>"
+    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 = 
-     "<response><parsed length=\"" ^ (string_of_int parsed_len) ^ "\" />" ^ txt 
-     ^ "</response>"
-  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 text =
+      try
+        prerr_endline ("evaluating: " ^ first_line text);
+        let plen,new_unparsed,_new_status = advance0 sid text in
+        aux (parsed_len+plen) new_unparsed
+      with 
+      | _ -> parsed_len
+    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 status = MatitaAuthentication.get_status sid in
+    let txt = output_status status in
+    let body = 
+       "<response><parsed length=\"" ^ (string_of_int parsed_len) ^ "\" />" ^ txt 
+       ^ "</response>"
+    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
+      ((*
+       "<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;;
 
 (**********************************************************************)
@@ -333,15 +508,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 *)