mart-w/kanidm
1
0
Fork 0
mirror of https://github.com/kanidm/kanidm.git synced 2025-02-23 12:37:00 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

simpler ip logging (#454)

Browse source
This commit is contained in:
James Hodgkinson 2021-05-23 10:15:21 +10:00 committed by GitHub
parent ca446ddca5
commit 6ef4ad616a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
kanidmd/src/lib/core/ldaps.rs
View file

@ -98,7 +98,9 @@ async fn tls_acceptor(
) { ) {
loop { loop {
match listener.accept().await { match listener.accept().await {
Ok((tcpstream, paddr)) => { Ok((tcpstream, client_socket_addr)) => {
// Start the event
info!("LDAPS Connection from {:?}", &client_socket_addr.ip());
// From the parms we need to create an SslContext. // From the parms we need to create an SslContext.
let mut tlsstream = match Ssl::new(tls_parms.context()) let mut tlsstream = match Ssl::new(tls_parms.context())
.and_then(|tls_obj| SslStream::new(tls_obj, tcpstream)) .and_then(|tls_obj| SslStream::new(tls_obj, tcpstream))
@ -116,7 +118,7 @@ async fn tls_acceptor(
let (r, w) = tokio::io::split(tlsstream); let (r, w) = tokio::io::split(tlsstream);
let r = FramedRead::new(r, LdapCodec); let r = FramedRead::new(r, LdapCodec);
let w = FramedWrite::new(w, LdapCodec); let w = FramedWrite::new(w, LdapCodec);
tokio::spawn(client_process(r, w, paddr, qe_r_ref)); tokio::spawn(client_process(r, w, client_socket_addr, qe_r_ref));
} }
Err(e) => { Err(e) => {
error!("acceptor error, continuing -> {:?}", e); error!("acceptor error, continuing -> {:?}", e);
@ -128,12 +130,14 @@ async fn tls_acceptor(
async fn acceptor(listener: TcpListener, qe_r_ref: &'static QueryServerReadV1) { async fn acceptor(listener: TcpListener, qe_r_ref: &'static QueryServerReadV1) {
loop { loop {
match listener.accept().await { match listener.accept().await {
Ok((tcpstream, paddr)) => { Ok((tcpstream, client_socket_addr)) => {
// Start the event
info!("LDAP Connection from {:?}", &client_socket_addr.ip());
let (r, w) = tokio::io::split(tcpstream); let (r, w) = tokio::io::split(tcpstream);
let r = FramedRead::new(r, LdapCodec); let r = FramedRead::new(r, LdapCodec);
let w = FramedWrite::new(w, LdapCodec); let w = FramedWrite::new(w, LdapCodec);
// Let it rip. // Let it rip.
tokio::spawn(client_process(r, w, paddr, qe_r_ref)); tokio::spawn(client_process(r, w, client_socket_addr, qe_r_ref));
} }
Err(e) => { Err(e) => {
error!("acceptor error, continuing -> {:?}", e); error!("acceptor error, continuing -> {:?}", e);