Merge pull request #2009 from Accelerite/CLOUDSTACK-9369

karuturi · web-flow · commit a5963f2d86a6 · 2017-04-23T09:41:15.000+05:30
CLOUDSTACK-9369 Fixed Ldap regression
diff --git a/server/src/com/cloud/api/auth/DefaultLoginAPIAuthenticatorCmd.java b/server/src/com/cloud/api/auth/DefaultLoginAPIAuthenticatorCmd.java
@@ -166,7 +166,7 @@ public String authenticate(String command, Map<String, Object[]> params, HttpSes
                     throw new CloudAuthenticationException("Unable to find the domain from the path " + domain);
                 }
                 final UserAccount userAccount = _accountService.getActiveUserAccount(username[0], domainId);
-                if (userAccount == null || !(User.Source.UNKNOWN.equals(userAccount.getSource()) || User.Source.LDAP.equals(userAccount.getSource()))) {
+                if (userAccount != null && User.Source.SAML2 == userAccount.getSource()) {
                     throw new CloudAuthenticationException("User is not allowed CloudStack login");
                 }
                 return ApiResponseSerializer.toSerializedString(_apiServer.loginUser(session, username[0], pwd, domainId, domain, remoteAddress, params),

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ public String authenticate(String command, Map<String, Object[]> params, HttpSes`
`166`	`166`	`throw new CloudAuthenticationException("Unable to find the domain from the path " + domain);`
`167`	`167`	`}`
`168`	`168`	`final UserAccount userAccount = _accountService.getActiveUserAccount(username[0], domainId);`
`169`		`- if (userAccount == null \|\| !(User.Source.UNKNOWN.equals(userAccount.getSource()) \|\| User.Source.LDAP.equals(userAccount.getSource()))) {`
	`169`	`+ if (userAccount != null && User.Source.SAML2 == userAccount.getSource()) {`
`170`	`170`	`throw new CloudAuthenticationException("User is not allowed CloudStack login");`
`171`	`171`	`}`
`172`	`172`	`return ApiResponseSerializer.toSerializedString(_apiServer.loginUser(session, username[0], pwd, domainId, domain, remoteAddress, params),`