From 28b5cc0e31ed85b9fd7c732397d205d060c9a29d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20OUDOT?= <clement@oodo.net>
Date: Wed, 18 Sep 2019 21:19:53 +0200
Subject: [PATCH] Force lower case in initial value of _whatToTrace macro
 (#1869)

---
 _example/conf/lmConf-1.json                                | 2 +-
 lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Zero.pm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/_example/conf/lmConf-1.json b/_example/conf/lmConf-1.json
index 01ceae434..94a18cd05 100644
--- a/_example/conf/lmConf-1.json
+++ b/_example/conf/lmConf-1.json
@@ -142,7 +142,7 @@
    "loginHistoryEnabled" : 1,
    "macros" : {
       "UA" : "$ENV{HTTP_USER_AGENT}",
-      "_whatToTrace" : "$_auth eq 'SAML' ? \"$_user\\@$_idpConfKey\" : $_auth eq 'OpenIDConnect' ? \"$_user\\@$_oidcConnectedRP\" : \"$_user\""
+      "_whatToTrace" : "$_auth eq 'SAML' ? lc($_user.'@'.$_idpConfKey) : $_auth eq 'OpenIDConnect' ? lc($_user.'@'.$_oidcConnectedRP) : lc($_user)"
    },
    "mailUrl" : "http://auth.__DNSDOMAIN__/resetpwd",
    "notification" : 1,
diff --git a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Zero.pm b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Zero.pm
index 36d967fb8..84f76537d 100644
--- a/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Zero.pm
+++ b/lemonldap-ng-manager/lib/Lemonldap/NG/Manager/Conf/Zero.pm
@@ -108,7 +108,7 @@ sub zeroConf {
         },
         'macros' => {
             '_whatToTrace' =>
-'$_auth eq \'SAML\' ? "$_user\\@$_idpConfKey" : $_auth eq \'OpenIDConnect\' ? "$_user\\@$_oidcConnectedRP" : "$_user"',
+'$_auth eq \'SAML\' ? lc($_user.\'@\'.$_idpConfKey) : $_auth eq \'OpenIDConnect\' ? lc($_user.\'@\'.$_oidcConnectedRP) : lc($_user)',
             'UA' => '$ENV{HTTP_USER_AGENT}'
         },
         'notificationStorageOptions' => {