Skip to content

CLOUDSTACK-9971: Bugfix/listaccounts parameter consistency #2156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yadvr merged 1 commit into from
Jan 3, 2018
Merged

CLOUDSTACK-9971: Bugfix/listaccounts parameter consistency #2156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions engine/schema/src/com/cloud/user/dao/AccountDao.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@
// under the License.
package com.cloud.user.dao;

import java.util.Date;
import java.util.List;

import com.cloud.user.Account;
import com.cloud.user.AccountVO;
import com.cloud.user.User;
import com.cloud.utils.Pair;
import com.cloud.utils.db.Filter;
import com.cloud.utils.db.GenericDao;

import java.util.Date;
import java.util.List;

public interface AccountDao extends GenericDao<AccountVO, Long> {
Pair<User, Account> findUserAccountByApiKey(String apiKey);

Expand Down Expand Up @@ -60,6 +60,8 @@ public interface AccountDao extends GenericDao<AccountVO, Long> {
//returns only non-removed account
Account findActiveAccount(String accountName, Long domainId);

Account findActiveAccountById(Long accountId, Long domainId);

Account findActiveNonProjectAccount(String accountName, Long domainId);

List<Long> getAccountIdsForDomains(List<Long> ids);
Expand Down
23 changes: 14 additions & 9 deletions engine/schema/src/com/cloud/user/dao/AccountDaoImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,6 @@
// under the License.
package com.cloud.user.dao;

import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.Date;
import java.util.List;


import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;

import com.cloud.user.Account;
import com.cloud.user.Account.State;
import com.cloud.user.AccountVO;
Expand All @@ -39,6 +30,13 @@
import com.cloud.utils.db.SearchCriteria;
import com.cloud.utils.db.SearchCriteria.Op;
import com.cloud.utils.db.TransactionLegacy;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;

import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.Date;
import java.util.List;

@Component
public class AccountDaoImpl extends GenericDaoBase<AccountVO, Long> implements AccountDao {
Expand Down Expand Up @@ -182,6 +180,13 @@ public Account findActiveAccount(String accountName, Long domainId) {
return findOneBy(sc);
}

@Override
public Account findActiveAccountById(Long accountId, Long domainId) {
SearchCriteria<AccountVO> sc = AllFieldsSearch.create("id", accountId);
sc.setParameters("domainId", domainId);
return findOneBy(sc);
}

@Override
public Account findActiveNonProjectAccount(String accountName, Long domainId) {
SearchCriteria<AccountVO> sc = NonProjectAccountSearch.create("accountName", accountName);
Expand Down
80 changes: 47 additions & 33 deletions server/src/com/cloud/api/query/QueryManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1953,47 +1953,58 @@ private Pair<List<AccountJoinVO>, Integer> searchForAccountsInternal(ListAccount
String accountName = cmd.getSearchName();
boolean isRecursive = cmd.isRecursive();
boolean listAll = cmd.listAll();
Boolean listForDomain = false;

if (accountId != null) {
Account account = _accountDao.findById(accountId);
if (account == null || account.getId() == Account.ACCOUNT_ID_SYSTEM) {
throw new InvalidParameterValueException("Unable to find account by id " + accountId);
}

_accountMgr.checkAccess(caller, null, true, account);
}
boolean callerIsAdmin = _accountMgr.isAdmin(caller.getId());
Account account;
Domain domain = null;

// if "domainid" specified, perform validation
if (domainId != null) {
Domain domain = _domainDao.findById(domainId);
// ensure existence...
domain = _domainDao.findById(domainId);
if (domain == null) {
throw new InvalidParameterValueException("Domain id=" + domainId + " doesn't exist");
}

// ... and check access rights.
_accountMgr.checkAccess(caller, domain);

if (accountName != null) {
Account account = _accountDao.findActiveAccount(accountName, domainId);
if (account == null || account.getId() == Account.ACCOUNT_ID_SYSTEM) {
throw new InvalidParameterValueException("Unable to find account by name " + accountName
+ " in domain " + domainId);
}
_accountMgr.checkAccess(caller, null, true, account);
}
}

// if no "id" specified...
if (accountId == null) {
if (_accountMgr.isAdmin(caller.getId()) && listAll && domainId == null) {
listForDomain = true;
isRecursive = true;
// listall only has significance if they are an admin
if (listAll && callerIsAdmin) {
// if no domain id specified, use caller's domain
if (domainId == null) {
domainId = caller.getDomainId();
}
} else if (_accountMgr.isAdmin(caller.getId()) && domainId != null) {
listForDomain = true;
} else {
// mark recursive
isRecursive = true;
} else if (!callerIsAdmin || domainId == null) {
accountId = caller.getAccountId();
}
} else if (domainId != null && accountName != null) {
// if they're looking for an account by name
account = _accountDao.findActiveAccount(accountName, domainId);
if (account == null || account.getId() == Account.ACCOUNT_ID_SYSTEM) {
throw new InvalidParameterValueException(
"Unable to find account by name " + accountName + " in domain " + domainId
);
}
_accountMgr.checkAccess(caller, null, true, account);
} else {
// if they specified an "id"...
if (domainId == null) {
account = _accountDao.findById(accountId);
} else {
account = _accountDao.findActiveAccountById(accountId, domainId);
}
if (account == null || account.getId() == Account.ACCOUNT_ID_SYSTEM) {
throw new InvalidParameterValueException(
"Unable to find account by id "
+ accountId
+ (domainId == null ? "" : " in domain " + domainId)
);
}
_accountMgr.checkAccess(caller, null, true, account);
}

Filter searchFilter = new Filter(AccountJoinVO.class, "id", true, cmd.getStartIndex(), cmd.getPageSizeVal());
Expand All @@ -2013,12 +2024,15 @@ private Pair<List<AccountJoinVO>, Integer> searchForAccountsInternal(ListAccount
sb.and("typeNEQ", sb.entity().getType(), SearchCriteria.Op.NEQ);
sb.and("idNEQ", sb.entity().getId(), SearchCriteria.Op.NEQ);

if (listForDomain && isRecursive) {
if (domainId != null && isRecursive) {
sb.and("path", sb.entity().getDomainPath(), SearchCriteria.Op.LIKE);
}

SearchCriteria<AccountJoinVO> sc = sb.create();

// don't return account of type project to the end user
sc.setParameters("typeNEQ", Account.ACCOUNT_TYPE_PROJECT);
// don't return system account...
sc.setParameters("idNEQ", Account.ACCOUNT_ID_SYSTEM);

if (keyword != null) {
Expand All @@ -2044,16 +2058,16 @@ private Pair<List<AccountJoinVO>, Integer> searchForAccountsInternal(ListAccount
sc.setParameters("accountName", accountName);
}

// don't return account of type project to the end user
sc.setParameters("typeNEQ", 5);

if (accountId != null) {
sc.setParameters("id", accountId);
}

if (listForDomain) {
if (domainId != null) {
if (isRecursive) {
Domain domain = _domainDao.findById(domainId);
// will happen if no "domainid" was specified in the request...
if (domain == null) {
domain = _domainDao.findById(domainId);
}
sc.setParameters("path", domain.getPath() + "%");
} else {
sc.setParameters("domainId", domainId);
Expand Down