Don't use userdata in system VM's template

Author: vishesh92

api/src/main/java/org/apache/cloudstack/userdata/UserDataManager.java

@@ -16,7 +16,6 @@
 // under the License.
 package org.apache.cloudstack.userdata;
 
-import com.cloud.template.VirtualMachineTemplate;
 import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.framework.config.ConfigKey;
 import org.apache.cloudstack.framework.config.Configurable;
@@ -30,5 +29,5 @@ public interface UserDataManager extends Manager, Configurable {
 
     String concatenateUserData(String userdata1, String userdata2, String userdataProvider);
     String validateUserData(String userData, BaseCmd.HTTPMethod httpmethod);
-    Long validateAndGetUserDataIdForSystemVms(String userDataUuid, VirtualMachineTemplate vmTemplate);
+    String validateAndGetUserDataForSystemVM(String userDataUuid);
 }

engine/userdata/src/main/java/org/apache/cloudstack/userdata/UserDataManagerImpl.java

@@ -23,7 +23,6 @@
 import java.util.Map;
 
 import com.cloud.domain.Domain;
-import com.cloud.template.VirtualMachineTemplate;
 import com.cloud.user.User;
 import com.cloud.user.UserDataVO;
 import com.cloud.user.dao.UserDataDao;
@@ -129,20 +128,20 @@ public String validateUserData(String userData, BaseCmd.HTTPMethod httpmethod) {
     }
 
     @Override
-    public Long validateAndGetUserDataIdForSystemVms(String userDataUuid, VirtualMachineTemplate vmTemplate) {
-        UserDataVO templateUserDataVo = vmTemplate.getUserDataId() != null ? userDataDao.findById(vmTemplate.getUserDataId()): null;
-        UserDataVO userDataVo = StringUtils.isNotBlank(userDataUuid) ? userDataDao.findByUuid(userDataUuid) : null;
-        if (isUserDataAllowedForSystemVm(templateUserDataVo) &&
-            isUserDataAllowedForSystemVm(userDataVo)) {
-            return userDataVo != null ? userDataVo.getId() : null;
+    public String validateAndGetUserDataForSystemVM(String userDataUuid) {
+        if (StringUtils.isBlank(userDataUuid)) {
+            return null;
+        }
+        UserDataVO userDataVo = userDataDao.findByUuid(userDataUuid);
+        if (userDataVo == null) {
+            return null;
+        }
+        if (userDataVo.getDomainId() == Domain.ROOT_DOMAIN && userDataVo.getAccountId() == User.UID_ADMIN) {
+            return userDataVo.getUserData();
         }
         throw new CloudRuntimeException("User data can only be used by system VMs if it belongs to the ROOT domain and ADMIN account.");
     }
 
-    private boolean isUserDataAllowedForSystemVm(UserDataVO userData) {
-        return userData == null || (userData.getDomainId() == Domain.ROOT_DOMAIN && userData.getAccountId() == User.UID_ADMIN);
-    }
-
     private byte[] validateAndDecodeByHTTPMethod(String userData, int maxHTTPLength, BaseCmd.HTTPMethod httpMethod) {
         byte[] decodedUserData = Base64.decodeBase64(userData.getBytes());
         if (decodedUserData == null || decodedUserData.length < 1) {

plugins/network-elements/elastic-loadbalancer/src/main/java/com/cloud/network/lb/ElasticLoadBalancerManagerImpl.java

@@ -493,8 +493,7 @@ public boolean finalizeVirtualMachineProfile(VirtualMachineProfile profile, Depl
         if (SystemVmEnableUserData.valueIn(dc.getId())) {
             String userDataUuid = RouterUserData.valueIn(dc.getId());
             try {
-                Long userDataId = userDataManager.validateAndGetUserDataIdForSystemVms(userDataUuid, profile.getTemplate());
-                String userData = userVmManager.finalizeUserData(null, userDataId, profile.getTemplate());
+                String userData = userDataManager.validateAndGetUserDataForSystemVM(userDataUuid);
                 if (StringUtils.isNotBlank(userData)) {
                     // Decode base64 user data, compress it, then re-encode to reduce command line length
                     String plainTextUserData = new String(Base64.getDecoder().decode(userData));

plugins/network-elements/internal-loadbalancer/src/main/java/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java

@@ -258,8 +258,7 @@ public boolean finalizeVirtualMachineProfile(final VirtualMachineProfile profile
         if (SystemVmEnableUserData.valueIn(dcId)) {
             String userDataUuid = RouterUserData.valueIn(dcId);
             try {
-                Long userDataId = userDataManager.validateAndGetUserDataIdForSystemVms(userDataUuid, profile.getTemplate());
-                String userData = userVmManager.finalizeUserData(null, userDataId, profile.getTemplate());
+                String userData = userDataManager.validateAndGetUserDataForSystemVM(userDataUuid);
                 if (StringUtils.isNotBlank(userData)) {
                     // Decode base64 user data, compress it, then re-encode to reduce command line length
                     String plainTextUserData = new String(Base64.getDecoder().decode(userData));

server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java

@@ -1279,8 +1279,7 @@ public boolean finalizeVirtualMachineProfile(VirtualMachineProfile profile, Depl
         if (SystemVmEnableUserData.valueIn(dc.getId())) {
             String userDataUuid = ConsoleProxyUserData.valueIn(dc.getId());
             try {
-                Long userDataId = userDataManager.validateAndGetUserDataIdForSystemVms(userDataUuid, profile.getTemplate());
-                String userData = userVmManager.finalizeUserData(null, userDataId, profile.getTemplate());
+                String userData = userDataManager.validateAndGetUserDataForSystemVM(userDataUuid);
                 if (StringUtils.isNotBlank(userData)) {
                     // Decode base64 user data, compress it, then re-encode to reduce command line length
                     String plainTextUserData = new String(Base64.getDecoder().decode(userData));

server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java

@@ -2109,9 +2109,7 @@ public boolean finalizeVirtualMachineProfile(final VirtualMachineProfile profile
         if (SystemVmEnableUserData.valueIn(router.getDataCenterId())) {
             String userDataUuid = RouterUserData.valueIn(dc.getId());
             try {
-                Long userDataId = userDataManager.validateAndGetUserDataIdForSystemVms(userDataUuid,
-                        profile.getTemplate());
-                String userData = userVmManager.finalizeUserData(null, userDataId, profile.getTemplate());
+                String userData = userDataManager.validateAndGetUserDataForSystemVM(userDataUuid);
                 if (StringUtils.isNotBlank(userData)) {
                     // Decode base64 user data, compress it, then re-encode to reduce command line length
                     String plainTextUserData = new String(Base64.getDecoder().decode(userData));

services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java

@@ -1241,9 +1241,7 @@ public boolean finalizeVirtualMachineProfile(VirtualMachineProfile profile, Depl
         if (SystemVmEnableUserData.valueIn(dc.getId())) {
             String userDataUuid = SecondaryStorageUserData.valueIn(dc.getId());
             try {
-                Long userDataId = userDataManager.validateAndGetUserDataIdForSystemVms(userDataUuid,
-                        profile.getTemplate());
-                String userData = userVmManager.finalizeUserData(null, userDataId, profile.getTemplate());
+                String userData = userDataManager.validateAndGetUserDataForSystemVM(userDataUuid);
                 if (StringUtils.isNotBlank(userData)) {
                     // Decode base64 user data, compress it, then re-encode to reduce command line length
                     String plainTextUserData = new String(Base64.getDecoder().decode(userData));