- archive uploaded via vmimportdir is now compressed (gz), thus udpated code...

- archive uploaded via vmimportdir is now compressed (gz), thus udpated code to decompress it properly
- bumpped version to 1.4.0

src/exec/Guestfish.go

@@ -30,9 +30,9 @@ func CheckGuestfish() error {
 	return nil
 }
 
-// Copies and unarchives a local archive into a directory (vmDir) inside the VM's filesystem.
-func CopyToVM(vmDiskFile, tarFile, vmDir string) error {
-	cmd := exec.Command(guestfishBinary, "--rw", "-i", "tar-in", "-a", vmDiskFile, tarFile, vmDir)
+// Copies and unarchives a local tar.gz archive into a directory (vmDir) inside the VM's filesystem.
+func CopyToVM(vmDiskFile, tarGzFile, vmDir string) error {
+	cmd := exec.Command(guestfishBinary, "--rw", "-i", "tar-in", "-a", vmDiskFile, tarGzFile, vmDir, "compress:gzip")
 	stdoutStderr, err := cmd.CombinedOutput()
 	if err != nil {
 		output := fmt.Sprintf("[%s]", stdoutStderr)
@@ -43,9 +43,9 @@ func CopyToVM(vmDiskFile, tarFile, vmDir string) error {
 	return nil
 }
 
-// Recursively copies a directory in the VM's filesystem (vmDir) into a compressed archive.
-func CopyFromVM(vmDiskFile, vmDir, tarFile string) error {
-	cmd := exec.Command(guestfishBinary, "--ro", "-i", "tar-out",  "-a", vmDiskFile, vmDir, tarFile, "compress:gzip")
+// Recursively copies a directory in the VM's filesystem (vmDir) into a tar.gz archive.
+func CopyFromVM(vmDiskFile, vmDir, tarGzFile string) error {
+	cmd := exec.Command(guestfishBinary, "--ro", "-i", "tar-out",  "-a", vmDiskFile, vmDir, tarGzFile, "compress:gzip")
 	stdoutStderr, err := cmd.CombinedOutput()
 	if err != nil {
 		output := fmt.Sprintf("[%s]", stdoutStderr)

src/router/routerVMs.go

@@ -396,10 +396,10 @@ func (r *RouterVMs)ExportVMDir(c echo.Context) error {
 
 		// Creates a unique tar filename.
 		tmpDir := paths.GetInstance().TmpDir
-		tarFile := filepath.Join(tmpDir, "exportdir_"+vm.ID.String()+".tar.gz")
+		tarGzFile := filepath.Join(tmpDir, "exportdir_"+vm.ID.String()+".tar.gz")
 
-		// Extracts VM's p.Dir directory into tarFile on the host.
-		if err := r.vms.ExportVMFiles(vm, p.Dir, tarFile); err != nil {
+		// Extracts VM's p.Dir directory into tarGzFile on the host.
+		if err := r.vms.ExportVMFiles(vm, p.Dir, tarGzFile); err != nil {
 			return echo.NewHTTPError(http.StatusBadRequest, "Failed extracting VM's dir")
 		}
 	
@@ -408,12 +408,12 @@ func (r *RouterVMs)ExportVMDir(c echo.Context) error {
 			if err := os.Remove(file); err != nil {
 				log.Error("Failed removing archive of extracted VM dir: "+err.Error())
 			}
-		}(tarFile)
-		return c.File(tarFile)
+		}(tarGzFile)
+		return c.File(tarGzFile)
 	})
 }
 
-// Import files into a VM's filesystem, in a specified directory. The file tree is received in a .tar archive.
+// Import files into a VM's filesystem, in a specified directory. The file tree is received in a tar.gz archive.
 // Requires either capability:
 // User cap: VM_WRITEFS_ANY: any VM can import the file tree.
 // VM access cap: VM_WRITEFS: any of the VMs with this cap for the logged user can import the file tree.
@@ -423,13 +423,13 @@ func (r *RouterVMs)ImportFilesToVM(c echo.Context) error {
 		// Retrieves the various client arguments.
 		vmDir := c.FormValue("vmDir")
 
-		// Retrieves the tar archive (uploadedTarFile).
-		tarFile, err := c.FormFile("file")
+		// Retrieves the tar.gz archive (uploadedtarGzFile).
+		tarGzFile, err := c.FormFile("file")
 		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, err.Error())
 		}
 
-		src, err := tarFile.Open()
+		src, err := tarGzFile.Open()
 		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, err.Error())
 		}
@@ -441,13 +441,13 @@ func (r *RouterVMs)ImportFilesToVM(c echo.Context) error {
 			log.Error("Failed creating random UUID: "+err.Error())
 			return echo.NewHTTPError(http.StatusInternalServerError, err.Error())
 		}
-		uploadedTarFile := filepath.Join(tmpDir, "upload_"+uuid.String()+".tar")
-		dst, err := os.Create(uploadedTarFile)
+		uploadedtarGzFile := filepath.Join(tmpDir, "upload_"+uuid.String()+".tar")
+		dst, err := os.Create(uploadedtarGzFile)
 		if err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, err.Error())
 		}
 		defer dst.Close()
-		defer os.Remove(uploadedTarFile)
+		defer os.Remove(uploadedtarGzFile)
 	
 		if _, err = io.Copy(dst, src); err != nil {
 			return echo.NewHTTPError(http.StatusInternalServerError, err.Error())
@@ -455,7 +455,7 @@ func (r *RouterVMs)ImportFilesToVM(c echo.Context) error {
 
 		// Copy the archive's files into the VM
 		// IMPORTANT: check the VM is NOT running!
-		if err = r.vms.ImportFilesToVM(vm, uploadedTarFile, vmDir); err != nil {
+		if err = r.vms.ImportFilesToVM(vm, uploadedtarGzFile, vmDir); err != nil {
 			return echo.NewHTTPError(http.StatusBadRequest, err.Error())
 		}
 	

src/version/version.go

@@ -6,7 +6,7 @@ import (
 
 const (
 	major  = 1
-	minor  = 3
+	minor  = 4
 	bugfix = 0
 )
 

src/vms/vms.go

@@ -389,14 +389,14 @@ func (vms *VMs)DeleteVMAccess(vmID uuid.UUID, loggedUserEmail, userEmail string)
 	return nil
 }
 
-// Exports a VM's directory and its subdirectories into a compressed archive on the host.
-func (vms *VMs)ExportVMFiles(vm *VM, vmDir, tarFile string) error {
+// Exports a VM's directory and its subdirectories into a tar.gz archive on the host.
+func (vms *VMs)ExportVMFiles(vm *VM, vmDir, tarGzFile string) error {
 	vmDisk := vm.getDiskPath()
-	return exec.CopyFromVM(vmDisk, vmDir, tarFile)
+	return exec.CopyFromVM(vmDisk, vmDir, tarGzFile)
 }
 
-// Import files into a VM's filesystem, in a specified directory.
-func (vms *VMs)ImportFilesToVM(vm *VM, tarFile, vmDir string) error {
+// Imports files from a tar.gz archive into a VM's filesystem, in a specified directory.
+func (vms *VMs)ImportFilesToVM(vm *VM, tarGzFile, vmDir string) error {
 	// Marks the VM to copy from as being busy.
 	if err := vms.setDiskBusy(vm); err != nil {
 		return errors.New("Failed setting disk busy flag during VM files import: "+err.Error())
@@ -405,7 +405,7 @@ func (vms *VMs)ImportFilesToVM(vm *VM, tarFile, vmDir string) error {
 	defer vms.clearDiskBusy(vm)
 
 	vmDisk := vm.getDiskPath()
-	return exec.CopyToVM(vmDisk, tarFile, vmDir)
+	return exec.CopyToVM(vmDisk, tarGzFile, vmDir)
 }
 
 // Marks a VM as "busy", meaning its disk file is being accessed for a possibly long time.