X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2FDEVEL%2Focaml-http%2Fhttp_daemon.ml;h=caa51af13bf2c41e06485ebc0341f4e2d7dd25a0;hb=4cb4d286a1fdcb150c2848a9d21ac3486906c317;hp=d311e451f00ec2269430aebf87f7f5ece4cc490b;hpb=63410c324ca4e89c4fa9e5ca5b30e8a30f509ffd;p=helm.git diff --git a/helm/DEVEL/ocaml-http/http_daemon.ml b/helm/DEVEL/ocaml-http/http_daemon.ml index d311e451f..caa51af13 100644 --- a/helm/DEVEL/ocaml-http/http_daemon.ml +++ b/helm/DEVEL/ocaml-http/http_daemon.ml @@ -2,29 +2,29 @@ (* OCaml HTTP - do it yourself (fully OCaml) HTTP daemon - Copyright (C) <2002> Stefano Zacchiroli + Copyright (C) <2002-2005> 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 - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. + it under the terms of the GNU Library General Public License as + published by the Free Software Foundation, version 2. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + GNU Library General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + USA *) -open Printf;; +open Printf -open Http_common;; -open Http_types;; -open Http_constants;; -open Http_parser;; +open Http_common +open Http_types +open Http_constants +open Http_parser (** send raw data on outchan, flushing it afterwards *) let send_raw ~data outchan = @@ -130,8 +130,11 @@ let respond_forbidden ~url ?version outchan = (`Code 403) outchan let respond_unauthorized ?version ?(realm = server_string) outchan = + let body = + sprintf "401 - Unauthorized - Authentication failed for realm \"%s\"" realm + in respond ~headers:["WWW-Authenticate", sprintf "Basic realm=\"%s\"" realm] - ~code:(`Code 401) outchan + ~code:(`Code 401) ~body outchan let send_file ~src outchan = let buflen = 1024 in @@ -206,11 +209,9 @@ let respond_file ~fname ?(version = http_version) outchan = close_in file end with - | Unix.Unix_error (Unix.EACCES, s, _) when (s = fname) -> + | Unix.Unix_error (Unix.EACCES, _, _) + | Sys_error _ -> respond_forbidden ~url:fname ~version outchan - | Sys_error s when - (Pcre.pmatch ~rex:(Pcre.regexp (fname ^ ": Permission denied")) s) -> - respond_forbidden ~url:fname ~version outchan end let respond_with (res: Http_types.response) outchan = @@ -303,56 +304,103 @@ let server_of_mode = function callbacks keep on living until the end or are them all killed immediatly? The right semantics should obviously be the first one *) +let handle_manual_auth outchan f = + try + f () + with + | Unauthorized realm -> respond_unauthorized ~realm outchan + | Again -> () + +let handle_auth req spec outchan = + try + (match (spec.auth, req#authorization) with + | None, _ -> spec.callback req outchan (* no auth required *) + | Some (realm, `Basic (spec_username, spec_password)), + Some (`Basic (username, password)) + when (username = spec_username) && (password = spec_password) -> + (* auth ok *) + spec.callback req outchan + | Some (realm, _), _ -> raise (Unauthorized realm)) (* auth failure *) + with + | Unauthorized realm -> respond_unauthorized ~realm outchan + | Again -> () + (* TODO support also chroot to 'root', not only chdir *) + (* TODO deprecated: remove from future versions *) (* curried request *) let start ?(addr = default_addr) ?(port = default_port) - ?(timeout = Some default_timeout) ?(mode = default_mode) ?root callback + ?(timeout = default_timeout) ?(mode = default_mode) ?root callback = + Http_misc.warn + "Http_daemon.start is deprecated in favour of Http_daemon.main and will be removed in future versions of the library"; chdir_to_document_root root; let sockaddr = Http_misc.build_sockaddr (addr, port) in let daemon_callback inchan outchan = - try + handle_manual_auth outchan (fun () -> let (path, parameters) = safe_parse_request inchan outchan in callback path parameters outchan; - flush outchan - with - | Unauthorized realm -> respond_unauthorized ~realm outchan - | Again -> () + flush outchan); in try (server_of_mode mode) ~sockaddr ~timeout daemon_callback with Quit -> () (* OO request *) + (* TODO deprecated: remove from future versions *) let start' ?(addr = default_addr) ?(port = default_port) - ?(timeout = Some default_timeout) ?(mode = default_mode) ?root callback - = + ?(timeout = default_timeout) ?(mode = default_mode) ?root callback += + Http_misc.warn + "Http_daemon.start' is deprecated in favour of Http_daemon.main and will be removed in future versions of the library"; chdir_to_document_root root; let sockaddr = Http_misc.build_sockaddr (addr, port) in let daemon_callback inchan outchan = - try + handle_manual_auth outchan (fun () -> let req = safe_parse_request' inchan outchan in callback req outchan; - flush outchan - with - | Unauthorized realm -> respond_unauthorized ~realm outchan - | Again -> () + flush outchan) in try (server_of_mode mode) ~sockaddr ~timeout daemon_callback with Quit -> () +let main spec = + chdir_to_document_root spec.root_dir; + let sockaddr = Http_misc.build_sockaddr (spec.address, spec.port) in + let daemon_callback inchan outchan = + try + let req = safe_parse_request' inchan outchan in + handle_auth req spec outchan; + flush outchan + with exn -> + (match spec.exn_handler with + | Some f -> + debug_print "uncaught exception: executing handler"; + f exn outchan + | None -> + debug_print "uncaught exception but no handler given: re-raising"; + raise exn) + in + try + (server_of_mode spec.mode) ~sockaddr ~timeout:spec.timeout daemon_callback + with Quit -> () + module Trivial = struct - let callback path _ outchan = - if not (Pcre.pmatch ~rex:(Pcre.regexp "^/") path) then + let heading_slash_RE = Pcre.regexp "^/" + + let trivial_callback req outchan = + let path = req#path in + if not (Pcre.pmatch ~rex:heading_slash_RE path) then 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) () = - start ~addr ~port callback + + let callback = trivial_callback + + let main spec = main { spec with callback = trivial_callback } end (* @param inchan input channel connected to client @@ -412,3 +460,34 @@ class daemon ?(addr = "0.0.0.0") ?(port = 80) () = end +open Http_constants + +let default_spec = { + address = default_addr; + auth = default_auth; + callback = default_callback; + mode = default_mode; + port = default_port; + root_dir = default_root_dir; + exn_handler = default_exn_handler; + timeout = default_timeout; +} + +let daemon_spec + ?(address = default_addr) ?(auth = default_auth) + ?(callback = default_callback) ?(mode = default_mode) ?(port = default_port) + ?(root_dir = default_root_dir) ?(exn_handler = default_exn_handler) + ?(timeout = default_timeout) + () += + { default_spec with + address = address; + auth = auth; + callback = callback; + mode = mode; + port = port; + root_dir = root_dir; + exn_handler = exn_handler; + timeout = timeout; + } +