Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: was not possible to run the server on port 80/443 when using <user> in config file #221

Closed
wants to merge 1 commit into from
Closed

Fix: was not possible to run the server on port 80/443 when using <user> in config file #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ocsigenserver.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
opam-version: "2.0"
name: "ocsigenserver"
version: "5.0.1"
version: "5.0.2"
maintainer: "dev@ocsigen.org"
synopsis: "A full-featured and extensible Web server"
description: "Ocsigen Server implements most features of the HTTP protocol, and has a very powerful extension mechanism that makes it very easy to plug your own OCaml modules for generating pages. Many extensions are already implemented, like a reverse proxy, content compression, access control, authentication, etc."
Expand Down
32 changes: 20 additions & 12 deletions src/server/ocsigen_server.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,14 +358,21 @@ let start ?config () =
with e ->
Lwt_log.ign_error ~section ~exn:e "Cannot create the command pipe"));
(* I change the user for the process *)
(try
(if current_uid = 0
then
match user with None -> () | Some user -> Unix.initgroups user gid);
Unix.setgid gid; Unix.setuid uid
with (Unix.Unix_error _ | Failure _) as e ->
Lwt_log.ign_error ~section "Error: Wrong user or group";
raise e);
Lwt.async (fun () ->
Lwt_unix.sleep 2. >>= fun () ->
(*HACK! This is to wait for the server to be initialized by cohttp.
How to do that in a cleaner way? *)
(try
(if current_uid = 0
then
match user with
| None -> ()
| Some user -> Unix.initgroups user gid);
Unix.setgid gid; Unix.setuid uid
with (Unix.Unix_error _ | Failure _) as e ->
Lwt_log.ign_error ~section "Error: Wrong user or group";
raise e);
Lwt.return ());
let minthreads = Ocsigen_config.get_minthreads ()
and maxthreads = Ocsigen_config.get_maxthreads () in
if minthreads > maxthreads
Expand Down Expand Up @@ -445,10 +452,11 @@ let start ?config () =
Ocsigen_cohttp.service ~address ~port
~connector:extensions_connector ())
connection
@ (List.map (fun (address, port, (crt, key)) ->
Ocsigen_cohttp.service
~ssl:(crt, key, Some (ask_for_passwd [address, port]))
~address ~port ~connector:extensions_connector ()))
@ List.map
(fun (address, port, (crt, key)) ->
Ocsigen_cohttp.service
~ssl:(crt, key, Some (ask_for_passwd [address, port]))
~address ~port ~connector:extensions_connector ())
ssl_connection)
(*
Ocsigen_messages.warning "Ocsigen has been launched (initialisations ok)";
Expand Down