You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2020/05/29 11:38:18 UTC
svn commit: r1878269 - in /manifoldcf/trunk: CHANGES.txt
connectors/ldap/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/ldap/LDAPAuthority.java
Author: kwright
Date: Fri May 29 11:38:18 2020
New Revision: 1878269
URL: http://svn.apache.org/viewvc?rev=1878269&view=rev
Log:
CONNECTORS-1644: Fix the substitution for LDAP Authority. Thanks to Uwe Wolfinger for this fix.
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/connectors/ldap/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/ldap/LDAPAuthority.java
Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1878269&r1=1878268&r2=1878269&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Fri May 29 11:38:18 2020
@@ -3,6 +3,8 @@ $Id$
======================= 2.17-dev =====================
+CONNECTORS-1644: Fix LDAPAuthority escaping to use replace instead of replaceAll
+(Uwe Wolfinger)
======================= Release 2.16 =====================
Modified: manifoldcf/trunk/connectors/ldap/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/ldap/LDAPAuthority.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/ldap/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/ldap/LDAPAuthority.java?rev=1878269&r1=1878268&r2=1878269&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/ldap/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/ldap/LDAPAuthority.java (original)
+++ manifoldcf/trunk/connectors/ldap/connector/src/main/java/org/apache/manifoldcf/authorities/authorities/ldap/LDAPAuthority.java Fri May 29 11:38:18 2020
@@ -473,7 +473,7 @@ public class LDAPAuthority extends org.a
if (groupSearch != null && !groupSearch.isEmpty()) {
//specify the LDAP search filter
- String searchFilter = groupSearch.replaceAll("\\{0\\}", escapeLDAPSearchFilter(groupMemberDN ? usrRecord.getNameInNamespace() : usrName));
+ String searchFilter = groupSearch.replace("{0}", escapeLDAPSearchFilter(groupMemberDN ? usrRecord.getNameInNamespace() : usrName));
SearchControls searchCtls = new SearchControls();
searchCtls.setSearchScope(SearchControls.SUBTREE_SCOPE);
String returnedAtts[] = {groupNameAttr};