commit 9a1188e33fe7f3226efae5437c7798dceffffb79
author Marc Kupietz <kupietz@ids-mannheim.de> Thu May 05 23:26:14 2022 +0200
committer Marc Kupietz <kupietz@ids-mannheim.de> Sat May 14 15:56:38 2022 +0200
tree 6183d4e1001e5eb958da7f50b3209e49c74fe1b3
parent 75e78286b497fd9e2d892863aa658d1d1479523d

LdapAuth3: factor out configuration class

including the renaming of some configuration properties

Change-Id: I0268c88a0bb7a3255debf045beab3faa71e9dce2

full/src/test/resources/test-ldap.conf

diff --git a/full/src/test/resources/test-ldap.conf b/full/src/test/resources/test-ldap.conf
index aa27f14..eb97168 100644
--- a/full/src/test/resources/test-ldap.conf
+++ b/full/src/test/resources/test-ldap.conf
@@ -1,6 +1,6 @@
-ldapHost=localhost
-ldapPort=3268
-ldapBase=dc=example,dc=com
+host=localhost
+port=3268
+searchBase=dc=example,dc=com
 sLoginDN=cn=admin,dc=example,dc=com
 pwd=adminpassword
-ldapFilter=(&(|(&(|(uid=${username})(mail=${username}))(userPassword=${password}))(&(idsC2Profile=${username})(idsC2Password=${password})))(&(idsC2=TRUE)(|(idsStatus=1)(|(idsStatus=0)(!(idsStatus=*))))))
+searchFilter=(&(|(&(|(uid=${login})(mail=${login}))(userPassword=${password}))(&(idsC2Profile=${login})(idsC2Password=${password})))(&(idsC2=TRUE)(|(idsStatus=1)(|(idsStatus=0)(!(idsStatus=*))))))

full/src/test/resources/test-ldaps-with-truststore.conf

diff --git a/full/src/test/resources/test-ldaps-with-truststore.conf b/full/src/test/resources/test-ldaps-with-truststore.conf
index d785301..0e58b65 100644
--- a/full/src/test/resources/test-ldaps-with-truststore.conf
+++ b/full/src/test/resources/test-ldaps-with-truststore.conf
@@ -1,8 +1,8 @@
-ldapHost=localhost
-ldapPort=3269
-ldapS=true
+host=localhost
+port=3269
+useSSL=true
 trustStore=src/test/resources/truststore.jks
-ldapBase=dc=example,dc=com
+searchBase=dc=example,dc=com
 sLoginDN=cn=admin,dc=example,dc=com
 pwd=adminpassword
-ldapFilter=(&(|(&(|(uid=${username})(mail=${username}))(userPassword=${password}))(&(idsC2Profile=${username})(idsC2Password=${password})))(&(idsC2=TRUE)(|(idsStatus=1)(|(idsStatus=0)(!(idsStatus=*))))))
+searchFilter=(&(|(&(|(uid=${login})(mail=${login}))(userPassword=${password}))(&(idsC2Profile=${login})(idsC2Password=${password})))(&(idsC2=TRUE)(|(idsStatus=1)(|(idsStatus=0)(!(idsStatus=*))))))

full/src/test/resources/test-ldaps.conf

diff --git a/full/src/test/resources/test-ldaps.conf b/full/src/test/resources/test-ldaps.conf
index 732076f..2189432 100644
--- a/full/src/test/resources/test-ldaps.conf
+++ b/full/src/test/resources/test-ldaps.conf
@@ -1,8 +1,8 @@
-ldapHost=localhost
-ldapPort=3269
-ldapS=true
+host=localhost
+port=3269
+useSSL=true
 trustStore=
-ldapBase=dc=example,dc=com
+searchBase=dc=example,dc=com
 sLoginDN=cn=admin,dc=example,dc=com
 pwd=adminpassword
-ldapFilter=(&(|(&(|(uid=${username})(mail=${username}))(userPassword=${password}))(&(idsC2Profile=${username})(idsC2Password=${password})))(&(idsC2=TRUE)(|(idsStatus=1)(|(idsStatus=0)(!(idsStatus=*))))))
+searchFilter=(&(|(&(|(uid=${login})(mail=${login}))(userPassword=${password}))(&(idsC2Profile=${login})(idsC2Password=${password})))(&(idsC2=TRUE)(|(idsStatus=1)(|(idsStatus=0)(!(idsStatus=*))))))