Author: solomax
Date: Wed Jul 2 14:16:53 2014
New Revision: 1607375
URL: http://svn.apache.org/r1607375
Log:
[OPENMEETINGS-1033] parameter for search scope is added
Modified:
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/ldap/LdapLoginManagement.java
openmeetings/branches/3.0.x/src/main/webapp/conf/om_ldap.cfg
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/conf/om_ldap.cfg
Modified:
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/ldap/LdapLoginManagement.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/ldap/LdapLoginManagement.java?rev=1607375&r1=1607374&r2=1607375&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/ldap/LdapLoginManagement.java
(original)
+++
openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/ldap/LdapLoginManagement.java
Wed Jul 2 14:16:53 2014
@@ -79,6 +79,7 @@ public class LdapLoginManagement {
private static final String CONFIGKEY_LDAP_TIMEZONE_NAME =
"ldap_user_timezone";
private static final String CONFIGKEY_LDAP_SEARCH_BASE =
"ldap_search_base";
private static final String CONFIGKEY_LDAP_SEARCH_QUERY =
"ldap_search_query";
+ private static final String CONFIGKEY_LDAP_SEARCH_SCOPE =
"ldap_search_scope";
private static final String CONFIGKEY_LDAP_USERDN_FORMAT =
"ldap_userdn_format";
private static final String CONFIGKEY_LDAP_USE_ADMIN_4ATTRS =
"ldap_use_admin_to_get_attrs";
@@ -234,7 +235,8 @@ public class LdapLoginManagement {
bindAdmin(conn, ldap_admin_dn,
ldap_admin_passwd);
Dn baseDn = new
Dn(config.getProperty(CONFIGKEY_LDAP_SEARCH_BASE, ""));
String searchQ =
String.format(config.getProperty(CONFIGKEY_LDAP_SEARCH_QUERY, "%s"), user);
- EntryCursor cursor =
conn.search(baseDn, searchQ, SearchScope.ONELEVEL, "*");
+ SearchScope scope =
SearchScope.valueOf(config.getProperty(CONFIGKEY_LDAP_SEARCH_SCOPE,
SearchScope.ONELEVEL.name()));
+ EntryCursor cursor =
conn.search(baseDn, searchQ, scope, "*");
while (cursor.next()) {
if (userDn != null) {
log.error("more than 1
user found in LDAP");
Modified: openmeetings/branches/3.0.x/src/main/webapp/conf/om_ldap.cfg
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/conf/om_ldap.cfg?rev=1607375&r1=1607374&r2=1607375&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/conf/om_ldap.cfg (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/conf/om_ldap.cfg Wed Jul 2
14:16:53 2014
@@ -43,6 +43,9 @@ ldap_search_base=OU=Company,DC=medint,DC
# Fieldnames (can differ between Ldap servers)
ldap_search_query=(uid=%s)
+# the scope of the search might be: OBJECT, ONELEVEL, SUBTREE
+ldap_search_scope=ONELEVEL
+
# Ldap auth type(NONE, SEARCHANDBIND, SIMPLEBIND)
# When using SIMPLEBIND a simple bind is performed on the LDAP server to
check user authentication
# When using NONE, the Ldap server is not used for authentication
Modified:
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java?rev=1607375&r1=1607374&r2=1607375&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
Wed Jul 2 14:16:53 2014
@@ -79,6 +79,7 @@ public class LdapLoginManagement {
private static final String CONFIGKEY_LDAP_TIMEZONE_NAME =
"ldap_user_timezone";
private static final String CONFIGKEY_LDAP_SEARCH_BASE =
"ldap_search_base";
private static final String CONFIGKEY_LDAP_SEARCH_QUERY =
"ldap_search_query";
+ private static final String CONFIGKEY_LDAP_SEARCH_SCOPE =
"ldap_search_scope";
private static final String CONFIGKEY_LDAP_USERDN_FORMAT =
"ldap_userdn_format";
private static final String CONFIGKEY_LDAP_USE_ADMIN_4ATTRS =
"ldap_use_admin_to_get_attrs";
@@ -234,7 +235,8 @@ public class LdapLoginManagement {
bindAdmin(conn, ldap_admin_dn,
ldap_admin_passwd);
Dn baseDn = new
Dn(config.getProperty(CONFIGKEY_LDAP_SEARCH_BASE, ""));
String searchQ =
String.format(config.getProperty(CONFIGKEY_LDAP_SEARCH_QUERY, "%s"), user);
- EntryCursor cursor =
conn.search(baseDn, searchQ, SearchScope.ONELEVEL, "*");
+ SearchScope scope =
SearchScope.valueOf(config.getProperty(CONFIGKEY_LDAP_SEARCH_SCOPE,
SearchScope.ONELEVEL.name()));
+ EntryCursor cursor =
conn.search(baseDn, searchQ, scope, "*");
while (cursor.next()) {
if (userDn != null) {
log.error("more than 1
user found in LDAP");
Modified:
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/conf/om_ldap.cfg
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/conf/om_ldap.cfg?rev=1607375&r1=1607374&r2=1607375&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/conf/om_ldap.cfg
(original)
+++
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/conf/om_ldap.cfg
Wed Jul 2 14:16:53 2014
@@ -43,6 +43,9 @@ ldap_search_base=OU=Company,DC=medint,DC
# Fieldnames (can differ between Ldap servers)
ldap_search_query=(uid=%s)
+# the scope of the search might be: OBJECT, ONELEVEL, SUBTREE
+ldap_search_scope=ONELEVEL
+
# Ldap auth type(NONE, SEARCHANDBIND, SIMPLEBIND)
# When using SIMPLEBIND a simple bind is performed on the LDAP server to
check user authentication
# When using NONE, the Ldap server is not used for authentication
