You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rl...@apache.org on 2018/01/10 17:21:45 UTC

[ambari] 01/01: Merge pull request #77 from smolnar82/AMBARI-22667

This is an automated email from the ASF dual-hosted git repository.

rlevas pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git

commit 0341a36a5688ae680e85f437d5bfc1c2d5e95b0f
Merge: 635ee1d 0aaf8c8
Author: Robert Levas <rl...@users.noreply.github.com>
AuthorDate: Wed Jan 10 12:21:41 2018 -0500

    Merge pull request #77 from smolnar82/AMBARI-22667
    
    [AMBARI-22667] Use internal LDAP configuration values rather than ambari.properties

 ambari-server/sbin/ambari-server                   |   1 -
 .../configuration/ComponentSSLConfiguration.java   |   4 +-
 .../ambari/server/configuration/Configuration.java | 446 +--------------------
 .../LdapUsernameCollisionHandlingBehavior.java}    |  21 +-
 .../ambari/server/controller/ControllerModule.java |   2 +
 .../apache/ambari/server/events/AmbariEvent.java   |   7 +-
 .../ambari/server/events/JpaInitializedEvent.java  |  34 ++
 .../ldap/domain/AmbariLdapConfiguration.java       | 174 ++++++--
 .../ldap/domain/AmbariLdapConfigurationKeys.java   | 110 ++---
 .../service/AmbariLdapConfigurationProvider.java   |  29 +-
 .../server/orm/AmbariLocalSessionInterceptor.java  |   2 +-
 .../ambari/server/orm/GuiceJpaInitializer.java     |   8 +-
 .../AmbariLdapAuthenticationProvider.java          |  15 +-
 .../authorization/AmbariLdapBindAuthenticator.java |  13 +-
 .../authorization/LdapServerProperties.java        |  90 +----
 .../server/security/authorization/Users.java       |   6 +-
 .../security/ldap/AmbariLdapDataPopulator.java     |  15 +-
 .../apache/ambari/server/utils/PasswordUtils.java  | 183 +++++++++
 ambari-server/src/main/python/ambari-server.py     |   5 +
 ambari-server/src/main/windows/ambari-server.ps1   |   2 -
 .../server/configuration/ConfigurationTest.java    | 175 +-------
 .../server/ldap/AmbariLdapConfigurationTest.java   | 143 +++++++
 ...apAuthenticationProviderForDNWithSpaceTest.java |   9 +-
 ...AuthenticationProviderForDuplicateUserTest.java |  16 +-
 .../AmbariLdapAuthenticationProviderTest.java      |  28 +-
 .../AmbariLdapBindAuthenticatorTest.java           |  91 ++++-
 .../authorization/AuthorizationTestModule.java     |   3 +-
 .../AuthorizationTestModuleForLdapDNWithSpace.java |   5 +-
 .../authorization/LdapServerPropertiesTest.java    |  20 +-
 .../server/security/authorization/UsersTest.java   |   2 +
 .../security/ldap/AmbariLdapDataPopulatorTest.java |  93 ++---
 .../server/security/ldap/LdapPerformanceTest.java  |  28 +-
 .../ambari/server/utils/PasswordUtilsTest.java     | 126 ++++++
 33 files changed, 967 insertions(+), 939 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
"commits@ambari.apache.org" <co...@ambari.apache.org>.