You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2016/11/02 05:16:21 UTC
svn commit: r1767608 - in /openmeetings/application:
branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/
branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/
trunk/openmeetings-core/src/main/ja...
Author: solomax
Date: Wed Nov 2 05:16:21 2016
New Revision: 1767608
URL: http://svn.apache.org/viewvc?rev=1767608&view=rev
Log:
[OPENMEETINGS-1492] add-domain LDAP options should work as expected
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
Modified: openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java?rev=1767608&r1=1767607&r2=1767608&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java Wed Nov 2 05:16:21 2016
@@ -310,11 +310,12 @@ public class LdapLoginManagement {
Properties config = new Properties();
LdapOptions options = null;
Long domainId = null;
+ LdapConfig ldapCfg = null;
public LdapWorker(Long domainId) throws Exception {
this.domainId = domainId;
- LdapConfig ldapConfig = ldapConfigDao.get(domainId);
- try (InputStream is = new FileInputStream(new File(OmFileHelper.getConfDir(), ldapConfig.getConfigFileName()));
+ ldapCfg = ldapConfigDao.get(domainId);
+ try (InputStream is = new FileInputStream(new File(OmFileHelper.getConfDir(), ldapCfg.getConfigFileName()));
Reader r = new InputStreamReader(is, UTF_8))
{
config.load(r);
@@ -344,7 +345,11 @@ public class LdapLoginManagement {
if (g != null) {
u.getGroupUsers().add(new GroupUser(g, u));
}
- u.setLogin(getLogin(config, entry));
+ String login = getLogin(config, entry);
+ if (ldapCfg.getAddDomainToUserName()) {
+ login = login + "@" + ldapCfg.getDomain();
+ }
+ u.setLogin(login);
u.setShowContactDataToContacts(true);
u.setAddress(new Address());
}
Modified: openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java?rev=1767608&r1=1767607&r2=1767608&view=diff
==============================================================================
--- openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java (original)
+++ openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java Wed Nov 2 05:16:21 2016
@@ -310,11 +310,12 @@ public class LdapLoginManagement {
Properties config = new Properties();
LdapOptions options = null;
Long domainId = null;
+ LdapConfig ldapCfg = null;
public LdapWorker(Long domainId) throws Exception {
this.domainId = domainId;
- LdapConfig ldapConfig = ldapConfigDao.get(domainId);
- try (InputStream is = new FileInputStream(new File(OmFileHelper.getConfDir(), ldapConfig.getConfigFileName()));
+ ldapCfg = ldapConfigDao.get(domainId);
+ try (InputStream is = new FileInputStream(new File(OmFileHelper.getConfDir(), ldapCfg.getConfigFileName()));
Reader r = new InputStreamReader(is, UTF_8))
{
config.load(r);
@@ -344,7 +345,11 @@ public class LdapLoginManagement {
if (g != null) {
u.getGroupUsers().add(new GroupUser(g, u));
}
- u.setLogin(getLogin(config, entry));
+ String login = getLogin(config, entry);
+ if (ldapCfg.getAddDomainToUserName()) {
+ login = login + "@" + ldapCfg.getDomain();
+ }
+ u.setLogin(login);
u.setShowContactDataToContacts(true);
u.setAddress(new Address());
}
Modified: openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java?rev=1767608&r1=1767607&r2=1767608&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java (original)
+++ openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/ldap/LdapLoginManagement.java Wed Nov 2 05:16:21 2016
@@ -310,11 +310,12 @@ public class LdapLoginManagement {
Properties config = new Properties();
LdapOptions options = null;
Long domainId = null;
+ LdapConfig ldapCfg = null;
public LdapWorker(Long domainId) throws Exception {
this.domainId = domainId;
- LdapConfig ldapConfig = ldapConfigDao.get(domainId);
- try (InputStream is = new FileInputStream(new File(OmFileHelper.getConfDir(), ldapConfig.getConfigFileName()));
+ ldapCfg = ldapConfigDao.get(domainId);
+ try (InputStream is = new FileInputStream(new File(OmFileHelper.getConfDir(), ldapCfg.getConfigFileName()));
Reader r = new InputStreamReader(is, UTF_8))
{
config.load(r);
@@ -344,7 +345,11 @@ public class LdapLoginManagement {
if (g != null) {
u.getGroupUsers().add(new GroupUser(g, u));
}
- u.setLogin(getLogin(config, entry));
+ String login = getLogin(config, entry);
+ if (ldapCfg.getAddDomainToUserName()) {
+ login = login + "@" + ldapCfg.getDomain();
+ }
+ u.setLogin(login);
u.setShowContactDataToContacts(true);
u.setAddress(new Address());
}