Prevent printing mount opts which may include password by removing from response

Author: Pearl1594

api/src/main/java/org/apache/cloudstack/api/response/BackupRepositoryResponse.java

@@ -57,10 +57,6 @@ public class BackupRepositoryResponse extends BaseResponse {
     @Param(description = "backup type")
     private String type;
 
-    @SerializedName(ApiConstants.MOUNT_OPTIONS)
-    @Param(description = "mount options for the backup repository")
-    private String mountOptions;
-
     @SerializedName(ApiConstants.CAPACITY_BYTES)
     @Param(description = "capacity of the backup repository")
     private Long capacityBytes;
@@ -112,14 +108,6 @@ public void setAddress(String address) {
         this.address = address;
     }
 
-    public String getMountOptions() {
-        return mountOptions;
-    }
-
-    public void setMountOptions(String mountOptions) {
-        this.mountOptions = mountOptions;
-    }
-
     public String getProviderName() {
         return providerName;
     }

scripts/vm/hypervisor/kvm/nasbackup.sh

@@ -100,6 +100,12 @@ mount_operation() {
   mount_point=$(mktemp -d -t csbackup.XXXXX)
   dest="$mount_point/${BACKUP_DIR}"
   mount -t ${NAS_TYPE} ${NAS_ADDRESS} ${mount_point} $([[ ! -z "${MOUNT_OPTS}" ]] && echo -o ${MOUNT_OPTS})
+  if [ $? -eq 0 ]; then
+      echo "Successfully mounted ${NAS_TYPE} store"
+  else
+      echo "Failed to mount ${NAS_TYPE} store"
+      exit 1
+  fi
 }
 
 function usage {

server/src/main/java/com/cloud/api/ApiResponseHelper.java

@@ -5439,7 +5439,6 @@ public BackupRepositoryResponse createBackupRepositoryResponse(BackupRepository
         response.setAddress(backupRepository.getAddress());
         response.setProviderName(backupRepository.getProvider());
         response.setType(backupRepository.getType());
-        response.setMountOptions(backupRepository.getMountOptions());
         response.setCapacityBytes(backupRepository.getCapacityBytes());
         response.setObjectName("backuprepository");
         DataCenter zone = ApiDBUtils.findZoneById(backupRepository.getZoneId());

server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java

@@ -19,24 +19,33 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.TimeZone;
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.stream.Collectors;
 
 import com.amazonaws.util.CollectionUtils;
+import com.cloud.network.dao.NetworkDao;
+import com.cloud.network.dao.NetworkVO;
+import com.cloud.storage.VMTemplateVO;
 import com.cloud.storage.VolumeApiService;
+import com.cloud.storage.dao.VMTemplateDao;
 import com.cloud.utils.fsm.NoTransitionException;
+import com.cloud.vm.NicVO;
 import com.cloud.vm.UserVmManager;
+import com.cloud.vm.UserVmService;
 import com.cloud.vm.UserVmVO;
 import com.cloud.vm.VirtualMachineManager;
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
+import com.cloud.vm.dao.NicDao;
 import org.apache.cloudstack.api.ApiCommandResourceType;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.command.admin.backup.DeleteBackupOfferingCmd;
@@ -166,6 +175,14 @@ public class BackupManagerImpl extends ManagerBase implements BackupManager {
     private VolumeApiService volumeApiService;
     @Inject
     private VolumeOrchestrationService volumeOrchestrationService;
+    @Inject
+    private VMTemplateDao templateDao;
+    @Inject
+    private NicDao nicDao;
+    @Inject
+    private NetworkDao networkDao;
+    @Inject
+    protected UserVmService userVmService;
 
     private AsyncJobDispatcher asyncJobDispatcher;
     private Timer backupTimer;
@@ -645,6 +662,9 @@ public boolean restoreBackup(final Long backupId) {
                 !vm.getState().equals(VirtualMachine.State.Destroyed)) {
             throw new CloudRuntimeException("Existing VM should be stopped before being restored from backup");
         }
+        if (VirtualMachine.State.Expunging.equals(vm.getState()) && vm.getRemoved() != null) {
+            restoreExpungedVm(vm);
+        }
         // This is done to handle historic backups if any with Veeam / Networker plugins
         List<Backup.VolumeInfo> backupVolumes = CollectionUtils.isNullOrEmpty(backup.getBackedUpVolumes()) ?
                 vm.getBackupVolumeList() : backup.getBackedUpVolumes();
@@ -705,6 +725,28 @@ protected void tryRestoreVM(BackupVO backup, VMInstanceVO vm, BackupOffering off
         }
     }
 
+    private void restoreExpungedVm(VMInstanceVO vm) {
+        VMTemplateVO template = templateDao.findById(vm.getTemplateId());
+        if (Objects.isNull(template)) {
+            throw new CloudRuntimeException("Failed to find VM template to restore the VM");
+        }
+        List<Long> networkIds = nicDao.listByVmId(vm.getId()).stream().sorted(Comparator.comparing(NicVO::getDeviceId)).map(NicVO::getNetworkId).collect(Collectors.toList());
+        for (Long networkId : networkIds) {
+            NetworkVO networkVO = networkDao.findById(networkId);
+            if (Objects.isNull(networkVO)) {
+                throw new CloudRuntimeException("Failed to find network all networks the VM was previously attached to");
+            }
+        }
+
+        CallContext ctx = CallContext.current();
+        final Account owner = ctx.getCallingAccount();
+//        userVmService.createAdvancedVirtualMachine(vm.getDataCenterId(), vm.getServiceOfferingId(), template.getId(), networkIds, owner,
+//                vm.getHostName(), vm.getHostName(), null, null, null,
+//                Hypervisor.HypervisorType.None, BaseCmd.HTTPMethod.POST, null, null, null, keypairs,
+//                requestedIps, addrs, null, null, null, customParameterMap, null, null, null, null, true, null, null);
+
+    }
+
     /**
      * Tries to update the state of given VM, given specified event
      * @param vm The VM to update its state

tools/marvin/setup.py

@@ -27,7 +27,7 @@
         raise RuntimeError("python setuptools is required to build Marvin")
 
 
-VERSION = "4.20.0.0-SNAPSHOT"
+VERSION = "4.20.0.0"
 
 setup(name="Marvin",
       version=VERSION,

ui/src/config/section/config.js

@@ -151,7 +151,7 @@ export default {
           ],
           mapping: {
             type: {
-              options: ['nfs']
+              options: ['nfs', 'cifs']
             },
             provider: {
               value: (record) => { return 'nas' }