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

Get client IP when using TLS/SSH connections #277

Merged
merged 3 commits into from
Aug 17, 2019
Merged

Get client IP when using TLS/SSH connections #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
59c2d20
fix client ip issue
victorgomes Nov 1, 2018
0e6f229
fix client ip issue
victorgomes Nov 1, 2018
aeca8a1
Merge branch 'master' of github.com:victorgomes/ocaml-conduit
victorgomes Nov 1, 2018
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
6 changes: 4 additions & 2 deletions lwt-unix/conduit_lwt_tls_dummy.mli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ module Server : sig
-> ?stop:(unit Lwt.t)
-> ?timeout:int
-> Lwt_unix.sockaddr
-> (Lwt_unix.file_descr
-> (Lwt_unix.sockaddr
-> Lwt_unix.file_descr
-> Lwt_io.input_channel
-> Lwt_io.output_channel
-> unit Lwt.t)
Expand All @@ -47,7 +48,8 @@ module Server : sig
-> ?timeout:int
-> 'config
-> Lwt_unix.sockaddr
-> (Lwt_unix.file_descr
-> (Lwt_unix.sockaddr
-> Lwt_unix.file_descr
-> Lwt_io.input_channel
-> Lwt_io.output_channel
-> unit Lwt.t)
Expand Down
4 changes: 2 additions & 2 deletions lwt-unix/conduit_lwt_tls_real.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,14 @@ module Server = struct
let init' ?backlog ?stop ?timeout tls sa callback =
sa
|> Conduit_lwt_server.listen ?backlog
>>= Conduit_lwt_server.init ?stop (fun (fd, _) ->
>>= Conduit_lwt_server.init ?stop (fun (fd, addr) ->
Lwt.try_bind
(fun () -> Tls_lwt.Unix.server_of_fd tls fd)
(fun t ->
let (ic, oc) = Tls_lwt.of_t t in
Lwt.return (fd, ic, oc))
(fun exn -> Lwt_unix.close fd >>= fun () -> Lwt.fail exn)
>>= Conduit_lwt_server.process_accept ?timeout callback)
>>= Conduit_lwt_server.process_accept ?timeout (callback addr))

let init ?backlog ~certfile ~keyfile ?stop ?timeout sa callback =
X509_lwt.private_of_pems ~cert:certfile ~priv_key:keyfile
Expand Down
6 changes: 4 additions & 2 deletions lwt-unix/conduit_lwt_tls_real.mli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ module Server : sig
-> ?stop:(unit Lwt.t)
-> ?timeout:int
-> Lwt_unix.sockaddr
-> (Lwt_unix.file_descr
-> ( Lwt_unix.sockaddr
-> Lwt_unix.file_descr
-> Lwt_io.input_channel
-> Lwt_io.output_channel
-> unit Lwt.t)
Expand All @@ -47,7 +48,8 @@ module Server : sig
-> ?timeout:int
-> Tls.Config.server
-> Lwt_unix.sockaddr
-> (Lwt_unix.file_descr
-> (Lwt_unix.sockaddr
-> Lwt_unix.file_descr
-> Lwt_io.input_channel
-> Lwt_io.output_channel
-> unit Lwt.t)
Expand Down
8 changes: 4 additions & 4 deletions lwt-unix/conduit_lwt_unix.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,26 +252,26 @@ let sockaddr_on_tcp_port ctx port =

let serve_with_openssl ?timeout ?stop ~ctx ~certfile ~keyfile
~pass ~port callback =
let sockaddr, ip = sockaddr_on_tcp_port ctx port in
let sockaddr, _ = sockaddr_on_tcp_port ctx port in
let password =
match pass with
| `No_password -> None
| `Password fn -> Some fn
in
Conduit_lwt_unix_ssl.Server.init
?password ~certfile ~keyfile ?timeout ?stop sockaddr
(fun fd ic oc -> callback (TCP {fd;ip;port}) ic oc)
(fun addr fd ic oc -> callback (flow_of_fd fd addr) ic oc)

let serve_with_tls_native ?timeout ?stop ~ctx ~certfile ~keyfile
~pass ~port callback =
let sockaddr, ip = sockaddr_on_tcp_port ctx port in
let sockaddr, _ = sockaddr_on_tcp_port ctx port in
(match pass with
| `No_password -> Lwt.return ()
| `Password _ -> Lwt.fail_with "OCaml-TLS cannot handle encrypted pem files"
) >>= fun () ->
Conduit_lwt_tls.Server.init
~certfile ~keyfile ?timeout ?stop sockaddr
(fun fd ic oc -> callback (TCP {fd;ip;port}) ic oc)
(fun addr fd ic oc -> callback (flow_of_fd fd addr) ic oc)

let serve_with_default_tls ?timeout ?stop ~ctx ~certfile ~keyfile
~pass ~port callback =
Expand Down
3 changes: 2 additions & 1 deletion lwt-unix/conduit_lwt_unix_ssl_dummy.mli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ module Server : sig
-> ?stop:(unit Lwt.t)
-> ?timeout:int
-> Lwt_unix.sockaddr
-> (Lwt_unix.file_descr
-> (Lwt_unix.sockaddr
-> Lwt_unix.file_descr
-> Lwt_io.input_channel
-> Lwt_io.output_channel
-> unit Lwt.t)
Expand Down
4 changes: 2 additions & 2 deletions lwt-unix/conduit_lwt_unix_ssl_real.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,11 @@ module Server = struct
?timeout sa cb =
sa
|> listen ~ctx ?backlog ?password ~certfile ~keyfile
>>= Conduit_lwt_server.init ?stop (fun (fd, _) ->
>>= Conduit_lwt_server.init ?stop (fun (fd, addr) ->
Lwt.try_bind (fun () -> Lwt_ssl.ssl_accept fd ctx)
(fun sock -> Lwt.return (chans_of_fd sock))
(fun exn -> Lwt_unix.close fd >>= fun () -> Lwt.fail exn)
>>= Conduit_lwt_server.process_accept ?timeout cb)
>>= Conduit_lwt_server.process_accept ?timeout (cb addr))

end

Expand Down
3 changes: 2 additions & 1 deletion lwt-unix/conduit_lwt_unix_ssl_real.mli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ module Server : sig
-> ?stop:(unit Lwt.t)
-> ?timeout:int
-> Lwt_unix.sockaddr
-> (Lwt_unix.file_descr
-> (Lwt_unix.sockaddr
-> Lwt_unix.file_descr
-> Lwt_io.input_channel
-> Lwt_io.output_channel
-> unit Lwt.t)
Expand Down