Mailing-List: contact dev-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cloudstack.apache.org
From: karuturi <git@git.apache.org>
To: dev@cloudstack.apache.org
Reply-To: dev@cloudstack.apache.org
References: <git-pr-755-cloudstack@git.apache.org>
In-Reply-To: <git-pr-755-cloudstack@git.apache.org>
Subject: [GitHub] cloudstack pull request: Cloudstack:8647 LDAP Trust AD and
 Autoimp...
Content-Type: text/plain
Message-Id: <20150902091608.297A7DFD40@git1-us-west.apache.org>
Date: Wed,  2 Sep 2015 09:16:08 +0000 (UTC)

Github user karuturi commented on a diff in the pull request:

    https://github.com/apache/cloudstack/pull/755#discussion_r38512312
  
    --- Diff: plugins/user-authenticators/ldap/src/org/apache/cloudstack/ldap/LdapAuthenticator.java ---
    @@ -52,21 +58,71 @@ public LdapAuthenticator(final LdapManager ldapManager, final UserAccountDao use
                 return new Pair<Boolean, ActionOnFailedAuthentication>(false, null);
             }
     
    -        final UserAccount user = _userAccountDao.getUserAccount(username, domainId);
    +        boolean result = false;
    +        ActionOnFailedAuthentication action = null;
     
    -        if (user == null) {
    -            s_logger.debug("Unable to find user with " + username + " in domain " + domainId);
    -            return new Pair<Boolean, ActionOnFailedAuthentication>(false, null);
    -        } else if (_ldapManager.isLdapEnabled()) {
    -            boolean result = _ldapManager.canAuthenticate(username, password);
    -            ActionOnFailedAuthentication action = null;
    -            if (result == false) {
    +        if (_ldapManager.isLdapEnabled()) {
    +            final UserAccount user = _userAccountDao.getUserAccount(username, domainId);
    +            LdapTrustMapVO ldapTrustMapVO = _ldapManager.getDomainLinkedToLdap(domainId);
    +            if(ldapTrustMapVO != null) {
    +                try {
    +                    LdapUser ldapUser = _ldapManager.getUser(username, ldapTrustMapVO.getType().toString(), ldapTrustMapVO.getName());
    +                    if(!ldapUser.isDisabled()) {
    +                        result = _ldapManager.canAuthenticate(ldapUser.getPrincipal(), password);
    +                        if(result) {
    +                            if(user == null) {
    +                                // import user to cloudstack
    +                                createCloudStackUserAccount(ldapUser, domainId, ldapTrustMapVO.getAccountType());
    --- End diff --
    
    authentication wont be successful. authentication will fail as createuseraccount will throw exception.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---