Adjust how the parameters behave

Author: winterhazel

plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaSummaryCmd.java

@@ -107,7 +107,8 @@ public void setDomainId(Long domainId) {
     }
 
     public Boolean isListAll() {
-        return ObjectUtils.defaultIfNull(listAll, Boolean.FALSE);
+        // If a domain ID was specified, then allow listing all summaries of domain
+        return ObjectUtils.defaultIfNull(listAll, Boolean.FALSE) || domainId != null;
     }
 
     public void setListAll(Boolean listAll) {

plugins/database/quota/src/main/java/org/apache/cloudstack/api/response/QuotaResponseBuilderImpl.java

@@ -205,11 +205,6 @@ public Pair<List<QuotaSummaryResponse>, Integer> createQuotaSummaryResponse(Quot
     }
 
     protected Pair<List<QuotaSummaryResponse>, Integer> getQuotaSummaryResponseWithListAll(QuotaSummaryCmd cmd, Account caller) {
-        Long accountId = cmd.getEntityOwnerId();
-        if (accountId == -1) {
-            accountId = cmd.isListAll() ? null : caller.getAccountId();
-        }
-
         Long domainId = cmd.getDomainId();
         if (domainId != null) {
             DomainVO domain = domainDao.findByIdIncludingRemoved(domainId);
@@ -220,6 +215,12 @@ protected Pair<List<QuotaSummaryResponse>, Integer> getQuotaSummaryResponseWithL
 
         String domainPath = getDomainPathByDomainIdForDomainAdmin(caller);
 
+        Long accountId = cmd.getEntityOwnerId();
+        if (accountId == -1) {
+            // No specific account was provided
+            accountId = cmd.isListAll() ? null : caller.getAccountId();
+        }
+
         String keyword = null;
         if (Account.Type.ADMIN.equals(caller.getType())) {
             keyword = cmd.getKeyword();
@@ -250,7 +251,8 @@ protected String getDomainPathByDomainIdForDomainAdmin(Account caller) {
     }
 
     protected Pair<List<QuotaSummaryResponse>, Integer> getQuotaSummaryResponse(Long accountId, String accountName, Long domainId, String domainPath, QuotaSummaryCmd cmd) {
-        if (accountId == -1) {
+        if (accountId != null && accountId == -1) {
+            // Either no specific account as provided, or list all is disabled
             accountId = CallContext.current().getCallingAccountId();
         }
 
@@ -301,33 +303,6 @@ protected QuotaSummaryResponse getQuotaSummaryResponse(QuotaSummaryVO summary) {
         return response;
     }
 
-    protected QuotaSummaryResponse getQuotaSummaryResponse(final Account account) {
-        Calendar[] period = quotaStatement.getCurrentStatementTime();
-
-        if (account != null) {
-            QuotaSummaryResponse qr = new QuotaSummaryResponse();
-            DomainVO domain = domainDao.findById(account.getDomainId());
-            BigDecimal curBalance = _quotaBalanceDao.lastQuotaBalance(account.getAccountId(), account.getDomainId(), period[1].getTime());
-            BigDecimal quotaUsage = quotaUsageDao.findTotalQuotaUsage(account.getAccountId(), account.getDomainId(), null, period[0].getTime(), period[1].getTime());
-
-            qr.setAccountId(account.getUuid());
-            qr.setAccountName(account.getAccountName());
-            qr.setDomainId(domain.getUuid());
-            qr.setDomainPath(domain.getName());
-            qr.setBalance(curBalance);
-            qr.setQuotaUsage(quotaUsage);
-            qr.setState(account.getState());
-            qr.setStartDate(period[0].getTime());
-            qr.setEndDate(period[1].getTime());
-            qr.setCurrency(QuotaConfig.QuotaCurrencySymbol.value());
-            qr.setQuotaEnabled(QuotaConfig.QuotaAccountEnabled.valueIn(account.getId()));
-            qr.setObjectName("summary");
-            return qr;
-        } else {
-            return new QuotaSummaryResponse();
-        }
-    }
-
     public boolean isUserAllowedToSeeActivationRules(User user) {
         List<ApiDiscoveryResponse> apiList = (List<ApiDiscoveryResponse>) apiDiscoveryService.listApis(user, null).getResponses();
         return apiList.stream().anyMatch(response -> StringUtils.equalsAny(response.getName(), "quotaTariffCreate", "quotaTariffUpdate"));

server/src/main/java/com/cloud/api/dispatch/ParamProcessWorker.java

@@ -312,20 +312,7 @@ public void processParameters(final BaseCmd cmd, final Map params) {
 
     protected void doAccessChecks(BaseCmd cmd, Map<Object, AccessType> entitiesToAccess) {
         Account caller = CallContext.current().getCallingAccount();
-        List<Long> entityOwners = cmd.getEntityOwnerIds();
-        Account[] owners = null;
-        if (entityOwners != null) {
-            owners = entityOwners.stream().map(id -> _accountMgr.getAccount(id)).toArray(Account[]::new);
-        } else {
-            if (cmd.getEntityOwnerId() == Account.ACCOUNT_ID_SYSTEM && cmd instanceof BaseAsyncCmd && ((BaseAsyncCmd)cmd).getApiResourceType() == ApiCommandResourceType.Network) {
-                if (logger.isDebugEnabled()) {
-                    logger.debug("Skipping access check on the network owner if the owner is ROOT/system.");
-                }
-                owners = new Account[]{};
-            } else {
-                owners = new Account[]{_accountMgr.getAccount(cmd.getEntityOwnerId())};
-            }
-        }
+        Account[] owners = getEntityOwners(cmd);
 
         if (cmd instanceof BaseAsyncCreateCmd) {
             // check that caller can access the owner account.