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 2025/10/09 14:04:15 UTC
(cloudstack) branch ldapCleanup created (now 88e52bb36ca)
This is an automated email from the ASF dual-hosted git repository.
dahn pushed a change to branch ldapCleanup
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
at 88e52bb36ca cleanup
This branch includes the following new commits:
new 88e52bb36ca cleanup
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(cloudstack) 01/01: cleanup
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dahn pushed a commit to branch ldapCleanup
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 88e52bb36caf8200de2516eb98352371106ab001
Author: Daan Hoogland <da...@apache.org>
AuthorDate: Tue Aug 12 11:16:38 2025 +0200
cleanup
---
.../api/command/LdapAddConfigurationCmd.java | 2 +-
.../api/command/LdapCreateAccountCmd.java | 13 +-
.../api/command/LdapDeleteConfigurationCmd.java | 4 +-
.../cloudstack/api/command/LdapImportUsersCmd.java | 31 +++--
.../api/command/LdapListConfigurationCmd.java | 16 ++-
.../cloudstack/api/command/LdapListUsersCmd.java | 112 +++++-----------
.../cloudstack/api/command/LdapUserSearchCmd.java | 4 +-
.../api/command/LinkAccountToLdapCmd.java | 14 +-
.../api/command/LinkDomainToLdapCmd.java | 10 +-
.../api/response/LinkAccountToLdapResponse.java | 4 +
.../cloudstack/ldap/ADLdapUserManagerImpl.java | 15 +--
.../apache/cloudstack/ldap/LdapAuthenticator.java | 27 ++--
.../apache/cloudstack/ldap/LdapConfiguration.java | 88 ++++++-------
.../apache/cloudstack/ldap/LdapContextFactory.java | 14 +-
.../org/apache/cloudstack/ldap/LdapManager.java | 4 +-
.../apache/cloudstack/ldap/LdapManagerImpl.java | 48 +++----
.../org/apache/cloudstack/ldap/LdapTrustMapVO.java | 4 +-
.../java/org/apache/cloudstack/ldap/LdapUser.java | 2 +-
.../apache/cloudstack/ldap/LdapUserManager.java | 18 +--
.../cloudstack/ldap/OpenLdapUserManagerImpl.java | 145 ++++++++++-----------
.../cloudstack/ldap/dao/LdapConfigurationDao.java | 6 +-
.../api/command/LdapListUsersCmdTest.java | 4 +-
.../api/command/LinkAccountToLdapCmdTest.java | 1 +
.../cloudstack/ldap/ADLdapUserManagerImplTest.java | 44 ++++---
24 files changed, 284 insertions(+), 346 deletions(-)
diff --git a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapAddConfigurationCmd.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapAddConfigurationCmd.java
index 1131667d98a..59d68a3f07f 100644
--- a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapAddConfigurationCmd.java
+++ b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapAddConfigurationCmd.java
@@ -46,7 +46,7 @@ public class LdapAddConfigurationCmd extends BaseCmd {
@Parameter(name = ApiConstants.PORT, type = CommandType.INTEGER, required = true, description = "Port")
private int port;
- @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, required = false, entityType = DomainResponse.class, description = "linked domain")
+ @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, entityType = DomainResponse.class, description = "linked domain")
private Long domainId;
public LdapAddConfigurationCmd() {
diff --git a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapCreateAccountCmd.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapCreateAccountCmd.java
index 880ecea4d13..2715cc196e1 100644
--- a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapCreateAccountCmd.java
+++ b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapCreateAccountCmd.java
@@ -21,6 +21,7 @@ import com.cloud.user.Account;
import com.cloud.user.AccountService;
import com.cloud.user.User;
import com.cloud.user.UserAccount;
+import com.cloud.utils.StringUtils;
import org.apache.cloudstack.acl.RoleType;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
@@ -39,7 +40,6 @@ import org.apache.cloudstack.ldap.NoLdapUserMatchingQueryException;
import org.bouncycastle.util.encoders.Base64;
import javax.inject.Inject;
-import java.io.UnsupportedEncodingException;
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
import java.util.Map;
@@ -107,7 +107,7 @@ public class LdapCreateAccountCmd extends BaseCmd {
if (accountType == null) {
return RoleType.getAccountTypeByRole(roleService.findRole(roleId), null);
}
- return RoleType.getAccountTypeByRole(roleService.findRole(roleId), Account.Type.getFromValue(accountType.intValue()));
+ return RoleType.getAccountTypeByRole(roleService.findRole(roleId), Account.Type.getFromValue(accountType));
}
public Long getRoleId() {
@@ -158,10 +158,10 @@ public class LdapCreateAccountCmd extends BaseCmd {
private String generatePassword() throws ServerApiException {
try {
final SecureRandom randomGen = SecureRandom.getInstance("SHA1PRNG");
- final byte bytes[] = new byte[20];
+ final byte[] bytes = new byte[20];
randomGen.nextBytes(bytes);
- return new String(Base64.encode(bytes), "UTF-8");
- } catch (NoSuchAlgorithmException | UnsupportedEncodingException e) {
+ return new String(Base64.encode(bytes), StringUtils.getPreferredCharset());
+ } catch (NoSuchAlgorithmException e) {
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to generate random password");
}
}
@@ -180,7 +180,7 @@ public class LdapCreateAccountCmd extends BaseCmd {
return Account.ACCOUNT_ID_SYSTEM;
}
- private boolean validateUser(final LdapUser user) throws ServerApiException {
+ private void validateUser(final LdapUser user) throws ServerApiException {
if (user.getEmail() == null) {
throw new ServerApiException(ApiErrorCode.RESOURCE_UNAVAILABLE_ERROR, username + " has no email address set within LDAP");
}
@@ -190,6 +190,5 @@ public class LdapCreateAccountCmd extends BaseCmd {
if (user.getLastname() == null) {
throw new ServerApiException(ApiErrorCode.RESOURCE_UNAVAILABLE_ERROR, username + " has no lastname set within LDAP");
}
- return true;
}
}
diff --git a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapDeleteConfigurationCmd.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapDeleteConfigurationCmd.java
index 0ce7daff432..ffbe224df41 100644
--- a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapDeleteConfigurationCmd.java
+++ b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapDeleteConfigurationCmd.java
@@ -46,10 +46,10 @@ public class LdapDeleteConfigurationCmd extends BaseCmd {
@Parameter(name = ApiConstants.HOST_NAME, type = CommandType.STRING, description = "Hostname")
private String hostname;
- @Parameter(name = ApiConstants.PORT, type = CommandType.INTEGER, required = false, description = "port")
+ @Parameter(name = ApiConstants.PORT, type = CommandType.INTEGER, description = "port")
private int port;
- @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, required = false, entityType = DomainResponse.class, description = "linked domain")
+ @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, entityType = DomainResponse.class, description = "linked domain")
private Long domainId;
public LdapDeleteConfigurationCmd() {
diff --git a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapImportUsersCmd.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapImportUsersCmd.java
index eada5f6df39..cac6c4d6384 100644
--- a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapImportUsersCmd.java
+++ b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapImportUsersCmd.java
@@ -16,7 +16,6 @@
// under the License.
package org.apache.cloudstack.api.command;
-import java.io.UnsupportedEncodingException;
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
import java.util.ArrayList;
@@ -41,7 +40,6 @@ import org.apache.cloudstack.api.response.RoleResponse;
import org.apache.cloudstack.ldap.LdapManager;
import org.apache.cloudstack.ldap.LdapUser;
import org.apache.cloudstack.ldap.NoLdapUserMatchingQueryException;
-import org.apache.commons.lang3.StringUtils;
import org.bouncycastle.util.encoders.Base64;
import com.cloud.domain.Domain;
@@ -56,6 +54,7 @@ import com.cloud.user.AccountService;
import com.cloud.user.DomainService;
import com.cloud.user.User;
import com.cloud.user.UserAccount;
+import com.cloud.utils.StringUtils;
@APICommand(name = "importLdapUsers", description = "Import LDAP users", responseObject = LdapUserResponse.class, since = "4.3.0", requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class LdapImportUsersCmd extends BaseListCmd {
@@ -106,14 +105,14 @@ public class LdapImportUsersCmd extends BaseListCmd {
private void createCloudstackUserAccount(LdapUser user, String accountName, Domain domain) {
Account account = _accountService.getActiveAccountByName(accountName, domain.getId());
if (account == null) {
- logger.debug("No account exists with name: " + accountName + " creating the account and an user with name: " + user.getUsername() + " in the account");
+ logger.debug("No account exists with name: {} creating the account and an user with name: {} in the account", accountName, user.getUsername());
_accountService.createUserAccount(user.getUsername(), generatePassword(), user.getFirstname(), user.getLastname(), user.getEmail(), timezone, accountName, getAccountType(), getRoleId(),
domain.getId(), domain.getNetworkDomain(), details, UUID.randomUUID().toString(), UUID.randomUUID().toString(), User.Source.LDAP);
} else {
// check if the user exists. if yes, call update
UserAccount csuser = _accountService.getActiveUserAccount(user.getUsername(), domain.getId());
if (csuser == null) {
- logger.debug("No user exists with name: " + user.getUsername() + " creating a user in the account: " + accountName);
+ logger.debug("No user exists with name: {} creating a user in the account: {}", user.getUsername(), accountName);
_accountService.createUser(user.getUsername(), generatePassword(), user.getFirstname(), user.getLastname(), user.getEmail(), timezone, accountName, domain.getId(),
UUID.randomUUID().toString(), User.Source.LDAP);
} else {
@@ -145,21 +144,21 @@ public class LdapImportUsersCmd extends BaseListCmd {
users = _ldapManager.getUsers(domainId);
}
} catch (NoLdapUserMatchingQueryException ex) {
- users = new ArrayList<LdapUser>();
- logger.info("No Ldap user matching query. " + " ::: " + ex.getMessage());
+ users = new ArrayList<>();
+ logger.info("No Ldap user matching query. ::: {}", ex.getMessage());
}
- List<LdapUser> addedUsers = new ArrayList<LdapUser>();
+ List<LdapUser> addedUsers = new ArrayList<>();
for (LdapUser user : users) {
Domain domain = getDomain(user);
try {
createCloudstackUserAccount(user, getAccountName(user), domain);
addedUsers.add(user);
} catch (InvalidParameterValueException ex) {
- logger.error("Failed to create user with username: " + user.getUsername() + " ::: " + ex.getMessage());
+ logger.error("Failed to create user with username: {} ::: {}", user.getUsername(), ex.getMessage());
}
}
- ListResponse<LdapUserResponse> response = new ListResponse<LdapUserResponse>();
+ ListResponse<LdapUserResponse> response = new ListResponse<>();
response.setResponses(createLdapUserResponse(addedUsers));
response.setResponseName(getCommandName());
setResponseObject(response);
@@ -169,7 +168,7 @@ public class LdapImportUsersCmd extends BaseListCmd {
if (accountType == null) {
return RoleType.getAccountTypeByRole(roleService.findRole(roleId), null);
}
- return RoleType.getAccountTypeByRole(roleService.findRole(roleId), Account.Type.getFromValue(accountType.intValue()));
+ return RoleType.getAccountTypeByRole(roleService.findRole(roleId), Account.Type.getFromValue(accountType));
}
public Long getRoleId() {
@@ -202,11 +201,11 @@ public class LdapImportUsersCmd extends BaseListCmd {
private Domain getDomain(LdapUser user) {
Domain domain;
if (_domain != null) {
- //this means either domain id or groupname is passed and this will be same for all the users in this call. hence returning it.
+ //this means either domain id or group name is passed and this will be same for all the users in this call. hence returning it.
domain = _domain;
} else {
if (domainId != null) {
- // a domain Id is passed. use it for this user and all the users in the same api call (by setting _domain)
+ // a domain ID is passed. use it for this user and all the users in the same api call (by setting _domain)
domain = _domain = _domainService.getDomain(domainId);
} else {
// a group name is passed. use it for this user and all the users in the same api call(by setting _domain)
@@ -225,7 +224,7 @@ public class LdapImportUsersCmd extends BaseListCmd {
}
private List<LdapUserResponse> createLdapUserResponse(List<LdapUser> users) {
- final List<LdapUserResponse> ldapResponses = new ArrayList<LdapUserResponse>();
+ final List<LdapUserResponse> ldapResponses = new ArrayList<>();
for (final LdapUser user : users) {
final LdapUserResponse ldapResponse = _ldapManager.createLdapUserResponse(user);
ldapResponse.setObjectName("LdapUser");
@@ -242,10 +241,10 @@ public class LdapImportUsersCmd extends BaseListCmd {
private String generatePassword() throws ServerApiException {
try {
final SecureRandom randomGen = SecureRandom.getInstance("SHA1PRNG");
- final byte bytes[] = new byte[20];
+ final byte[] bytes = new byte[20];
randomGen.nextBytes(bytes);
- return new String(Base64.encode(bytes), "UTF-8");
- } catch (NoSuchAlgorithmException | UnsupportedEncodingException e) {
+ return new String(Base64.encode(bytes), StringUtils.getPreferredCharset());
+ } catch (NoSuchAlgorithmException e) {
throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to generate random password");
}
}
diff --git a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapListConfigurationCmd.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapListConfigurationCmd.java
index c950554b0d1..25653a9c0a3 100644
--- a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapListConfigurationCmd.java
+++ b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapListConfigurationCmd.java
@@ -44,20 +44,22 @@ public class LdapListConfigurationCmd extends BaseListCmd {
@Inject
private LdapManager _ldapManager;
- @Parameter(name = ApiConstants. HOST_NAME, type = CommandType.STRING, required = false, description = "Hostname")
+ @Parameter(name = ApiConstants. HOST_NAME, type = CommandType.STRING, description = "Hostname")
private String hostname;
- @Parameter(name = ApiConstants.PORT, type = CommandType.INTEGER, required = false, description = "Port")
+ @Parameter(name = ApiConstants.PORT, type = CommandType.INTEGER, description = "Port")
private int port;
- @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, required = false, entityType = DomainResponse.class, description = "linked domain")
+ @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, entityType = DomainResponse.class,
+ description = "linked domain")
private Long domainId;
@Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = LdapConfigurationResponse.class, description = "list ldap configuration by ID; when passed, all other parameters are ignored")
private Long id;
- @Parameter(name = ApiConstants.LIST_ALL, type = CommandType.BOOLEAN, description = "If set to true, "
- + " and no domainid specified, list all LDAP configurations irrespective of the linked domain", since = "4.13.2")
+ @Parameter(name = ApiConstants.LIST_ALL, type = CommandType.BOOLEAN,
+ description = "If set to true, and no `domainid` specified, list all LDAP configurations irrespective of the linked domain",
+ since = "4.13.2")
private Boolean listAll;
public LdapListConfigurationCmd() {
@@ -70,7 +72,7 @@ public class LdapListConfigurationCmd extends BaseListCmd {
}
private List<LdapConfigurationResponse> createLdapConfigurationResponses(final List<? extends LdapConfigurationVO> configurations) {
- final List<LdapConfigurationResponse> responses = new ArrayList<LdapConfigurationResponse>();
+ final List<LdapConfigurationResponse> responses = new ArrayList<>();
for (final LdapConfigurationVO resource : configurations) {
final LdapConfigurationResponse configurationResponse = _ldapManager.createLdapConfigurationResponse(resource);
configurationResponse.setObjectName("LdapConfiguration");
@@ -83,7 +85,7 @@ public class LdapListConfigurationCmd extends BaseListCmd {
public void execute() {
final Pair<List<? extends LdapConfigurationVO>, Integer> result = _ldapManager.listConfigurations(this);
final List<LdapConfigurationResponse> responses = createLdapConfigurationResponses(result.first());
- final ListResponse<LdapConfigurationResponse> response = new ListResponse<LdapConfigurationResponse>();
+ final ListResponse<LdapConfigurationResponse> response = new ListResponse<>();
response.setResponses(responses, result.second());
response.setResponseName(getCommandName());
setResponseObject(response);
diff --git a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapListUsersCmd.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapListUsersCmd.java
index 6bfc70ea139..07b96e7e229 100644
--- a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapListUsersCmd.java
+++ b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapListUsersCmd.java
@@ -16,10 +16,9 @@
// under the License.
package org.apache.cloudstack.api.command;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
import javax.inject.Inject;
@@ -44,9 +43,10 @@ import org.apache.cloudstack.ldap.NoLdapUserMatchingQueryException;
import org.apache.cloudstack.query.QueryService;
import com.cloud.user.Account;
+import org.apache.commons.collections.CollectionUtils;
/**
- * a short flow, use plantuml to view (see http://plantuml.com)
+ * a short flow, use plantuml to view (see <a href="http://plantuml.com">the plantuml site</a>)
* @startuml
* start
* :list ldap users request;
@@ -84,14 +84,12 @@ public class LdapListUsersCmd extends BaseListCmd {
@Parameter(name = "listtype",
type = CommandType.STRING,
- required = false,
description = "Determines whether all ldap users are returned or just non-cloudstack users. This option is deprecated in favour for the more option rich 'userfilter' parameter")
@Deprecated
private String listType;
@Parameter(name = ApiConstants.USER_FILTER,
type = CommandType.STRING,
- required = false,
since = "4.13",
description = "Determines what type of filter is applied on the list of users returned from LDAP.\n"
+ "\tvalid values are\n"
@@ -102,7 +100,7 @@ public class LdapListUsersCmd extends BaseListCmd {
+ " including those that are already in cloudstack, the later will be annotated with their userSource")
private String userFilter;
- @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, required = false, entityType = DomainResponse.class, description = "linked domain")
+ @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, entityType = DomainResponse.class, description = "linked domain")
private Long domainId;
public LdapListUsersCmd() {
@@ -121,7 +119,7 @@ public class LdapListUsersCmd extends BaseListCmd {
* @return a (filtered?) list of user response objects
*/
private List<LdapUserResponse> createLdapUserResponse(final List<LdapUser> users) {
- final List<LdapUserResponse> ldapResponses = new ArrayList<LdapUserResponse>();
+ final List<LdapUserResponse> ldapResponses = new ArrayList<>();
for (final LdapUser user : users) {
final LdapUserResponse ldapResponse = _ldapManager.createLdapUserResponse(user);
ldapResponse.setObjectName("LdapUser");
@@ -135,8 +133,8 @@ public class LdapListUsersCmd extends BaseListCmd {
@Override
public void execute() throws ServerApiException {
cloudstackUsers = null;
- List<LdapUserResponse> ldapResponses = new ArrayList<LdapUserResponse>();
- final ListResponse<LdapUserResponse> response = new ListResponse<LdapUserResponse>();
+ List<LdapUserResponse> ldapResponses = new ArrayList<>();
+ final ListResponse<LdapUserResponse> response = new ListResponse<>();
try {
final List<LdapUser> users = _ldapManager.getUsers(domainId);
ldapResponses = createLdapUserResponse(users);
@@ -177,16 +175,15 @@ public class LdapListUsersCmd extends BaseListCmd {
users.append(user.getUsername());
}
- logger.trace(String.format("checking against %d cloudstackusers: %s.", this.cloudstackUsers.size(), users.toString()));
+ logger.trace("checking against {} cloudstackusers: {}.", this.cloudstackUsers.size(), users);
}
}
private List<LdapUserResponse> applyUserFilter(List<LdapUserResponse> ldapResponses) {
if(logger.isTraceEnabled()) {
- logger.trace(String.format("applying filter: %s or %s.", this.getListTypeString(), this.getUserFilter()));
+ logger.trace("applying filter: {} or {}.", this.getListTypeString(), this.getUserFilter());
}
- List<LdapUserResponse> responseList = getUserFilter().filter(this,ldapResponses);
- return responseList;
+ return getUserFilter().filter(this,ldapResponses);
}
@Override
@@ -211,48 +208,36 @@ public class LdapListUsersCmd extends BaseListCmd {
return UserFilter.fromString(getUserFilterString());
}
- boolean isACloudstackUser(final LdapUser ldapUser) {
- boolean rc = false;
- final List<UserResponse> cloudstackUsers = getCloudstackUsers();
- if (cloudstackUsers != null) {
- for (final UserResponse cloudstackUser : cloudstackUsers) {
- if (ldapUser.getUsername().equals(cloudstackUser.getUsername())) {
- if(logger.isTraceEnabled()) {
- logger.trace(String.format("found user %s in cloudstack", ldapUser.getUsername()));
- }
-
- rc = true;
- } else {
- if(logger.isTraceEnabled()) {
- logger.trace(String.format("ldap user %s does not match cloudstack user %s", ldapUser.getUsername(), cloudstackUser.getUsername()));
- }
- }
- }
- }
- return rc;
+ boolean isACloudStackUser(final LdapUser ldapUser) {
+ String username = ldapUser.getUsername();
+ return isACloudStackUser(username);
}
- boolean isACloudstackUser(final LdapUserResponse ldapUser) {
+ boolean isACloudStackUser(final LdapUserResponse ldapUser) {
if(logger.isTraceEnabled()) {
- logger.trace("checking response : " + ldapUser.toString());
+ logger.trace("checking response : {}", ldapUser.toString());
}
+ String username = ldapUser.getUsername();
+ return isACloudStackUser(username);
+ }
+
+ private boolean isACloudStackUser(String username) {
+ boolean rc = false;
final List<UserResponse> cloudstackUsers = getCloudstackUsers();
- if (cloudstackUsers != null && cloudstackUsers.size() != 0) {
+ if (CollectionUtils.isNotEmpty(cloudstackUsers)) {
for (final UserResponse cloudstackUser : cloudstackUsers) {
- if (ldapUser.getUsername().equals(cloudstackUser.getUsername())) {
- if(logger.isTraceEnabled()) {
- logger.trace(String.format("found user %s in cloudstack user %s", ldapUser.getUsername(), cloudstackUser.getUsername()));
- }
- return true;
+ if (username.equals(cloudstackUser.getUsername())) {
+ logger.trace("found user {} in cloudstack user {}", username, cloudstackUser.getUsername());
+ rc = true;
+ break;
} else {
- if(logger.isTraceEnabled()) {
- logger.trace(String.format("ldap user %s does not match cloudstack user %s", ldapUser.getUsername(), cloudstackUser.getUsername()));
- }
+ logger.trace("ldap user {} does not match cloudstack user {}", username, cloudstackUser.getUsername());
}
}
}
- return false;
+ return rc;
}
+
/**
* typecheck for userfilter values and filter type dependend functionalities.
* This could have been in two switch statements elsewhere in the code.
@@ -363,7 +348,7 @@ public class LdapListUsersCmd extends BaseListCmd {
if(logger.isTraceEnabled()) {
logger.trace("filtering existing users");
}
- final List<LdapUserResponse> ldapResponses = new ArrayList<LdapUserResponse>();
+ final List<LdapUserResponse> ldapResponses = new ArrayList<>();
for (final LdapUserResponse user : input) {
if (isNotAlreadyImportedInTheCurrentDomain(user)) {
ldapResponses.add(user);
@@ -396,7 +381,7 @@ public class LdapListUsersCmd extends BaseListCmd {
if(logger.isTraceEnabled()) {
logger.trace("filtering local domain users");
}
- final List<LdapUserResponse> ldapResponses = new ArrayList<LdapUserResponse>();
+ final List<LdapUserResponse> ldapResponses = new ArrayList<>();
String domainId = getCurrentDomainId();
for (final LdapUserResponse user : input) {
UserResponse cloudstackUser = getCloudstackUser(user);
@@ -412,7 +397,7 @@ public class LdapListUsersCmd extends BaseListCmd {
}
private String getCurrentDomainId() {
- String domainId = null;
+ String domainId;
if (this.domainId != null) {
Domain domain = _domainService.getDomain(this.domainId);
domainId = domain.getUuid();
@@ -433,10 +418,10 @@ public class LdapListUsersCmd extends BaseListCmd {
logger.trace("should be filtering potential imports!!!");
}
// functional possibility do not add only users not yet in cloudstack but include users that would be moved if they are so in ldap?
- // this means if they are part of a account linked to an ldap group/ou
+ // this means if they are part of an account linked to a ldap group/ou
input.removeIf(ldapUser ->
(
- (isACloudstackUser(ldapUser))
+ (isACloudStackUser(ldapUser))
&& (getCloudstackUser(ldapUser).getUserSource().equalsIgnoreCase(User.Source.LDAP.toString()))
)
);
@@ -466,7 +451,7 @@ public class LdapListUsersCmd extends BaseListCmd {
for (final UserResponse cloudstackUser : cloudstackUsers) {
if (user.getUsername().equals(cloudstackUser.getUsername())) {
returnObject = cloudstackUser;
- if (returnObject.getDomainId() == this.getCurrentDomainId()) {
+ if (Objects.equals(returnObject.getDomainId(), this.getCurrentDomainId())) {
break;
}
}
@@ -474,31 +459,4 @@ public class LdapListUsersCmd extends BaseListCmd {
}
return returnObject;
}
-
- private void checkFilterMethodType(Type returnType) {
- String msg = null;
- if (returnType instanceof ParameterizedType) {
- ParameterizedType type = (ParameterizedType) returnType;
- if(type.getRawType().equals(List.class)) {
- Type[] typeArguments = type.getActualTypeArguments();
- if (typeArguments.length == 1) {
- if (typeArguments[0].equals(LdapUserResponse.class)) {
- // we're good'
- } else {
- msg = new String("list of return type contains " + typeArguments[0].getTypeName());
- }
- } else {
- msg = String.format("type %s has to the wrong number of arguments", type.getRawType());
- }
- } else {
- msg = String.format("type %s is not a List<>", type.getTypeName());
- }
- } else {
- msg = new String("can't even begin to explain; review your method signature");
- }
- if(msg != null) {
- throw new IllegalArgumentException(msg);
- }
- }
-
}
diff --git a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapUserSearchCmd.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapUserSearchCmd.java
index b702beda170..d26c3c259bf 100644
--- a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapUserSearchCmd.java
+++ b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LdapUserSearchCmd.java
@@ -54,7 +54,7 @@ public class LdapUserSearchCmd extends BaseListCmd {
}
private List<LdapUserResponse> createLdapUserResponse(final List<LdapUser> users) {
- final List<LdapUserResponse> ldapUserResponses = new ArrayList<LdapUserResponse>();
+ final List<LdapUserResponse> ldapUserResponses = new ArrayList<>();
if (users != null) {
for (final LdapUser user : users) {
final LdapUserResponse ldapUserResponse = _ldapManager.createLdapUserResponse(user);
@@ -67,7 +67,7 @@ public class LdapUserSearchCmd extends BaseListCmd {
@Override
public void execute() {
- final ListResponse<LdapUserResponse> response = new ListResponse<LdapUserResponse>();
+ final ListResponse<LdapUserResponse> response = new ListResponse<>();
List<LdapUser> users = null;
try {
diff --git a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LinkAccountToLdapCmd.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LinkAccountToLdapCmd.java
index 52ece5c44f4..ffc4b473b7b 100644
--- a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LinkAccountToLdapCmd.java
+++ b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LinkAccountToLdapCmd.java
@@ -50,7 +50,7 @@ public class LinkAccountToLdapCmd extends BaseCmd {
@Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, required = true, entityType = DomainResponse.class, description = "The id of the domain that is to contain the linked account.")
private Long domainId;
- @Parameter(name = ApiConstants.TYPE, type = CommandType.STRING, required = false, description = "type of the ldap name. GROUP or OU, defaults to GROUP")
+ @Parameter(name = ApiConstants.TYPE, type = CommandType.STRING, description = "type of the ldap name. GROUP or OU, defaults to GROUP")
private String type;
@Parameter(name = ApiConstants.LDAP_DOMAIN, type = CommandType.STRING, required = true, description = "name of the group or OU in LDAP")
@@ -59,14 +59,14 @@ public class LinkAccountToLdapCmd extends BaseCmd {
@Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, required = true, description = "name of the account, it will be created if it does not exist")
private String accountName;
- @Parameter(name = ApiConstants.ADMIN, type = CommandType.STRING, required = false, description = "domain admin username in LDAP ")
+ @Parameter(name = ApiConstants.ADMIN, type = CommandType.STRING, description = "domain admin username in LDAP ")
private String admin;
- @Parameter(name = ApiConstants.ACCOUNT_TYPE, type = CommandType.INTEGER, required = false, description = "Type of the account to auto import. Specify 0 for user and 2 for "
+ @Parameter(name = ApiConstants.ACCOUNT_TYPE, type = CommandType.INTEGER, description = "Type of the account to auto import. Specify 0 for user and 2 for "
+ "domain admin")
private Integer accountType;
- @Parameter(name = ApiConstants.ROLE_ID, type = CommandType.UUID, entityType = RoleResponse.class, required = false, description = "Creates the account under the specified role.", since="4.19.1")
+ @Parameter(name = ApiConstants.ROLE_ID, type = CommandType.UUID, entityType = RoleResponse.class, description = "Creates the account under the specified role.", since="4.19.1")
private Long roleId;
@Inject
@@ -81,7 +81,7 @@ public class LinkAccountToLdapCmd extends BaseCmd {
try {
ldapUser = _ldapManager.getUser(admin, type, ldapDomain, domainId);
} catch (NoLdapUserMatchingQueryException e) {
- logger.debug("no ldap user matching username " + admin + " in the given group/ou", e);
+ logger.debug("no ldap user matching username {} in the given group/ou", admin, e);
}
if (ldapUser != null && !ldapUser.isDisabled()) {
Account account = _accountService.getActiveAccountByName(admin, domainId);
@@ -99,7 +99,7 @@ public class LinkAccountToLdapCmd extends BaseCmd {
logger.debug("an account with name {} already exists in the domain {} with id {}", admin, _domainService.getDomain(domainId), domainId);
}
} else {
- logger.debug("ldap user with username " + admin + " is disabled in the given group/ou");
+ logger.debug("ldap user with username {} is disabled in the given group/ou", admin);
}
}
response.setObjectName(this.getActualCommandName());
@@ -139,7 +139,7 @@ public class LinkAccountToLdapCmd extends BaseCmd {
if (accountType == null) {
return RoleType.getAccountTypeByRole(roleService.findRole(roleId), null);
}
- return RoleType.getAccountTypeByRole(roleService.findRole(roleId), Account.Type.getFromValue(accountType.intValue()));
+ return RoleType.getAccountTypeByRole(roleService.findRole(roleId), Account.Type.getFromValue(accountType));
}
public Long getRoleId() {
diff --git a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LinkDomainToLdapCmd.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LinkDomainToLdapCmd.java
index c351924de6d..0a6811ea52a 100644
--- a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LinkDomainToLdapCmd.java
+++ b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/command/LinkDomainToLdapCmd.java
@@ -51,14 +51,14 @@ public class LinkDomainToLdapCmd extends BaseCmd {
@Parameter(name = ApiConstants.TYPE, type = CommandType.STRING, required = true, description = "type of the ldap name. GROUP or OU")
private String type;
- @Parameter(name = ApiConstants.LDAP_DOMAIN, type = CommandType.STRING, required = false, description = "name of the group or OU in LDAP")
+ @Parameter(name = ApiConstants.LDAP_DOMAIN, type = CommandType.STRING, description = "name of the group or OU in LDAP")
private String ldapDomain;
@Deprecated
- @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, required = false, description = "name of the group or OU in LDAP")
+ @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, description = "name of the group or OU in LDAP")
private String name;
- @Parameter(name = ApiConstants.ADMIN, type = CommandType.STRING, required = false, description = "domain admin username in LDAP ")
+ @Parameter(name = ApiConstants.ADMIN, type = CommandType.STRING, description = "domain admin username in LDAP ")
private String admin;
@Parameter(name = ApiConstants.ACCOUNT_TYPE, type = CommandType.INTEGER, required = true, description = "Type of the account to auto import. Specify 0 for user and 2 for " +
@@ -98,7 +98,7 @@ public class LinkDomainToLdapCmd extends BaseCmd {
try {
ldapUser = _ldapManager.getUser(admin, type, getLdapDomain(), domainId);
} catch (NoLdapUserMatchingQueryException e) {
- logger.debug("no ldap user matching username " + admin + " in the given group/ou", e);
+ logger.debug("no ldap user matching username {} in the given group/ou", admin, e);
}
if (ldapUser != null && !ldapUser.isDisabled()) {
Account account = _accountService.getActiveAccountByName(admin, domainId);
@@ -115,7 +115,7 @@ public class LinkDomainToLdapCmd extends BaseCmd {
logger.debug("an account with name {} already exists in the domain {} with id {}", admin, _domainService.getDomain(domainId), domainId);
}
} else {
- logger.debug("ldap user with username "+admin+" is disabled in the given group/ou");
+ logger.debug("ldap user with username {} is disabled in the given group/ou", admin);
}
}
response.setObjectName("LinkDomainToLdap");
diff --git a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/response/LinkAccountToLdapResponse.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/response/LinkAccountToLdapResponse.java
index 6273273bdbf..6366ee9176e 100644
--- a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/response/LinkAccountToLdapResponse.java
+++ b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/api/response/LinkAccountToLdapResponse.java
@@ -82,4 +82,8 @@ public class LinkAccountToLdapResponse extends BaseResponse {
public void setAdminId(String adminId) {
this.adminId = adminId;
}
+
+ public String getAccountName() {
+ return accountName;
+ }
}
diff --git a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/ADLdapUserManagerImpl.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/ADLdapUserManagerImpl.java
index e96606dca2f..12854e93817 100644
--- a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/ADLdapUserManagerImpl.java
+++ b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/ADLdapUserManagerImpl.java
@@ -39,7 +39,7 @@ public class ADLdapUserManagerImpl extends OpenLdapUserManagerImpl implements Ld
throw new IllegalArgumentException("ldap group name cannot be blank");
}
- String basedn = _ldapConfiguration.getBaseDn(domainId);
+ String basedn = LdapConfiguration.getBaseDn(domainId);
if (StringUtils.isBlank(basedn)) {
throw new IllegalArgumentException("ldap basedn is not configured");
}
@@ -49,7 +49,7 @@ public class ADLdapUserManagerImpl extends OpenLdapUserManagerImpl implements Ld
searchControls.setReturningAttributes(_ldapConfiguration.getReturnAttributes(domainId));
NamingEnumeration<SearchResult> results = context.search(basedn, generateADGroupSearchFilter(groupName, domainId), searchControls);
- final List<LdapUser> users = new ArrayList<LdapUser>();
+ final List<LdapUser> users = new ArrayList<>();
while (results.hasMoreElements()) {
final SearchResult result = results.nextElement();
users.add(createUser(result, domainId));
@@ -58,13 +58,12 @@ public class ADLdapUserManagerImpl extends OpenLdapUserManagerImpl implements Ld
}
String generateADGroupSearchFilter(String groupName, Long domainId) {
- final StringBuilder userObjectFilter = new StringBuilder();
- userObjectFilter.append("(objectClass=");
- userObjectFilter.append(_ldapConfiguration.getUserObject(domainId));
- userObjectFilter.append(")");
+ String userObjectFilter = "(objectClass=" +
+ LdapConfiguration.getUserObject(domainId) +
+ ")";
final StringBuilder memberOfFilter = new StringBuilder();
- String groupCnName = _ldapConfiguration.getCommonNameAttribute() + "=" +groupName + "," + _ldapConfiguration.getBaseDn(domainId);
+ String groupCnName = _ldapConfiguration.getCommonNameAttribute() + "=" +groupName + "," + LdapConfiguration.getBaseDn(domainId);
memberOfFilter.append("(").append(getMemberOfAttribute(domainId)).append("=");
memberOfFilter.append(groupCnName);
memberOfFilter.append(")");
@@ -75,7 +74,7 @@ public class ADLdapUserManagerImpl extends OpenLdapUserManagerImpl implements Ld
result.append(memberOfFilter);
result.append(")");
- logger.debug("group search filter = " + result);
+ logger.debug("group search filter = {}", result);
return result.toString();
}
diff --git a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapAuthenticator.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapAuthenticator.java
index 36c663566cb..33db99fb72b 100644
--- a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapAuthenticator.java
+++ b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapAuthenticator.java
@@ -25,6 +25,7 @@ import javax.inject.Inject;
import org.apache.cloudstack.acl.RoleType;
import org.apache.cloudstack.auth.UserAuthenticator;
+import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import com.cloud.user.Account;
@@ -59,10 +60,10 @@ public class LdapAuthenticator extends AdapterBase implements UserAuthenticator
@Override
public Pair<Boolean, ActionOnFailedAuthentication> authenticate(final String username, final String password, final Long domainId, final Map<String, Object[]> requestParameters) {
- Pair<Boolean, ActionOnFailedAuthentication> rc = new Pair<Boolean, ActionOnFailedAuthentication>(false, null);
+ Pair<Boolean, ActionOnFailedAuthentication> rc = new Pair<>(false, null);
if (logger.isDebugEnabled()) {
- logger.debug("Retrieving ldap user: " + username);
+ logger.debug("Retrieving ldap user: {}", username);
}
// TODO not allowing an empty password is a policy we shouldn't decide on. A private cloud may well want to allow this.
@@ -76,7 +77,7 @@ public class LdapAuthenticator extends AdapterBase implements UserAuthenticator
return rc;
}
List<LdapTrustMapVO> ldapTrustMapVOs = getLdapTrustMapVOS(domainId);
- if (ldapTrustMapVOs != null && ldapTrustMapVOs.size() > 0) {
+ if (CollectionUtils.isNotEmpty(ldapTrustMapVOs)) {
if (ldapTrustMapVOs.size() == 1 && ldapTrustMapVOs.get(0).getAccountId() == 0) {
if (logger.isTraceEnabled()) {
logger.trace("We have a single mapping of a domain to an ldap group or ou");
@@ -90,7 +91,7 @@ public class LdapAuthenticator extends AdapterBase implements UserAuthenticator
}
} else {
if (logger.isTraceEnabled()) {
- logger.trace(String.format("'this' domain (%d) is not linked to ldap follow normal authentication", domainId));
+ logger.trace("'this' domain ({}) is not linked to ldap follow normal authentication", domainId);
}
rc = authenticate(username, password, domainId, user);
}
@@ -114,10 +115,10 @@ public class LdapAuthenticator extends AdapterBase implements UserAuthenticator
* @param domainId domain the user is trying to log on to
* @param userAccount cloudstack user object
* @param ldapTrustMapVOs the trust mappings of accounts in the domain to ldap groups
- * @return false if the ldap user object does not exist, is not mapped to an account, is mapped to multiple accounts or if authenitication fails
+ * @return {false,<error-code>} if the ldap user object does not exist, is not mapped to an account, is mapped to multiple accounts or if authentication fails
*/
Pair<Boolean, ActionOnFailedAuthentication> authenticate(String username, String password, Long domainId, UserAccount userAccount, List<LdapTrustMapVO> ldapTrustMapVOs) {
- Pair<Boolean, ActionOnFailedAuthentication> rc = new Pair<Boolean, ActionOnFailedAuthentication>(false, null);
+ Pair<Boolean, ActionOnFailedAuthentication> rc = new Pair<>(false, null);
try {
LdapUser ldapUser = _ldapManager.getUser(username, domainId);
List<String> memberships = ldapUser.getMemberships();
@@ -131,7 +132,7 @@ public class LdapAuthenticator extends AdapterBase implements UserAuthenticator
logAndDisable(userAccount, "attempt to log on using disabled ldap user " + userAccount.getUsername(), false);
} else if (mappedGroups.size() > 1) {
logAndDisable(userAccount, "user '" + username + "' is mapped to more then one account in domain and will be disabled.", false);
- } else if (mappedGroups.size() < 1) {
+ } else if (mappedGroups.isEmpty()) {
logAndDisable(userAccount, "user '" + username + "' is not mapped to an account in domain and will be removed.", true);
} else {
// a valid ldap configured user exists
@@ -230,10 +231,10 @@ public class LdapAuthenticator extends AdapterBase implements UserAuthenticator
* @param domainId domain the user is trying to log on to
* @param user cloudstack user object
* @param ldapTrustMapVO the trust mapping for the domain to the ldap group
- * @return false if the ldap user object does not exist or authenitication fails
+ * @return {false, <error-code>} if the ldap user object does not exist or authentication fails
*/
private Pair<Boolean, ActionOnFailedAuthentication> authenticate(String username, String password, Long domainId, UserAccount user, LdapTrustMapVO ldapTrustMapVO) {
- Pair<Boolean, ActionOnFailedAuthentication> rc = new Pair<Boolean, ActionOnFailedAuthentication>(false, null);
+ Pair<Boolean, ActionOnFailedAuthentication> rc = new Pair<>(false, null);
try {
LdapUser ldapUser = _ldapManager.getUser(username, ldapTrustMapVO.getType().toString(), ldapTrustMapVO.getName(), domainId);
final Account.Type accountType = ldapTrustMapVO.getAccountType();
@@ -270,7 +271,7 @@ public class LdapAuthenticator extends AdapterBase implements UserAuthenticator
* @param password pass phrase
* @param domainId domain the user is trying to log on to
* @param user cloudstack user object
- * @return false if either user object does not exist or authenitication fails
+ * @return {false,<error-code>} if either user object does not exist or authentication fails
*/
Pair<Boolean, ActionOnFailedAuthentication> authenticate(String username, String password, Long domainId, UserAccount user) {
boolean result = false;
@@ -282,7 +283,7 @@ public class LdapAuthenticator extends AdapterBase implements UserAuthenticator
if (!ldapUser.isDisabled()) {
result = _ldapManager.canAuthenticate(ldapUser.getPrincipal(), password, domainId);
} else {
- logger.debug("user with principal "+ ldapUser.getPrincipal() + " is disabled in ldap");
+ logger.debug("user with principal {} is disabled in ldap", () -> ldapUser.getPrincipal());
}
} catch (NoLdapUserMatchingQueryException e) {
logger.debug(e.getMessage());
@@ -296,8 +297,8 @@ public class LdapAuthenticator extends AdapterBase implements UserAuthenticator
private Pair<Boolean, ActionOnFailedAuthentication> processResultAndAction(UserAccount user, boolean result, boolean timedOut) {
return (!result && (user != null || timedOut)) ?
- new Pair<Boolean, ActionOnFailedAuthentication>(result, ActionOnFailedAuthentication.INCREMENT_INCORRECT_LOGIN_ATTEMPT_COUNT):
- new Pair<Boolean, ActionOnFailedAuthentication>(result, null);
+ new Pair<>(false, ActionOnFailedAuthentication.INCREMENT_INCORRECT_LOGIN_ATTEMPT_COUNT):
+ new Pair<>(result, null);
}
private void enableUserInCloudStack(UserAccount user) {
diff --git a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapConfiguration.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapConfiguration.java
index 87ff2d0a2ac..114ca1631ec 100644
--- a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapConfiguration.java
+++ b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapConfiguration.java
@@ -23,7 +23,6 @@ import javax.naming.directory.SearchControls;
import org.apache.cloudstack.framework.config.ConfigKey;
import org.apache.cloudstack.framework.config.Configurable;
-import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import com.cloud.utils.Pair;
import org.apache.cloudstack.ldap.dao.LdapConfigurationDao;
@@ -34,7 +33,7 @@ public class LdapConfiguration implements Configurable{
private final static String factory = "com.sun.jndi.ldap.LdapCtxFactory";
protected Logger logger = LogManager.getLogger(getClass());
- private static final ConfigKey<Long> ldapReadTimeout = new ConfigKey<Long>(
+ private static final ConfigKey<Long> ldapReadTimeout = new ConfigKey<>(
Long.class,
"ldap.read.timeout",
"Advanced",
@@ -42,9 +41,9 @@ public class LdapConfiguration implements Configurable{
"LDAP connection Timeout in milli sec",
true,
ConfigKey.Scope.Domain,
- 1l);
+ 1L);
- private static final ConfigKey<Integer> ldapPageSize = new ConfigKey<Integer>(
+ private static final ConfigKey<Integer> ldapPageSize = new ConfigKey<>(
Integer.class,
"ldap.request.page.size",
"Advanced",
@@ -54,7 +53,7 @@ public class LdapConfiguration implements Configurable{
ConfigKey.Scope.Domain,
1);
- private static final ConfigKey<Boolean> ldapEnableNestedGroups = new ConfigKey<Boolean>(
+ private static final ConfigKey<Boolean> ldapEnableNestedGroups = new ConfigKey<>(
"Advanced",
Boolean.class,
"ldap.nested.groups.enable",
@@ -63,7 +62,7 @@ public class LdapConfiguration implements Configurable{
true,
ConfigKey.Scope.Domain);
- private static final ConfigKey<String> ldapMemberOfAttribute = new ConfigKey<String>(
+ private static final ConfigKey<String> ldapMemberOfAttribute = new ConfigKey<>(
"Advanced",
String.class,
"ldap.user.memberof.attribute",
@@ -72,7 +71,7 @@ public class LdapConfiguration implements Configurable{
true,
ConfigKey.Scope.Domain);
- private static final ConfigKey<String> ldapProvider = new ConfigKey<String>(
+ private static final ConfigKey<String> ldapProvider = new ConfigKey<>(
"Advanced",
String.class,
"ldap.provider",
@@ -81,7 +80,7 @@ public class LdapConfiguration implements Configurable{
true,
ConfigKey.Scope.Domain);
- private static final ConfigKey<String> ldapBaseDn = new ConfigKey<String>(
+ private static final ConfigKey<String> ldapBaseDn = new ConfigKey<>(
"Advanced",
String.class,
"ldap.basedn",
@@ -90,7 +89,7 @@ public class LdapConfiguration implements Configurable{
true,
ConfigKey.Scope.Domain);
- private static final ConfigKey<String> ldapBindPassword = new ConfigKey<String>(
+ private static final ConfigKey<String> ldapBindPassword = new ConfigKey<>(
"Secure",
String.class,
"ldap.bind.password",
@@ -98,7 +97,7 @@ public class LdapConfiguration implements Configurable{
"Sets the bind password for LDAP",
true,
ConfigKey.Scope.Domain);
- private static final ConfigKey<String> ldapBindPrincipal = new ConfigKey<String>(
+ private static final ConfigKey<String> ldapBindPrincipal = new ConfigKey<>(
"Secure",
String.class,
"ldap.bind.principal",
@@ -106,7 +105,7 @@ public class LdapConfiguration implements Configurable{
"Sets the bind principal for LDAP",
true,
ConfigKey.Scope.Domain);
- private static final ConfigKey<String> ldapEmailAttribute = new ConfigKey<String>(
+ private static final ConfigKey<String> ldapEmailAttribute = new ConfigKey<>(
"Advanced",
String.class,
"ldap.email.attribute",
@@ -114,7 +113,7 @@ public class LdapConfiguration implements Configurable{
"Sets the email attribute used within LDAP",
true,
ConfigKey.Scope.Domain);
- private static final ConfigKey<String> ldapFirstnameAttribute = new ConfigKey<String>(
+ private static final ConfigKey<String> ldapFirstnameAttribute = new ConfigKey<>(
"Advanced",
String.class,
"ldap.firstname.attribute",
@@ -122,14 +121,14 @@ public class LdapConfiguration implements Configurable{
"Sets the firstname attribute used within LDAP",
true,
ConfigKey.Scope.Domain);
- private static final ConfigKey<String> ldapLastnameAttribute = new ConfigKey<String>(
+ private static final ConfigKey<String> ldapLastnameAttribute = new ConfigKey<>(
"Advanced",
String.class, "ldap.lastname.attribute",
"sn",
"Sets the lastname attribute used within LDAP",
true,
ConfigKey.Scope.Domain);
- private static final ConfigKey<String> ldapUsernameAttribute = new ConfigKey<String>(
+ private static final ConfigKey<String> ldapUsernameAttribute = new ConfigKey<>(
"Advanced",
String.class,
"ldap.username.attribute",
@@ -137,7 +136,7 @@ public class LdapConfiguration implements Configurable{
"Sets the username attribute used within LDAP",
true,
ConfigKey.Scope.Domain);
- private static final ConfigKey<String> ldapUserObject = new ConfigKey<String>(
+ private static final ConfigKey<String> ldapUserObject = new ConfigKey<>(
"Advanced",
String.class,
"ldap.user.object",
@@ -145,7 +144,7 @@ public class LdapConfiguration implements Configurable{
"Sets the object type of users within LDAP",
true,
ConfigKey.Scope.Domain);
- private static final ConfigKey<String> ldapSearchGroupPrinciple = new ConfigKey<String>(
+ private static final ConfigKey<String> ldapSearchGroupPrinciple = new ConfigKey<>(
"Advanced",
String.class,
"ldap.search.group.principle",
@@ -153,7 +152,7 @@ public class LdapConfiguration implements Configurable{
"Sets the principle of the group that users must be a member of",
true,
ConfigKey.Scope.Domain);
- private static final ConfigKey<String> ldapGroupObject = new ConfigKey<String>(
+ private static final ConfigKey<String> ldapGroupObject = new ConfigKey<>(
"Advanced",
String.class,
"ldap.group.object",
@@ -161,7 +160,7 @@ public class LdapConfiguration implements Configurable{
"Sets the object type of groups within LDAP",
true,
ConfigKey.Scope.Domain);
- private static final ConfigKey<String> ldapGroupUniqueMemberAttribute = new ConfigKey<String>(
+ private static final ConfigKey<String> ldapGroupUniqueMemberAttribute = new ConfigKey<>(
"Advanced",
String.class,
"ldap.group.user.uniquemember",
@@ -170,7 +169,7 @@ public class LdapConfiguration implements Configurable{
true,
ConfigKey.Scope.Domain);
- private static final ConfigKey<String> ldapTrustStore = new ConfigKey<String>(
+ private static final ConfigKey<String> ldapTrustStore = new ConfigKey<>(
"Advanced",
String.class,
"ldap.truststore",
@@ -178,7 +177,7 @@ public class LdapConfiguration implements Configurable{
"Sets the path to the truststore to use for SSL",
true,
ConfigKey.Scope.Domain);
- private static final ConfigKey<String> ldapTrustStorePassword = new ConfigKey<String>(
+ private static final ConfigKey<String> ldapTrustStorePassword = new ConfigKey<>(
"Secure",
String.class,
"ldap.truststore.password",
@@ -199,11 +198,6 @@ public class LdapConfiguration implements Configurable{
_ldapConfigurationDao = ldapConfigurationDao;
}
- @Deprecated
- public LdapConfiguration(final ConfigurationDao configDao, final LdapConfigurationDao ldapConfigurationDao) {
- _ldapConfigurationDao = ldapConfigurationDao;
- }
-
public String getAuthentication(final Long domainId) {
if ((getBindPrincipal(domainId) == null) && (getBindPassword(domainId) == null)) {
return "none";
@@ -212,36 +206,36 @@ public class LdapConfiguration implements Configurable{
}
}
- public String getBaseDn(final Long domainId) {
+ public static String getBaseDn(final Long domainId) {
return ldapBaseDn.valueIn(domainId);
}
- public String getBindPassword(final Long domainId) {
+ public static String getBindPassword(final Long domainId) {
return ldapBindPassword.valueIn(domainId);
}
- public String getBindPrincipal(final Long domainId) {
+ public static String getBindPrincipal(final Long domainId) {
return ldapBindPrincipal.valueIn(domainId);
}
- public String getEmailAttribute(final Long domainId) {
+ public static String getEmailAttribute(final Long domainId) {
return ldapEmailAttribute.valueIn(domainId);
}
- public String getFactory() {
+ public static String getFactory() {
return factory;
}
- public String getFirstnameAttribute(final Long domainId) {
+ public static String getFirstnameAttribute(final Long domainId) {
return ldapFirstnameAttribute.valueIn(domainId);
}
- public String getLastnameAttribute(final Long domainId) {
+ public static String getLastnameAttribute(final Long domainId) {
return ldapLastnameAttribute.valueIn(domainId);
}
public String getProviderUrl(final Long domainId) {
- final String protocol = getSSLStatus(domainId) == true ? "ldaps://" : "ldap://";
+ final String protocol = getSSLStatus(domainId) ? "ldaps://" : "ldap://";
final Pair<List<LdapConfigurationVO>, Integer> result = _ldapConfigurationDao.searchConfigurations(null, 0, domainId);
final StringBuilder providerUrls = new StringBuilder();
String delim = "";
@@ -273,40 +267,36 @@ public class LdapConfiguration implements Configurable{
return ldapSearchGroupPrinciple.valueIn(domainId);
}
- public boolean getSSLStatus(Long domainId) {
- boolean sslStatus = false;
- if (getTrustStore(domainId) != null && getTrustStorePassword(domainId) != null) {
- sslStatus = true;
- }
- return sslStatus;
+ public static boolean getSSLStatus(Long domainId) {
+ return getTrustStore(domainId) != null && getTrustStorePassword(domainId) != null;
}
- public String getTrustStore(Long domainId) {
+ public static String getTrustStore(Long domainId) {
return ldapTrustStore.valueIn(domainId);
}
- public String getTrustStorePassword(Long domainId) {
+ public static String getTrustStorePassword(Long domainId) {
return ldapTrustStorePassword.valueIn(domainId);
}
- public String getUsernameAttribute(final Long domainId) {
+ public static String getUsernameAttribute(final Long domainId) {
return ldapUsernameAttribute.valueIn(domainId);
}
- public String getUserObject(final Long domainId) {
+ public static String getUserObject(final Long domainId) {
return ldapUserObject.valueIn(domainId);
}
- public String getGroupObject(final Long domainId) {
+ public static String getGroupObject(final Long domainId) {
return ldapGroupObject.valueIn(domainId);
}
- public String getGroupUniqueMemberAttribute(final Long domainId) {
+ public static String getGroupUniqueMemberAttribute(final Long domainId) {
return ldapGroupUniqueMemberAttribute.valueIn(domainId);
}
// TODO remove hard-coding
- public String getCommonNameAttribute() {
+ public static String getCommonNameAttribute() {
return "cn";
}
@@ -315,11 +305,11 @@ public class LdapConfiguration implements Configurable{
return "userAccountControl";
}
- public Long getReadTimeout(final Long domainId) {
+ public static Long getReadTimeout(final Long domainId) {
return ldapReadTimeout.valueIn(domainId);
}
- public Integer getLdapPageSize(final Long domainId) {
+ public static Integer getLdapPageSize(final Long domainId) {
return ldapPageSize.valueIn(domainId);
}
@@ -334,7 +324,7 @@ public class LdapConfiguration implements Configurable{
return provider;
}
- public boolean isNestedGroupsEnabled(final Long domainId) {
+ public static boolean isNestedGroupsEnabled(final Long domainId) {
return ldapEnableNestedGroups.valueIn(domainId);
}
diff --git a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapContextFactory.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapContextFactory.java
index 1c759c6a45e..34ebc7a4499 100644
--- a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapContextFactory.java
+++ b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapContextFactory.java
@@ -49,8 +49,8 @@ public class LdapContextFactory {
}
public LdapContext createBindContext(final String providerUrl, Long domainId) throws NamingException, IOException {
- final String bindPrincipal = _ldapConfiguration.getBindPrincipal(domainId);
- final String bindPassword = _ldapConfiguration.getBindPassword(domainId);
+ final String bindPrincipal = LdapConfiguration.getBindPrincipal(domainId);
+ final String bindPassword = LdapConfiguration.getBindPassword(domainId);
return createInitialDirContext(bindPrincipal, bindPassword, providerUrl, true, domainId);
}
@@ -70,13 +70,13 @@ public class LdapContextFactory {
}
private void enableSSL(final Hashtable<String, String> environment, Long domainId) {
- final boolean sslStatus = _ldapConfiguration.getSSLStatus(domainId);
+ final boolean sslStatus = LdapConfiguration.getSSLStatus(domainId);
if (sslStatus) {
logger.info("LDAP SSL enabled.");
environment.put(Context.SECURITY_PROTOCOL, "ssl");
- String trustStore = _ldapConfiguration.getTrustStore(domainId);
- String trustStorePassword = _ldapConfiguration.getTrustStorePassword(domainId);
+ String trustStore = LdapConfiguration.getTrustStore(domainId);
+ String trustStorePassword = LdapConfiguration.getTrustStorePassword(domainId);
if (!validateTrustStore(trustStore, trustStorePassword)) {
throw new RuntimeException("Invalid truststore or truststore password");
@@ -109,7 +109,7 @@ public class LdapContextFactory {
}
private Hashtable<String, String> getEnvironment(final String principal, final String password, final String providerUrl, final boolean isSystemContext, Long domainId) {
- final String factory = _ldapConfiguration.getFactory();
+ final String factory = LdapConfiguration.getFactory();
String url = providerUrl == null ? _ldapConfiguration.getProviderUrl(domainId) : providerUrl;
if (StringUtils.isEmpty(url) && domainId != null) {
//try a default ldap implementation
@@ -120,7 +120,7 @@ public class LdapContextFactory {
environment.put(Context.INITIAL_CONTEXT_FACTORY, factory);
environment.put(Context.PROVIDER_URL, url);
- environment.put("com.sun.jndi.ldap.read.timeout", _ldapConfiguration.getReadTimeout(domainId).toString());
+ environment.put("com.sun.jndi.ldap.read.timeout", LdapConfiguration.getReadTimeout(domainId).toString());
environment.put("com.sun.jndi.ldap.connect.pool", "true");
enableSSL(environment, domainId);
diff --git a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapManager.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapManager.java
index ded6e94c12a..07c995073e7 100644
--- a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapManager.java
+++ b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapManager.java
@@ -34,7 +34,7 @@ import org.apache.cloudstack.api.response.LinkDomainToLdapResponse;
public interface LdapManager extends PluggableService {
- enum LinkType { GROUP, OU;}
+ enum LinkType { GROUP, OU }
LdapConfigurationResponse addConfiguration(final LdapAddConfigurationCmd cmd) throws InvalidParameterValueException;
@@ -73,8 +73,6 @@ public interface LdapManager extends PluggableService {
List<LdapTrustMapVO> getDomainLinkage(long domainId);
- LdapTrustMapVO getAccountLinkedToLdap(long domainId, long accountId);
-
LdapTrustMapVO getLinkedLdapGroup(long domainId, String group);
LinkAccountToLdapResponse linkAccountToLdap(LinkAccountToLdapCmd linkAccountToLdapCmd);
diff --git a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapManagerImpl.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapManagerImpl.java
index abf47d4094e..ce3abccfafe 100644
--- a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapManagerImpl.java
+++ b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapManagerImpl.java
@@ -180,7 +180,7 @@ public class LdapManagerImpl extends ComponentLifecycleBase implements LdapManag
context = _ldapContextFactory.createBindContext(providerUrl,domainId);
configuration = new LdapConfigurationVO(hostname, port, domainId);
_ldapConfigurationDao.persist(configuration);
- logger.info("Added new ldap server with url: " + providerUrl + (domainId == null ? "": " for domain " + domainId));
+ logger.info("Added new ldap server with url: {}{}", providerUrl, domainId == null ? "" : " for domain " + domainId);
return createLdapConfigurationResponse(configuration);
} catch (NamingException | IOException e) {
logger.debug("NamingException while doing an LDAP bind", e);
@@ -211,13 +211,11 @@ public class LdapManagerImpl extends ComponentLifecycleBase implements LdapManag
// TODO return the right account for this user
final LdapContext context = _ldapContextFactory.createUserContext(principal, password, domainId);
closeContext(context);
- if (logger.isTraceEnabled()) {
- logger.trace(String.format("User(%s) authenticated for domain(%s)", principal, domainId));
- }
+ logger.trace("User({}) authenticated for domain({})", principal, domainId);
return true;
} catch (NamingException | IOException e) {/* AuthenticationException is caught as NamingException */
- logger.debug("Exception while doing an LDAP bind for user "+" "+principal, e);
- logger.info("Failed to authenticate user: " + principal + ". incorrect password.");
+ logger.debug("Exception while doing an LDAP bind for user {}", principal, e);
+ logger.info("Failed to authenticate user: {}. incorrect password.", principal);
return false;
}
}
@@ -285,14 +283,14 @@ public class LdapManagerImpl extends ComponentLifecycleBase implements LdapManag
throw new InvalidParameterValueException("Cannot find configuration with hostname " + hostname);
} else {
_ldapConfigurationDao.remove(configuration.getId());
- logger.info("Removed ldap server with url: " + hostname + ':' + port + (domainId == null ? "" : " for domain id " + domainId));
+ logger.info("Removed ldap server with url: {}:{}{}", hostname, port, domainId == null ? "" : " for domain id " + domainId);
return createLdapConfigurationResponse(configuration);
}
}
@Override
public List<Class<?>> getCommands() {
- final List<Class<?>> cmdList = new ArrayList<Class<?>>();
+ final List<Class<?>> cmdList = new ArrayList<>();
cmdList.add(LdapUserSearchCmd.class);
cmdList.add(LdapListUsersCmd.class);
cmdList.add(LdapAddConfigurationCmd.class);
@@ -393,7 +391,7 @@ public class LdapManagerImpl extends ComponentLifecycleBase implements LdapManag
final boolean listAll = cmd.listAll();
final Long id = cmd.getId();
final Pair<List<LdapConfigurationVO>, Integer> result = _ldapConfigurationDao.searchConfigurations(id, hostname, port, domainId, listAll);
- return new Pair<List<? extends LdapConfigurationVO>, Integer>(result.first(), result.second());
+ return new Pair<>(result.first(), result.second());
}
@Override
@@ -415,7 +413,7 @@ public class LdapManagerImpl extends ComponentLifecycleBase implements LdapManag
@Override
public LinkDomainToLdapResponse linkDomainToLdap(LinkDomainToLdapCmd cmd) {
final Long domainId = cmd.getDomainId();
- final String baseDn = _ldapConfiguration.getBaseDn(domainId);
+ final String baseDn = LdapConfiguration.getBaseDn(domainId);
final String ldapDomain = cmd.getLdapDomain();
Validate.isTrue(baseDn != null, String.format("can not link a domain (with id = %d) unless a basedn (%s) is configured for it.", domainId, baseDn));
@@ -432,14 +430,18 @@ public class LdapManagerImpl extends ComponentLifecycleBase implements LdapManag
LinkType linkType = LdapManager.LinkType.valueOf(type.toUpperCase());
LdapTrustMapVO vo = _ldapTrustMapDao.persist(new LdapTrustMapVO(domainId, linkType, name, accountType, 0));
DomainVO domain = domainDao.findById(vo.getDomainId());
+ String domainUuid = getDomainUuid(domain, vo);
+ return new LinkDomainToLdapResponse(domainUuid, vo.getType().toString(), vo.getName(), vo.getAccountType().ordinal());
+ }
+
+ private String getDomainUuid(DomainVO domain, LdapTrustMapVO vo) {
String domainUuid = "<unknown>";
if (domain == null) {
- logger.error("no domain in database for id " + vo.getDomainId());
+ logger.error("no domain in database for id {}", vo.getDomainId());
} else {
domainUuid = domain.getUuid();
}
- LinkDomainToLdapResponse response = new LinkDomainToLdapResponse(domainUuid, vo.getType().toString(), vo.getName(), vo.getAccountType().ordinal());
- return response;
+ return domainUuid;
}
@Override
@@ -452,10 +454,6 @@ public class LdapManagerImpl extends ComponentLifecycleBase implements LdapManag
return _ldapTrustMapDao.searchByDomainId(domainId);
}
- public LdapTrustMapVO getAccountLinkedToLdap(long domainId, long accountId){
- return _ldapTrustMapDao.findByAccount(domainId, accountId);
- }
-
@Override
public LdapTrustMapVO getLinkedLdapGroup(long domainId, String group) {
return _ldapTrustMapDao.findGroupInDomain(domainId, group);
@@ -463,7 +461,7 @@ public class LdapManagerImpl extends ComponentLifecycleBase implements LdapManag
@Override
public LinkAccountToLdapResponse linkAccountToLdap(LinkAccountToLdapCmd cmd) {
- Validate.notNull(_ldapConfiguration.getBaseDn(cmd.getDomainId()), "can not link an account to ldap in a domain for which no basdn is configured");
+ Validate.notNull(LdapConfiguration.getBaseDn(cmd.getDomainId()), "can not link an account to ldap in a domain for which no basdn is configured");
Validate.notNull(cmd.getDomainId(), "domainId cannot be null.");
Validate.notEmpty(cmd.getAccountName(), "accountName cannot be empty.");
Validate.notEmpty(cmd.getLdapDomain(), "ldapDomain cannot be empty, please supply a GROUP or OU name");
@@ -478,19 +476,13 @@ public class LdapManagerImpl extends ComponentLifecycleBase implements LdapManag
accountDao.persist((AccountVO)account);
}
- Long accountId = account.getAccountId();
+ long accountId = account.getAccountId();
clearOldAccountMapping(cmd);
LdapTrustMapVO vo = _ldapTrustMapDao.persist(new LdapTrustMapVO(cmd.getDomainId(), linkType, cmd.getLdapDomain(), cmd.getAccountType(), accountId));
DomainVO domain = domainDao.findById(vo.getDomainId());
- String domainUuid = "<unknown>";
- if (domain == null) {
- logger.error("no domain in database for id " + vo.getDomainId());
- } else {
- domainUuid = domain.getUuid();
- }
+ String domainUuid = getDomainUuid(domain, vo);
- LinkAccountToLdapResponse response = new LinkAccountToLdapResponse(domainUuid, vo.getType().toString(), vo.getName(), vo.getAccountType().ordinal(), account.getUuid(), cmd.getAccountName());
- return response;
+ return new LinkAccountToLdapResponse(domainUuid, vo.getType().toString(), vo.getName(), vo.getAccountType().ordinal(), account.getUuid(), cmd.getAccountName());
}
private void clearOldAccountMapping(LinkAccountToLdapCmd cmd) {
@@ -498,7 +490,7 @@ public class LdapManagerImpl extends ComponentLifecycleBase implements LdapManag
LdapTrustMapVO oldVo = _ldapTrustMapDao.findGroupInDomain(cmd.getDomainId(), cmd.getLdapDomain());
if (oldVo != null) {
// deal with edge cases, i.e. check if the old account is indeed deleted etc.
- if (oldVo.getAccountId() != 0l) {
+ if (oldVo.getAccountId() != 0L) {
AccountVO oldAcount = accountDao.findByIdIncludingRemoved(oldVo.getAccountId());
String msg = String.format("group %s is mapped to account %d in the current domain (%s)", cmd.getLdapDomain(), oldVo.getAccountId(), cmd.getDomainId());
if (null == oldAcount.getRemoved()) {
diff --git a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapTrustMapVO.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapTrustMapVO.java
index 27125998e4c..c04c16a71ca 100644
--- a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapTrustMapVO.java
+++ b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapTrustMapVO.java
@@ -123,8 +123,8 @@ public class LdapTrustMapVO implements InternalIdentity {
public int hashCode() {
int result = type.hashCode();
result = 31 * result + name.hashCode();
- result = 31 * result + (int) (domainId ^ (domainId >>> 32));
- result = 31 * result + (int) (accountId ^ (accountId >>> 32));
+ result = 31 * result + Long.hashCode(domainId);
+ result = 31 * result + Long.hashCode(accountId);
result = 31 * result + accountType.ordinal();
return result;
}
diff --git a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapUser.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapUser.java
index d2b58656dc5..20b13ff70a8 100644
--- a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapUser.java
+++ b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapUser.java
@@ -27,7 +27,7 @@ public class LdapUser implements Comparable<LdapUser> {
private final String username;
private final String domain;
private final boolean disabled;
- private List<String> memberships;
+ private final List<String> memberships;
public LdapUser(final String username, final String email, final String firstname, final String lastname, final String principal, String domain, boolean disabled,
List<String> memberships) {
diff --git a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapUserManager.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapUserManager.java
index c9fcaa23cc0..e9c7db093da 100644
--- a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapUserManager.java
+++ b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/LdapUserManager.java
@@ -26,21 +26,21 @@ import javax.naming.ldap.LdapContext;
public interface LdapUserManager {
- public enum Provider {
- MICROSOFTAD, OPENLDAP;
+ enum Provider {
+ MICROSOFTAD, OPENLDAP
}
- public LdapUser getUser(final String username, final LdapContext context, Long domainId) throws NamingException, IOException;
+ LdapUser getUser(final String username, final LdapContext context, Long domainId) throws NamingException, IOException;
- public LdapUser getUser(final String username, final String type, final String name, final LdapContext context, Long domainId) throws NamingException, IOException;
+ LdapUser getUser(final String username, final String type, final String name, final LdapContext context, Long domainId) throws NamingException, IOException;
- public List<LdapUser> getUsers(final LdapContext context, Long domainId) throws NamingException, IOException;
+ List<LdapUser> getUsers(final LdapContext context, Long domainId) throws NamingException, IOException;
- public List<LdapUser> getUsers(final String username, final LdapContext context, Long domainId) throws NamingException, IOException;
+ List<LdapUser> getUsers(final String username, final LdapContext context, Long domainId) throws NamingException, IOException;
- public List<LdapUser> getUsersInGroup(String groupName, LdapContext context, Long domainId) throws NamingException;
+ List<LdapUser> getUsersInGroup(String groupName, LdapContext context, Long domainId) throws NamingException;
- public List<LdapUser> searchUsers(final LdapContext context, Long domainId) throws NamingException, IOException;
+ List<LdapUser> searchUsers(final LdapContext context, Long domainId) throws NamingException, IOException;
- public List<LdapUser> searchUsers(final String username, final LdapContext context, Long domainId) throws NamingException, IOException;
+ List<LdapUser> searchUsers(final String username, final LdapContext context, Long domainId) throws NamingException, IOException;
}
diff --git a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/OpenLdapUserManagerImpl.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/OpenLdapUserManagerImpl.java
index d0b6bc4bd34..22cb71e41a4 100644
--- a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/OpenLdapUserManagerImpl.java
+++ b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/OpenLdapUserManagerImpl.java
@@ -58,15 +58,15 @@ public class OpenLdapUserManagerImpl implements LdapUserManager {
protected LdapUser createUser(final SearchResult result, Long domainId) throws NamingException {
final Attributes attributes = result.getAttributes();
- final String username = LdapUtils.getAttributeValue(attributes, _ldapConfiguration.getUsernameAttribute(domainId));
- final String email = LdapUtils.getAttributeValue(attributes, _ldapConfiguration.getEmailAttribute(domainId));
- final String firstname = LdapUtils.getAttributeValue(attributes, _ldapConfiguration.getFirstnameAttribute(domainId));
- final String lastname = LdapUtils.getAttributeValue(attributes, _ldapConfiguration.getLastnameAttribute(domainId));
+ final String username = LdapUtils.getAttributeValue(attributes, LdapConfiguration.getUsernameAttribute(domainId));
+ final String email = LdapUtils.getAttributeValue(attributes, LdapConfiguration.getEmailAttribute(domainId));
+ final String firstname = LdapUtils.getAttributeValue(attributes, LdapConfiguration.getFirstnameAttribute(domainId));
+ final String lastname = LdapUtils.getAttributeValue(attributes, LdapConfiguration.getLastnameAttribute(domainId));
final String principal = result.getNameInNamespace();
final List<String> memberships = LdapUtils.getAttributeValues(attributes, getMemberOfAttribute(domainId));
String domain = principal.replace("cn=" + LdapUtils.getAttributeValue(attributes, _ldapConfiguration.getCommonNameAttribute()) + ",", "");
- domain = domain.replace("," + _ldapConfiguration.getBaseDn(domainId), "");
+ domain = domain.replace("," + LdapConfiguration.getBaseDn(domainId), "");
domain = domain.replace("ou=", "");
boolean disabled = isUserDisabled(result);
@@ -75,23 +75,21 @@ public class OpenLdapUserManagerImpl implements LdapUserManager {
}
private String generateSearchFilter(final String username, Long domainId) {
- final StringBuilder userObjectFilter = new StringBuilder();
- userObjectFilter.append("(objectClass=");
- userObjectFilter.append(_ldapConfiguration.getUserObject(domainId));
- userObjectFilter.append(")");
-
- final StringBuilder usernameFilter = new StringBuilder();
- usernameFilter.append("(");
- usernameFilter.append(_ldapConfiguration.getUsernameAttribute(domainId));
- usernameFilter.append("=");
- usernameFilter.append((username == null ? "*" : LdapUtils.escapeLDAPSearchFilter(username)));
- usernameFilter.append(")");
+ String userObjectFilter = "(objectClass=" +
+ LdapConfiguration.getUserObject(domainId) +
+ ")";
+
+ String usernameFilter = "(" +
+ LdapConfiguration.getUsernameAttribute(domainId) +
+ "=" +
+ (username == null ? "*" : LdapUtils.escapeLDAPSearchFilter(username)) +
+ ")";
String memberOfAttribute = getMemberOfAttribute(domainId);
StringBuilder ldapGroupsFilter = new StringBuilder();
// this should get the trustmaps for this domain
List<String> ldapGroups = getMappedLdapGroups(domainId);
- if (null != ldapGroups && ldapGroups.size() > 0) {
+ if (CollectionUtils.isNotEmpty(ldapGroups)) {
ldapGroupsFilter.append("(|");
for (String ldapGroup : ldapGroups) {
ldapGroupsFilter.append(getMemberOfGroupString(ldapGroup, memberOfAttribute));
@@ -104,17 +102,15 @@ public class OpenLdapUserManagerImpl implements LdapUserManager {
if (null != pricipleGroup) {
principleGroupFilter.append(getMemberOfGroupString(pricipleGroup, memberOfAttribute));
}
- final StringBuilder result = new StringBuilder();
- result.append("(&");
- result.append(userObjectFilter);
- result.append(usernameFilter);
- result.append(ldapGroupsFilter);
- result.append(principleGroupFilter);
- result.append(")");
-
- String returnString = result.toString();
+
+ String returnString = "(&" +
+ userObjectFilter +
+ usernameFilter +
+ ldapGroupsFilter +
+ principleGroupFilter +
+ ")";
if (logger.isTraceEnabled()) {
- logger.trace("constructed ldap query: " + returnString);
+ logger.trace("constructed ldap query: {}", returnString);
}
return returnString;
}
@@ -135,10 +131,9 @@ public class OpenLdapUserManagerImpl implements LdapUserManager {
final StringBuilder memberOfFilter = new StringBuilder();
if (null != group) {
if(logger.isDebugEnabled()) {
- logger.debug("adding search filter for '" + group +
- "', using '" + memberOfAttribute + "'");
+ logger.debug("adding search filter for '{}', using '{}'", group, memberOfAttribute);
}
- memberOfFilter.append("(" + memberOfAttribute + "=");
+ memberOfFilter.append("(").append(memberOfAttribute).append("=");
memberOfFilter.append(group);
memberOfFilter.append(")");
}
@@ -146,25 +141,20 @@ public class OpenLdapUserManagerImpl implements LdapUserManager {
}
private String generateGroupSearchFilter(final String groupName, Long domainId) {
- final StringBuilder groupObjectFilter = new StringBuilder();
- groupObjectFilter.append("(objectClass=");
- groupObjectFilter.append(_ldapConfiguration.getGroupObject(domainId));
- groupObjectFilter.append(")");
-
- final StringBuilder groupNameFilter = new StringBuilder();
- groupNameFilter.append("(");
- groupNameFilter.append(_ldapConfiguration.getCommonNameAttribute());
- groupNameFilter.append("=");
- groupNameFilter.append((groupName == null ? "*" : LdapUtils.escapeLDAPSearchFilter(groupName)));
- groupNameFilter.append(")");
-
- final StringBuilder result = new StringBuilder();
- result.append("(&");
- result.append(groupObjectFilter);
- result.append(groupNameFilter);
- result.append(")");
-
- return result.toString();
+ String groupObjectFilter = "(objectClass=" +
+ LdapConfiguration.getGroupObject(domainId) +
+ ")";
+
+ String groupNameFilter = "(" +
+ _ldapConfiguration.getCommonNameAttribute() +
+ "=" +
+ (groupName == null ? "*" : LdapUtils.escapeLDAPSearchFilter(groupName)) +
+ ")";
+
+ return "(&" +
+ groupObjectFilter +
+ groupNameFilter +
+ ")";
}
@Override
@@ -183,20 +173,18 @@ public class OpenLdapUserManagerImpl implements LdapUserManager {
if("OU".equals(type)) {
basedn = name;
} else {
- basedn = _ldapConfiguration.getBaseDn(domainId);
+ basedn = LdapConfiguration.getBaseDn(domainId);
}
- final StringBuilder userObjectFilter = new StringBuilder();
- userObjectFilter.append("(objectClass=");
- userObjectFilter.append(_ldapConfiguration.getUserObject(domainId));
- userObjectFilter.append(")");
+ String userObjectFilter = "(objectClass=" +
+ LdapConfiguration.getUserObject(domainId) +
+ ")";
- final StringBuilder usernameFilter = new StringBuilder();
- usernameFilter.append("(");
- usernameFilter.append(_ldapConfiguration.getUsernameAttribute(domainId));
- usernameFilter.append("=");
- usernameFilter.append((username == null ? "*" : LdapUtils.escapeLDAPSearchFilter(username)));
- usernameFilter.append(")");
+ String usernameFilter = "(" +
+ LdapConfiguration.getUsernameAttribute(domainId) +
+ "=" +
+ (username == null ? "*" : LdapUtils.escapeLDAPSearchFilter(username)) +
+ ")";
final StringBuilder memberOfFilter = new StringBuilder();
if ("GROUP".equals(type)) {
@@ -205,18 +193,17 @@ public class OpenLdapUserManagerImpl implements LdapUserManager {
memberOfFilter.append(")");
}
- final StringBuilder searchQuery = new StringBuilder();
- searchQuery.append("(&");
- searchQuery.append(userObjectFilter);
- searchQuery.append(usernameFilter);
- searchQuery.append(memberOfFilter);
- searchQuery.append(")");
+ String searchQuery = "(&" +
+ userObjectFilter +
+ usernameFilter +
+ memberOfFilter +
+ ")";
- return searchUser(basedn, searchQuery.toString(), context, domainId);
+ return searchUser(basedn, searchQuery, context, domainId);
}
protected String getMemberOfAttribute(final Long domainId) {
- return _ldapConfiguration.getUserMemberOfAttribute(domainId);
+ return LdapConfiguration.getUserMemberOfAttribute(domainId);
}
@Override
@@ -236,14 +223,14 @@ public class OpenLdapUserManagerImpl implements LdapUserManager {
@Override
public List<LdapUser> getUsersInGroup(String groupName, LdapContext context, Long domainId) throws NamingException {
- String attributeName = _ldapConfiguration.getGroupUniqueMemberAttribute(domainId);
+ String attributeName = LdapConfiguration.getGroupUniqueMemberAttribute(domainId);
final SearchControls controls = new SearchControls();
controls.setSearchScope(_ldapConfiguration.getScope());
controls.setReturningAttributes(new String[] {attributeName});
- NamingEnumeration<SearchResult> result = context.search(_ldapConfiguration.getBaseDn(domainId), generateGroupSearchFilter(groupName, domainId), controls);
+ NamingEnumeration<SearchResult> result = context.search(LdapConfiguration.getBaseDn(domainId), generateGroupSearchFilter(groupName, domainId), controls);
- final List<LdapUser> users = new ArrayList<LdapUser>();
+ final List<LdapUser> users = new ArrayList<>();
//Expecting only one result which has all the users
if (result.hasMoreElements()) {
Attribute attribute = result.nextElement().getAttributes().get(attributeName);
@@ -254,7 +241,7 @@ public class OpenLdapUserManagerImpl implements LdapUserManager {
try{
users.add(getUserForDn(userdn, context, domainId));
} catch (NamingException e){
- logger.info("Userdn: " + userdn + " Not Found:: Exception message: " + e.getMessage());
+ logger.info("Userdn: {} Not Found:: Exception message: {}", userdn, e.getMessage());
}
}
}
@@ -269,7 +256,7 @@ public class OpenLdapUserManagerImpl implements LdapUserManager {
controls.setSearchScope(_ldapConfiguration.getScope());
controls.setReturningAttributes(_ldapConfiguration.getReturnAttributes(domainId));
- NamingEnumeration<SearchResult> result = context.search(userdn, "(objectClass=" + _ldapConfiguration.getUserObject(domainId) + ")", controls);
+ NamingEnumeration<SearchResult> result = context.search(userdn, "(objectClass=" + LdapConfiguration.getUserObject(domainId) + ")", controls);
if (result.hasMoreElements()) {
return createUser(result.nextElement(), domainId);
} else {
@@ -286,7 +273,7 @@ public class OpenLdapUserManagerImpl implements LdapUserManager {
return false;
}
- public LdapUser searchUser(final String basedn, final String searchString, final LdapContext context, Long domainId) throws NamingException, IOException {
+ public LdapUser searchUser(final String basedn, final String searchString, final LdapContext context, Long domainId) throws NamingException {
final SearchControls searchControls = new SearchControls();
searchControls.setSearchScope(_ldapConfiguration.getScope());
@@ -294,9 +281,9 @@ public class OpenLdapUserManagerImpl implements LdapUserManager {
NamingEnumeration<SearchResult> results = context.search(basedn, searchString, searchControls);
if(logger.isDebugEnabled()) {
- logger.debug("searching user(s) with filter: \"" + searchString + "\"");
+ logger.debug("searching user(s) with filter: \"{}\"", searchString);
}
- final List<LdapUser> users = new ArrayList<LdapUser>();
+ final List<LdapUser> users = new ArrayList<>();
while (results.hasMoreElements()) {
final SearchResult result = results.nextElement();
users.add(createUser(result, domainId));
@@ -317,14 +304,14 @@ public class OpenLdapUserManagerImpl implements LdapUserManager {
searchControls.setSearchScope(_ldapConfiguration.getScope());
searchControls.setReturningAttributes(_ldapConfiguration.getReturnAttributes(domainId));
- String basedn = _ldapConfiguration.getBaseDn(domainId);
+ String basedn = LdapConfiguration.getBaseDn(domainId);
if (StringUtils.isBlank(basedn)) {
throw new IllegalArgumentException(String.format("ldap basedn is not configured (for domain: %s)", domainId));
}
byte[] cookie = null;
- int pageSize = _ldapConfiguration.getLdapPageSize(domainId);
+ int pageSize = LdapConfiguration.getLdapPageSize(domainId);
context.setRequestControls(new Control[]{new PagedResultsControl(pageSize, Control.NONCRITICAL)});
- final List<LdapUser> users = new ArrayList<LdapUser>();
+ final List<LdapUser> users = new ArrayList<>();
NamingEnumeration<SearchResult> results;
do {
results = context.search(basedn, generateSearchFilter(username, domainId), searchControls);
diff --git a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/dao/LdapConfigurationDao.java b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/dao/LdapConfigurationDao.java
index 889efa3ef90..68deba215b1 100644
--- a/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/dao/LdapConfigurationDao.java
+++ b/plugins/user-authenticators/ldap/src/main/java/org/apache/cloudstack/ldap/dao/LdapConfigurationDao.java
@@ -29,16 +29,14 @@ import com.cloud.utils.db.GenericDao;
public interface LdapConfigurationDao extends GenericDao<LdapConfigurationVO, Long> {
/**
* @deprecated there might well be more then one ldap implementation on a host and or a double binding of several domains
- * @param hostname
- * @return
+ * @param hostname the hostname or ip address of the ldap server
+ * @return the ldap configuration for the given hostname
*/
@Deprecated
LdapConfigurationVO findByHostname(String hostname);
LdapConfigurationVO find(String hostname, int port, Long domainId);
- LdapConfigurationVO find(String hostname, int port, Long domainId, boolean listAll);
-
Pair<List<LdapConfigurationVO>, Integer> searchConfigurations(String hostname, int port, Long domainId);
Pair<List<LdapConfigurationVO>, Integer> searchConfigurations(Long id, String hostname, int port, Long domainId, boolean listAll);
diff --git a/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/api/command/LdapListUsersCmdTest.java b/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/api/command/LdapListUsersCmdTest.java
index bd55926e8e0..6af40c5df40 100644
--- a/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/api/command/LdapListUsersCmdTest.java
+++ b/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/api/command/LdapListUsersCmdTest.java
@@ -167,7 +167,7 @@ public class LdapListUsersCmdTest implements LdapConfigurationChanger {
LdapUser ldapUser = new LdapUser("rmurphy", "rmurphy@cloudstack.org", "Ryan", "Murphy", "cn=rmurphy,dc=cloudstack,dc=org", null, false, null);
- boolean result = ldapListUsersCmd.isACloudstackUser(ldapUser);
+ boolean result = ldapListUsersCmd.isACloudStackUser(ldapUser);
assertTrue(result);
}
@@ -183,7 +183,7 @@ public class LdapListUsersCmdTest implements LdapConfigurationChanger {
LdapUser ldapUser = new LdapUser("rmurphy", "rmurphy@cloudstack.org", "Ryan", "Murphy", "cn=rmurphy,dc=cloudstack,dc=org", null, false, null);
- boolean result = ldapListUsersCmd.isACloudstackUser(ldapUser);
+ boolean result = ldapListUsersCmd.isACloudStackUser(ldapUser);
assertFalse(result);
}
diff --git a/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/api/command/LinkAccountToLdapCmdTest.java b/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/api/command/LinkAccountToLdapCmdTest.java
index adf0f98f294..e616bd57378 100644
--- a/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/api/command/LinkAccountToLdapCmdTest.java
+++ b/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/api/command/LinkAccountToLdapCmdTest.java
@@ -98,5 +98,6 @@ public class LinkAccountToLdapCmdTest implements LdapConfigurationChanger {
assertEquals("type", type, result.getType());
assertEquals("name", ldapDomain, result.getLdapDomain());
assertEquals("accountId", String.valueOf(accountId), result.getAdminId());
+ assertEquals("accountName", String.valueOf(accountName), result.getAccountName());
}
}
diff --git a/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/ADLdapUserManagerImplTest.java b/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/ADLdapUserManagerImplTest.java
index 58b14ec3684..3044fb26134 100644
--- a/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/ADLdapUserManagerImplTest.java
+++ b/plugins/user-authenticators/ldap/src/test/java/org/apache/cloudstack/ldap/ADLdapUserManagerImplTest.java
@@ -16,17 +16,21 @@
// under the License.
package org.apache.cloudstack.ldap;
+import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
+import org.mockito.MockedStatic;
+import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
import javax.naming.directory.SearchControls;
import javax.naming.ldap.LdapContext;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.lenient;
import static org.mockito.Mockito.when;
@@ -35,41 +39,47 @@ public class ADLdapUserManagerImplTest {
ADLdapUserManagerImpl adLdapUserManager;
+ MockedStatic<LdapConfiguration> LdapConfiguration;
@Mock
- LdapConfiguration ldapConfiguration;
+ LdapConfiguration ldapConfigurationMock;
@Before
- public void init() throws Exception {
+ public void init() {
+ LdapConfiguration = Mockito.mockStatic(LdapConfiguration.class,Mockito.CALLS_REAL_METHODS);
adLdapUserManager = new ADLdapUserManagerImpl();
- adLdapUserManager._ldapConfiguration = ldapConfiguration;
+ adLdapUserManager._ldapConfiguration = ldapConfigurationMock;
}
+ @After
+ public void afterEach() {
+ LdapConfiguration.close();
+ }
@Test
public void testGenerateADSearchFilterWithNestedGroupsEnabled() {
- when(ldapConfiguration.getUserObject(any())).thenReturn("user");
- when(ldapConfiguration.getCommonNameAttribute()).thenReturn("CN");
- when(ldapConfiguration.getBaseDn(any())).thenReturn("DC=cloud,DC=citrix,DC=com");
- when(ldapConfiguration.isNestedGroupsEnabled(any())).thenReturn(true);
+ when(adLdapUserManager._ldapConfiguration.getUserObject(anyLong())).thenReturn("user");
+ when(adLdapUserManager._ldapConfiguration.getCommonNameAttribute()).thenReturn("CN");
+ when(adLdapUserManager._ldapConfiguration.getBaseDn(any())).thenReturn("DC=cloud,DC=citrix,DC=com");
+ when(adLdapUserManager._ldapConfiguration.isNestedGroupsEnabled(anyLong())).thenReturn(true);
String [] groups = {"dev", "dev-hyd"};
for (String group: groups) {
String result = adLdapUserManager.generateADGroupSearchFilter(group, 1L);
- assertTrue(("(&(objectClass=user)(memberOf:1.2.840.113556.1.4.1941:=CN=" + group + ",DC=cloud,DC=citrix,DC=com))").equals(result));
+ assertEquals(("(&(objectClass=user)(memberOf:1.2.840.113556.1.4.1941:=CN=" + group + ",DC=cloud,DC=citrix,DC=com))"), result);
}
}
@Test
public void testGenerateADSearchFilterWithNestedGroupsDisabled() {
- when(ldapConfiguration.getUserObject(any())).thenReturn("user");
- when(ldapConfiguration.getCommonNameAttribute()).thenReturn("CN");
- when(ldapConfiguration.getBaseDn(any())).thenReturn("DC=cloud,DC=citrix,DC=com");
- when(ldapConfiguration.isNestedGroupsEnabled(any())).thenReturn(false);
+ when(adLdapUserManager._ldapConfiguration.getUserObject(anyLong())).thenReturn("user");
+ when(adLdapUserManager._ldapConfiguration.getCommonNameAttribute()).thenReturn("CN");
+ when(adLdapUserManager._ldapConfiguration.getBaseDn(anyLong())).thenReturn("DC=cloud,DC=citrix,DC=com");
+ when(adLdapUserManager._ldapConfiguration.isNestedGroupsEnabled(anyLong())).thenReturn(false);
String [] groups = {"dev", "dev-hyd"};
for (String group: groups) {
String result = adLdapUserManager.generateADGroupSearchFilter(group, 1L);
- assertTrue(("(&(objectClass=user)(memberOf=CN=" + group + ",DC=cloud,DC=citrix,DC=com))").equals(result));
+ assertEquals(("(&(objectClass=user)(memberOf=CN=" + group + ",DC=cloud,DC=citrix,DC=com))"), result);
}
}
@@ -79,9 +89,9 @@ public class ADLdapUserManagerImplTest {
@Test(expected = IllegalArgumentException.class)
public void testGetUsersInGroupUsingNullGroup() throws Exception {
String[] returnAttributes = {"username", "firstname", "lastname", "email"};
- lenient().when(ldapConfiguration.getScope()).thenReturn(SearchControls.SUBTREE_SCOPE);
- lenient().when(ldapConfiguration.getReturnAttributes(null)).thenReturn(returnAttributes);
- lenient().when(ldapConfiguration.getBaseDn(any())).thenReturn(null).thenReturn(null).thenReturn("DC=cloud,DC=citrix,DC=com");
+ lenient().when(adLdapUserManager._ldapConfiguration.getScope()).thenReturn(SearchControls.SUBTREE_SCOPE);
+ lenient().when(adLdapUserManager._ldapConfiguration.getReturnAttributes(null)).thenReturn(returnAttributes);
+ lenient().when(adLdapUserManager._ldapConfiguration.getBaseDn(any())).thenReturn(null).thenReturn(null).thenReturn("DC=cloud,DC=citrix,DC=com");
LdapContext context = ldapContext;
String [] groups = {null, "group", null};