Merge remote-tracking branch 'origin/4.19'

Author: vishesh92

framework/db/src/main/java/com/cloud/utils/db/GenericDaoBase.java

@@ -1631,6 +1631,7 @@ protected void prepareAttribute(final int j, final PreparedStatement pstmt, fina
             }
         }
 
+
         if (attr.getValue() != null && attr.getValue() instanceof String) {
             pstmt.setString(j, (String)attr.getValue());
         } else if (attr.getValue() != null && attr.getValue() instanceof Long) {
@@ -1650,7 +1651,7 @@ protected void prepareAttribute(final int j, final PreparedStatement pstmt, fina
                 // This happens when we pass in an integer, long or any other object which can't be cast to String.
                 // Converting to string in case of integer or long can result in different results. Required specifically for details tables.
                 // So, we set the value for the object directly.
-                s_logger.debug("ClassCastException when casting value to String. Setting the value of the object directly.");
+                logger.debug("ClassCastException when casting value to String. Setting the value of the object directly.");
                 pstmt.setObject(j, value);
                 return;
             }

server/src/main/java/com/cloud/api/query/QueryManagerImpl.java

@@ -3516,6 +3516,16 @@ private Ternary<List<Long>, Integer, String[]> searchForDiskOfferingsIdsAndCount
             sc.setJoinParameters("domainDetailsSearch", "domainIdIN", domainIds.toArray());
         }
 
+        if (vmId != null) {
+            UserVmVO vm = userVmDao.findById(vmId);
+            if (vm == null) {
+                throw new InvalidParameterValueException("Unable to find the VM instance with the specified ID");
+            }
+            if (!isRootAdmin) {
+                accountMgr.checkAccess(account, null, false, vm);
+            }
+        }
+
         Pair<List<DiskOfferingVO>, Integer> uniquePairs = _diskOfferingDao.searchAndCount(sc, searchFilter);
         String[] requiredTagsArray = new String[0];
         if (CollectionUtils.isNotEmpty(uniquePairs.first()) && VolumeApiServiceImpl.MatchStoragePoolTagsWithDiskOffering.valueIn(zoneId)) {

server/src/main/java/com/cloud/api/query/dao/ServiceOfferingJoinDaoImpl.java

@@ -36,6 +36,7 @@
 import org.apache.cloudstack.api.response.ServiceOfferingResponse;
 import org.apache.cloudstack.context.CallContext;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
+
 import org.springframework.stereotype.Component;
 
 import com.cloud.api.ApiDBUtils;
@@ -195,7 +196,7 @@ public ServiceOfferingJoinVO newServiceOfferingView(ServiceOffering offering) {
 
     @Override
     public Map<Long, List<String>> listDomainsOfServiceOfferingsUsedByDomainPath(String domainPath) {
-        logger.debug(String.format("Retrieving the domains of the service offerings used by domain with path [%s].", domainPath));
+        logger.debug("Retrieving the domains of the service offerings used by domain with path [{}].", domainPath);
 
         TransactionLegacy txn = TransactionLegacy.currentTxn();
         try (PreparedStatement pstmt = txn.prepareStatement(LIST_DOMAINS_OF_SERVICE_OFFERINGS_USED_BY_DOMAIN_PATH)) {