Skip to content

Commit 19a934f

Browse files
committed
lldap support
1 parent 8ad6e80 commit 19a934f

File tree

3 files changed

+21
-1
lines changed

3 files changed

+21
-1
lines changed

server/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@
198198
<dependency>
199199
<groupId>com.github.ldapchai</groupId>
200200
<artifactId>ldapchai</artifactId>
201-
<version>0.8.6</version>
201+
<version>0.8.7</version>
202202
</dependency>
203203
<dependency>
204204
<groupId>org.apache.directory.api</groupId>

server/src/main/java/password/pwm/config/PwmSettingTemplate.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ public enum PwmSettingTemplate
3434
DEFAULT( Type.LDAP_VENDOR ),
3535
NOVL_IDM( Type.LDAP_VENDOR ),
3636
OPEN_LDAP( Type.LDAP_VENDOR ),
37+
LLDAP( Type.LDAP_VENDOR ),
3738

3839
LOCALDB( Type.STORAGE ),
3940
DB( Type.STORAGE ),

server/src/main/resources/password/pwm/config/PwmSetting.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
</default>
3232
<options>
3333
<option value="AD">Microsoft Active Directory</option>
34+
<option value="LLDAP">LLDAP</option>
3435
<option value="ORACLE_DS">Oracle Directory Server</option>
3536
<option value="NOVL">NetIQ eDirectory</option>
3637
<option value="NOVL_IDM">NetIQ IDM / OAuth Integration</option>
@@ -564,6 +565,9 @@
564565
<default>
565566
<value><![CDATA[(&(objectClass=person)(cn=%USERNAME%))]]></value>
566567
</default>
568+
<default template="LLDAP">
569+
<value><![CDATA[(&(objectClass=person)(uid=%USERNAME%))]]></value>
570+
</default>
567571
<default template="AD">
568572
<value><![CDATA[(&(objectClass=person)(|(sAMAccountName=%USERNAME%)(cn=%USERNAME%)(mail=%USERNAME%)))]]></value>
569573
</default>
@@ -576,6 +580,8 @@
576580
<default>
577581
<value><![CDATA[pwmUser]]></value>
578582
</default>
583+
<default template="LLDAP">
584+
</default>
579585
<default template="DB">
580586
<value><![CDATA[]]></value>
581587
</default>
@@ -589,6 +595,9 @@
589595
<default template="ORACLE_DS">
590596
<value/>
591597
</default>
598+
<default template="LLDAP">
599+
<value/>
600+
</default>
592601
<default template="LDAP">
593602
<value><![CDATA[pwmLastPwdUpdate]]></value>
594603
</default>
@@ -639,13 +648,19 @@
639648
<default template="OPEN_LDAP">
640649
<value><![CDATA[entryuuid]]></value>
641650
</default>
651+
<default template="LLDAP">
652+
<value>entryuuid</value>
653+
</default>
642654
</setting>
643655
<setting hidden="false" key="ldap.namingAttribute" level="1" required="true">
644656
<ldapPermission actor="proxy" access="read"/>
645657
<regex>^[a-zA-Z][a-zA-Z0-9-]*$</regex>
646658
<default>
647659
<value><![CDATA[cn]]></value>
648660
</default>
661+
<default template="LLDAP">
662+
<value>uid</value>
663+
</default>
649664
<default template="ORACLE_DS">
650665
<value><![CDATA[uid]]></value>
651666
</default>
@@ -702,6 +717,9 @@
702717
<default>
703718
<value>cn</value>
704719
</default>
720+
<default template="LLDAP">
721+
<value>uid</value>
722+
</default>
705723
<default template="AD">
706724
<value><![CDATA[sAMAccountName]]></value>
707725
</default>
@@ -2044,6 +2062,7 @@
20442062
<setting hidden="false" key="events.ldap.attribute" level="2">
20452063
<ldapPermission actor="proxy" access="write"/>
20462064
<regex>^[a-zA-Z][a-zA-Z0-9-]*$</regex>
2065+
<default template="LLDAP"/>
20472066
<default>
20482067
<value><![CDATA[pwmEventLog]]></value>
20492068
</default>

0 commit comments

Comments
 (0)