From db835032b6e860a2c7a84bbc9ca3ddb74f270453 Mon Sep 17 00:00:00 2001
From: Sebastien Dupont <dupont.sebastien@gmail.com>
Date: Sat, 22 Apr 2023 19:37:21 +0200
Subject: [PATCH] Fix login-identity-providers-ldap hardcoded values (#260)

* Fix login-identity-providers-ldap hardcoded values

The config file `login-identity-providers-ldap.xml`  has hard-coded values, see #220

https://nifi.apache.org/docs/nifi-docs/html/administration-guide.html#:~:text=DC%3Dcom).-,User%20Search%20Filter,-Filter%20for%20searching
---
 configs/login-identity-providers-ldap.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/configs/login-identity-providers-ldap.xml b/configs/login-identity-providers-ldap.xml
index 204d08a5..d34e5f7a 100644
--- a/configs/login-identity-providers-ldap.xml
+++ b/configs/login-identity-providers-ldap.xml
@@ -65,7 +65,7 @@
     <provider>
         <identifier>ldap-provider</identifier>
         <class>org.apache.nifi.ldap.LdapProvider</class>
-        <property name="Authentication Strategy">SIMPLE</property>
+        <property name="Authentication Strategy">{{.Values.auth.ldap.authStrategy}}</property>
         <property name="Manager DN">{{.Values.auth.ldap.admin}}</property>
         <property name="Manager Password">{{.Values.auth.ldap.pass}}</property>
         <property name="TLS - Keystore">/opt/nifi/nifi-current/conf/{{.Release.Name}}-nifi-0.{{.Release.Name}}-nifi-headless.{{.Release.Namespace}}.svc.cluster.local/keystore.jks</property>
@@ -83,8 +83,8 @@
         <property name="Read Timeout">10 secs</property>
         <property name="Url">{{.Values.auth.ldap.host}}</property>
         <property name="User Search Base">{{.Values.auth.ldap.searchBase}}</property>
-        <property name="User Search Filter">(cn={0})</property>
+        <property name="User Search Filter">({{.Values.auth.ldap.userIdentityAttribute}}={0})</property>
         <property name="Identity Strategy">{{.Values.auth.ldap.IdentityStrategy}}</property>
-        <property name="Authentication Expiration">12 hours</property>
+        <property name="Authentication Expiration">{{.Values.auth.ldap.authExpiration}}</property>
     </provider>
-</loginIdentityProviders>
\ No newline at end of file
+</loginIdentityProviders>