From 2816bed66e18dbb36feebeba3e4333d78b3b0fbf Mon Sep 17 00:00:00 2001
From: Baptiste Pecatte <ow2@bp.patathouse.fr>
Date: Fri, 26 Jun 2020 21:44:06 +0200
Subject: [PATCH] Add host to logs for use with fail2ban

---
 lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/LDAP.pm     | 3 ++-
 lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/Net/LDAP.pm | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/LDAP.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/LDAP.pm
index da096a30f..02e706b3a 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/LDAP.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/LDAP.pm
@@ -144,7 +144,8 @@ sub getUser {
         return PE_BADCREDENTIALS;
     }
     unless ( $req->data->{ldapentry} = $mesg->entry(0) ) {
-        $self->userLogger->warn("$req->{user} was not found in LDAP directory");
+        my $ipAddr = $req->address;
+        $self->userLogger->warn("$req->{user} was not found in LDAP directory ($ipAddr)");
         eval { $self->p->_authentication->setSecurity($req) };
         return PE_BADCREDENTIALS;
     }
diff --git a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/Net/LDAP.pm b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/Net/LDAP.pm
index 9843999cd..16b8bb679 100644
--- a/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/Net/LDAP.pm
+++ b/lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Lib/Net/LDAP.pm
@@ -180,7 +180,8 @@ sub userBind {
         # Return direct unless control resonse
         unless ( defined $resp ) {
             if ( $mesg->code == 49 ) {
-                $self->{portal}->userLogger->warn("Bad password");
+                my $ipAddr = $req->address;
+                $self->{portal}->userLogger->warn("Bad password for $req->{user} ($ipAddr)");
                 return PE_BADCREDENTIALS;
             }
             elsif ( $mesg->code == 0 ) {
@@ -262,7 +263,8 @@ sub userBind {
             $req->data->{ldapError} = $mesg->error;
         }
     }
-    $self->{portal}->userLogger->warn("Bad password for $req->{user}");
+    my $ipAddr = $req->address;
+    $self->{portal}->userLogger->warn("Bad password for $req->{user} ($ipAddr)");
     return PE_BADCREDENTIALS;
 }