Merge branch 'fix/ZSTAC-82208' into '5.5.6'

<fix>[identity]: skip quota check for admin-type accounts

See merge request zstackio/zstack!9160

Author: gitlab

identity/src/main/java/org/zstack/identity/QuotaUtil.java

@@ -154,7 +154,7 @@ public void checkQuota(Message msg, String currentAccountUuid, String targetAcco
             return;
         }
 
-        if (AccountConstant.isAdminPermission(targetAccountUuid)) {
+        if (AccountConstant.isAdminPermission(targetAccountUuid) || isAdminAccount(targetAccountUuid)) {
             return;
         }
 
@@ -217,11 +217,18 @@ private void checkFunctionalSizeRequest(Message msg,
             return;
         }
 
+        Quota.QuotaPair pair = pairs.get(requiredRequest.getQuotaName());
+        if (pair == null) {
+            logger.warn(String.format("quota[name: %s] not defined for account[uuid: %s], skip check",
+                    requiredRequest.getQuotaName(), targetAccountUuid));
+            return;
+        }
+
         QuotaUtil.QuotaCompareInfo quotaCompareInfo = new QuotaUtil.QuotaCompareInfo();
         quotaCompareInfo.currentAccountUuid = currentAccountUuid;
         quotaCompareInfo.resourceTargetOwnerAccountUuid = targetAccountUuid;
         quotaCompareInfo.quotaName = requiredRequest.getQuotaName();
-        quotaCompareInfo.quotaValue = pairs.get(requiredRequest.getQuotaName()).getValue();
+        quotaCompareInfo.quotaValue = pair.getValue();
         quotaCompareInfo.currentUsed = used;
         quotaCompareInfo.request = asked;
         CheckQuota(quotaCompareInfo);
@@ -235,13 +242,19 @@ private void checkFixedSizeRequest(FixedSizeRequiredRequest fixedSizeRequiredReq
             return;
         }
 
+        Quota.QuotaPair pair = pairs.get(fixedSizeRequiredRequest.getQuotaName());
+        if (pair == null) {
+            logger.warn(String.format("quota[name: %s] not defined for account[uuid: %s], skip check",
+                    fixedSizeRequiredRequest.getQuotaName(), targetAccountUuid));
+            return;
+        }
+
         QuotaUtil.QuotaCompareInfo quotaCompareInfo = new QuotaUtil.QuotaCompareInfo();
         quotaCompareInfo.currentAccountUuid = currentAccountUuid;
         quotaCompareInfo.resourceTargetOwnerAccountUuid = targetAccountUuid;
         quotaCompareInfo.quotaName = fixedSizeRequiredRequest.getQuotaName();
-        Quota.QuotaPair pair = pairs.get(fixedSizeRequiredRequest.getQuotaName());
         logger.debug("get quota pair of " + fixedSizeRequiredRequest.getQuotaName() + ":\n" + JSONObjectUtil.toJsonString(pair));
-        quotaCompareInfo.quotaValue = pairs.get(fixedSizeRequiredRequest.getQuotaName()).getValue();
+        quotaCompareInfo.quotaValue = pair.getValue();
         quotaCompareInfo.currentUsed = used;
         quotaCompareInfo.request = asked;
         CheckQuota(quotaCompareInfo);