You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2020/01/20 15:02:47 UTC
[cloudstack] branch master updated (9b7acfd -> 5ff932e)
This is an automated email from the ASF dual-hosted git repository.
dahn pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
from 9b7acfd Update message when keys are NOT being injected (#3799)
add 5ff932e Ldap fixes (#3694)
No new revisions were added by this update.
Summary of changes:
.../org/apache/cloudstack/api/ApiConstants.java | 3 +
.../org/apache/cloudstack/query/QueryService.java | 2 +
plugins/user-authenticators/ldap/pom.xml | 113 ++++-
.../org/apache/cloudstack/api/LdapConstants.java | 4 +-
.../cloudstack/api/command/LdapListUsersCmd.java | 426 +++++++++++++++++-
.../cloudstack/api/response/LdapUserResponse.java | 90 +++-
.../apache/cloudstack/ldap/LdapAuthenticator.java | 102 +++--
.../org/apache/cloudstack/ldap/LdapManager.java | 3 +-
.../apache/cloudstack/ldap/LdapManagerImpl.java | 96 ++++-
.../cloudstack/ldap/LdapUserManagerFactory.java | 2 +-
.../cloudstack/ldap/OpenLdapUserManagerImpl.java | 75 +++-
.../ldap/dao/LdapConfigurationDaoImpl.java | 2 +-
.../api/command/LdapListUsersCmdTest.java | 466 ++++++++++++++++++++
.../apache/cloudstack/ldap/EmbeddedLdapServer.java | 326 ++++++++++++++
.../cloudstack/ldap/LdapAuthenticatorTest.java | 60 ++-
.../cloudstack/ldap/LdapConfigurationTest.java | 103 ++---
.../ldap/LdapDirectoryServerConnectionTest.java | 210 +++++++++
.../apache/cloudstack/ldap/LdapTestConfigTool.java | 48 +++
.../ldap/LdapUnboundidZapdotConnectionTest.java | 89 ++++
.../cloudstack/ldap/LdapUnitConnectionTest.java | 62 +++
.../ldap/LdapUserManagerFactoryTest.java | 73 ++++
.../ldap/src/test/resources/ldapunit.ldif | 151 +++++++
.../ldap/src/test/resources/log4j.xml | 50 +--
.../ldap/src/test/resources/minimal.ldif | 243 +++++++++++
.../resources/testContext.xml} | 11 +-
.../{cloudstack.org.ldif => unboundid.ldif} | 0
.../java/com/cloud/api/query/QueryManagerImpl.java | 92 ++--
test/integration/plugins/ldap/ldap_test_data.py | 189 ++++++++
test/integration/plugins/ldap/test_ldap.py | 476 +++++++++++++++++++++
tools/marvin/marvin/lib/base.py | 5 +-
ui/index.html | 1 +
ui/l10n/en.js | 2 +
ui/scripts/accountsWizard.js | 35 +-
ui/scripts/docs.js | 7 +-
ui/scripts/ui-custom/accountsWizard.js | 129 ++----
35 files changed, 3413 insertions(+), 333 deletions(-)
copy api/src/main/java/org/apache/cloudstack/api/Displayable.java => plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/LdapConstants.java (92%)
create mode 100644 plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/api/command/LdapListUsersCmdTest.java
create mode 100644 plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/EmbeddedLdapServer.java
create mode 100644 plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/LdapDirectoryServerConnectionTest.java
create mode 100644 plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/LdapTestConfigTool.java
create mode 100644 plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/LdapUnboundidZapdotConnectionTest.java
create mode 100644 plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/LdapUnitConnectionTest.java
create mode 100644 plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/LdapUserManagerFactoryTest.java
create mode 100644 plugins/user-authenticators/ldap/src/test/resources/ldapunit.ldif
copy utils/conf/log4j-vmops.xml => plugins/user-authenticators/ldap/src/test/resources/log4j.xml (63%)
mode change 100644 => 100755
create mode 100644 plugins/user-authenticators/ldap/src/test/resources/minimal.ldif
copy plugins/user-authenticators/ldap/src/{main/resources/META-INF/cloudstack/ldap/spring-ldap-context.xml => test/resources/testContext.xml} (72%)
copy plugins/user-authenticators/ldap/src/test/resources/{cloudstack.org.ldif => unboundid.ldif} (100%)
create mode 100644 test/integration/plugins/ldap/ldap_test_data.py
create mode 100644 test/integration/plugins/ldap/test_ldap.py