X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2FDEVEL%2Focaml-http%2Fhttp_daemon.ml;h=f29b4c1d16390084af88c6268611e10a13ee7610;hb=ebc089606ccbb3e9dbde142542a1f98f5020b4dd;hp=39a74bb652fc686e070b2ec8a10714324a4fbc81;hpb=1b41bb30966254e86fdc4a044331b301cfb7a029;p=helm.git diff --git a/helm/DEVEL/ocaml-http/http_daemon.ml b/helm/DEVEL/ocaml-http/http_daemon.ml index 39a74bb65..f29b4c1d1 100644 --- a/helm/DEVEL/ocaml-http/http_daemon.ml +++ b/helm/DEVEL/ocaml-http/http_daemon.ml @@ -2,7 +2,7 @@ (* OCaml HTTP - do it yourself (fully OCaml) HTTP daemon - Copyright (C) <2002> Stefano Zacchiroli + Copyright (C) <2002-2004> Stefano Zacchiroli This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -26,11 +26,6 @@ open Http_types;; open Http_constants;; open Http_parser;; -let default_addr = "0.0.0.0" -let default_port = 80 -let default_timeout = 300 -let default_mode = `Fork - (** send raw data on outchan, flushing it afterwards *) let send_raw ~data outchan = output_string outchan data; @@ -45,20 +40,8 @@ let send_header ~header ~value = let send_headers ~headers outchan = List.iter (fun (header, value) -> send_header ~header ~value outchan) headers - (** internal: parse a code argument from a function which have two optional - arguments "code" and "status" *) -let get_code_argument func_name = - fun ~code ~status -> - (match code, status with - | Some c, None -> c - | None, Some s -> code_of_status s - | Some _, Some _ -> (* TODO use some static type checking *) - failwith (func_name ^ " you must give 'code' or 'status', not both") - | None, None -> (* TODO use some static type checking *) - failwith (func_name ^ " you must give 'code' or 'status', not none")) - (** internal: low level for send_status_line *) -let send_status_line' ~version ~code = +let send_status_line' ~version code = let status_line = String.concat " " @@ -68,17 +51,16 @@ let send_status_line' ~version ~code = in send_raw ~data:(status_line ^ crlf) -let send_status_line ?(version = http_version) ?code ?status outchan = - send_status_line' - ~version - ~code:(get_code_argument "Daemon.send_status_line" ~code ~status) - outchan +let int_of_code = function + | `Code code -> code + | `Status status -> code_of_status status + +let send_status_line ?(version = http_version) ~(code: status_code) outchan = + send_status_line' ~version (int_of_code code) outchan (* FIXME duplication of code between this and response#addBasicHeaders *) -let send_basic_headers ?(version = http_version) ?code ?status outchan = - send_status_line' - ~version ~code:(get_code_argument "Daemon.send_basic_headers" ~code ~status) - outchan; +let send_basic_headers ?(version = http_version) ~(code: status_code) outchan = + send_status_line' ~version (int_of_code code) outchan; send_headers ~headers:["Date", Http_misc.date_822 (); "Server", server_string] outchan @@ -101,17 +83,9 @@ let foo_body code body = of an HTTP response; body, if given, will be appended to the body *) let send_foo_body code body = send_raw ~data:(foo_body code body) -let respond (* Warning: keep default values in sync with Http_response.response class *) - ?(body = "") ?(headers = []) - ?(version = http_version) ?(code = 200) ?status outchan - = - let code = - match status with - | None -> code - | Some s -> code_of_status s - in - send_basic_headers ~version ~code outchan; +let respond ?(body = "") ?(headers = []) ?version ?(code = `Code 200) outchan = + send_basic_headers ?version ~code outchan; send_headers ~headers outchan; send_header "Content-Length" (string_of_int (String.length body)) outchan; send_CRLF outchan; @@ -123,78 +97,52 @@ let respond reason phrase; if body is given it will be included in the body of the HTML page *) let send_empty_response - func_name ?(is_valid_status = fun _ -> true) ?(headers = []) ~body () = - fun ?(version = http_version) ?code ?status outchan -> - let code = get_code_argument func_name ~code ~status in - if not (is_valid_status code) then + func_name ?(is_valid_status = fun _ -> true) ?(headers=[]) ?(body="") () = + fun ?version code outchan -> + if not (is_valid_status (int_of_code code)) then failwith - (sprintf "'%d' isn't a valid status code for %s" code func_name) + (sprintf "'%d' isn't a valid status code for %s" + (int_of_code code) func_name) else begin (* status code suitable for answering *) let headers = - [ - "Connection", "close"; - "Content-Type", "text/html; charset=iso-8859-1" - ] @ headers + [ "Connection", "close"; + "Content-Type", "text/html; charset=iso-8859-1" ] @ headers in - let body = (foo_body code body) ^ body in - respond ~version ~code ~headers ~body outchan -(* - (* OLD VERSION, now use 'respond' function *) - send_basic_headers ~version ~code outchan; - send_header ~header:"Connection" ~value:"close" outchan; - send_header - ~header:"Content-Type" - ~value:"text/html; charset=iso-8859-1" - outchan; - send_headers ~headers outchan; - send_CRLF outchan; - send_foo_body ~code ~body outchan -*) + let body = (foo_body (int_of_code code) body) ^ body in + respond ?version ~code ~headers ~body outchan end let respond_redirect - ~location ?(body = "") ?(version = http_version) ?(code = 301) ?status outchan + ~location ?body ?version ?(code = `Code 301) outchan = - let code = - match status with - | None -> code - | Some (s: Http_types.redirection_status) -> code_of_status s - in - send_empty_response - "Daemon.respond_redirect" ~is_valid_status:is_redirection - ~headers:["Location", location] ~body () - ~version ~code outchan - -let respond_error - ?(body = "") ?(version = http_version) ?(code = 400) ?status outchan = - let code = - match status with - | None -> code - | Some s -> code_of_status s - in - send_empty_response - "Daemon.respond_error" ~is_valid_status:is_error ~body () - ~version ~code outchan - -let respond_not_found ~url ?(version = http_version) outchan = - send_empty_response - "Daemon.respond_not_found" ~body:"" () ~version ~code:404 outchan - -let respond_forbidden ~url ?(version = http_version) outchan = - send_empty_response - "Daemon.respond_permission_denied" ~body:"" () ~version ~code:403 outchan - -let send_file ?name ?file outchan = + send_empty_response "Daemon.respond_redirect" ~is_valid_status:is_redirection + ~headers:["Location", location] ?body () ?version code outchan + +let respond_error ?body ?version ?(code = `Code 400) outchan = + send_empty_response "Daemon.respond_error" ~is_valid_status:is_error + ?body () ?version code outchan + +let respond_not_found ~url ?version outchan = + send_empty_response "Daemon.respond_not_found" () ?version (`Code 404) outchan + +let respond_forbidden ~url ?version outchan = + send_empty_response "Daemon.respond_permission_denied" () ?version + (`Code 403) outchan + +let respond_unauthorized ?version ?(realm = server_string) outchan = + respond ~headers:["WWW-Authenticate", sprintf "Basic realm=\"%s\"" realm] + ~code:(`Code 401) outchan + +let send_file ~src outchan = let buflen = 1024 in let buf = String.make buflen ' ' in + let (file, cleanup) = - (match (name, file) with - | Some n, None -> (* if we open the file, we close it before returning *) - let f = open_in n in + match src with + | FileSrc fname -> (* if we open the file, we close it before returning *) + let f = open_in fname in f, (fun () -> close_in f) - | None, Some f -> (f, (fun () -> ())) - | _ -> (* TODO use some static type checking *) - failwith "Daemon.send_file: either name or file must be given") + | InChanSrc inchan -> inchan, ignore in try while true do @@ -241,20 +189,20 @@ let respond_file ~fname ?(version = http_version) outchan = try if Http_misc.is_directory path then begin (* file found, is a dir *) let dir = Unix.opendir path in - send_basic_headers ~version ~code:200 outchan; + send_basic_headers ~version ~code:(`Code 200) outchan; send_header "Content-Type" "text/html" outchan; send_CRLF outchan; send_dir_listing ~dir ~name:fname ~path outchan; Unix.closedir dir end else begin (* file found, is something else *) let file = open_in fname in - send_basic_headers ~version ~code:200 outchan; + send_basic_headers ~version ~code:(`Code 200) outchan; send_header ~header:"Content-Length" ~value:(string_of_int (Http_misc.filesize fname)) outchan; send_CRLF outchan; - send_file ~file outchan; + send_file ~src:(InChanSrc file) outchan; close_in file end with @@ -290,46 +238,41 @@ let rec wrap_parse_request_w_safety parse_function inchan outchan = with | (End_of_file) as e -> debug_print (pp_parse_exc e); - respond_error ~code:400 ~body:"Unexpected End Of File" outchan; + respond_error ~code:(`Code 400) ~body:"Unexpected End Of File" outchan; raise Again | (Malformed_request req) as e -> debug_print (pp_parse_exc e); - respond_error - ~code:400 - ~body:( - "request 1st line format should be: ' '" ^ + respond_error ~code:(`Code 400) + ~body:("request 1st line format should be: ' '" ^ "
\nwhile received request 1st line was:
\n" ^ req) outchan; raise Again - | (Unsupported_method meth) as e -> + | (Invalid_HTTP_method meth) as e -> debug_print (pp_parse_exc e); - respond_error - ~code:501 + respond_error ~code:(`Code 501) ~body:("Method '" ^ meth ^ "' isn't supported (yet)") outchan; raise Again | (Malformed_request_URI uri) as e -> debug_print (pp_parse_exc e); - respond_error ~code:400 ~body:("Malformed URL: '" ^ uri ^ "'") outchan; + respond_error ~code:(`Code 400) ~body:("Malformed URL: '" ^ uri ^ "'") + outchan; raise Again - | (Unsupported_HTTP_version version) as e -> + | (Invalid_HTTP_version version) as e -> debug_print (pp_parse_exc e); - respond_error - ~code:505 + respond_error ~code:(`Code 505) ~body:("HTTP version '" ^ version ^ "' isn't supported (yet)") outchan; raise Again | (Malformed_query query) as e -> debug_print (pp_parse_exc e); - respond_error - ~code:400 ~body:(sprintf "Malformed query string '%s'" query) outchan; + respond_error ~code:(`Code 400) + ~body:(sprintf "Malformed query string '%s'" query) outchan; raise Again | (Malformed_query_part (binding, query)) as e -> debug_print (pp_parse_exc e); - respond_error - ~code:400 - ~body:( - sprintf "Malformed query part '%s' in query '%s'" binding query) + respond_error ~code:(`Code 400) + ~body:(sprintf "Malformed query part '%s' in query '%s'" binding query) outchan; raise Again) (* (* preliminary support for HTTP keep alive connections ... *) @@ -356,6 +299,10 @@ let server_of_mode = function | `Fork -> Http_tcp_server.fork | `Thread -> Http_tcp_server.thread + (* TODO what happens when a Quit exception is raised by a callback? Do other + callbacks keep on living until the end or are them all killed immediatly? + The right semantics should obviously be the first one *) + (* TODO support also chroot to 'root', not only chdir *) (* curried request *) let start @@ -369,7 +316,9 @@ let start let (path, parameters) = safe_parse_request inchan outchan in callback path parameters outchan; flush outchan - with Again -> () + with + | Unauthorized realm -> respond_unauthorized ~realm outchan + | Again -> () in try (server_of_mode mode) ~sockaddr ~timeout daemon_callback @@ -387,7 +336,9 @@ let start' let req = safe_parse_request' inchan outchan in callback req outchan; flush outchan - with Again -> () + with + | Unauthorized realm -> respond_unauthorized ~realm outchan + | Again -> () in try (server_of_mode mode) ~sockaddr ~timeout daemon_callback @@ -397,7 +348,7 @@ module Trivial = struct let callback path _ outchan = if not (Pcre.pmatch ~rex:(Pcre.regexp "^/") path) then - respond_error ~code:400 outchan + respond_error ~code:(`Code 400) outchan else respond_file ~fname:(Http_misc.strip_heading_slash path) outchan let start ?(addr = default_addr) ?(port = default_port) () =