removed SMB file sharing

After the addition of 9p file sharing for Windows, we are removing
SMB file sharing support (#4768).

Author: redbeam

cmd/crc/cmd/start.go

@@ -106,17 +106,6 @@ func runStart(ctx context.Context) (*types.StartResult, error) {
 		}
 	}
 
-	if runtime.GOOS == "windows" {
-		username, err := crcos.GetCurrentUsername()
-		if err != nil {
-			return nil, err
-		}
-
-		// config SharedDirPassword ('shared-dir-password') only exists in windows
-		startConfig.SharedDirPassword = config.Get(crcConfig.SharedDirPassword).AsString()
-		startConfig.SharedDirUsername = username
-	}
-
 	return client.Start(ctx, startConfig)
 }
 

pkg/crc/config/settings.go

@@ -2,7 +2,6 @@ package config
 
 import (
 	"fmt"
-	"runtime"
 
 	"github.com/crc-org/crc/v2/pkg/crc/constants"
 	"github.com/crc-org/crc/v2/pkg/crc/logging"
@@ -62,17 +61,6 @@ func RegisterSettings(cfg *Config) {
 		return validateBundlePath(value, GetPreset(cfg))
 	}
 
-	validateSmbSharedDirs := func(value interface{}) (bool, string) {
-		if !cfg.Get(HostNetworkAccess).AsBool() {
-			return false, fmt.Sprintf("%s can only be used with %s set to 'true'",
-				EnableSharedDirs, HostNetworkAccess)
-		}
-		if cfg.Get(SharedDirPassword).IsDefault {
-			return false, fmt.Sprintf("Please set '%s' first to enable shared directories", SharedDirPassword)
-		}
-		return ValidateBool(value)
-	}
-
 	// Preset setting should be on top because CPUs/Memory config depend on it.
 	cfg.AddSetting(Preset, version.GetDefaultPreset().String(), validatePreset, RequiresDeleteAndSetupMsg,
 		fmt.Sprintf("Virtual machine preset (valid values are: %s)", preset.AllPresets()))
@@ -96,18 +84,8 @@ func RegisterSettings(cfg *Config) {
 		"Enable emergency login for 'core' user. Password is randomly generated. (true/false, default: false)")
 	cfg.AddSetting(PersistentVolumeSize, constants.DefaultPersistentVolumeSize, validatePersistentVolumeSize, SuccessfullyApplied,
 		fmt.Sprintf("Total size in GiB of the persistent volume used by the CSI driver for %s preset (must be greater than or equal to '%d')", preset.Microshift, constants.DefaultPersistentVolumeSize))
-
-	// Shared directories configs
-	if runtime.GOOS == "windows" {
-		cfg.AddSetting(SharedDirPassword, Secret(""), validateString, SuccessfullyApplied,
-			"Password used while using CIFS/SMB file sharing (It is the password for the current logged in user)")
-
-		cfg.AddSetting(EnableSharedDirs, false, validateSmbSharedDirs, SuccessfullyApplied,
-			"Mounts host's user profile folder at '/' in the CRC VM (true/false, default: false)")
-	} else {
-		cfg.AddSetting(EnableSharedDirs, true, ValidateBool, SuccessfullyApplied,
-			"Mounts host's home directory at '/' in the CRC VM (true/false, default: true)")
-	}
+	cfg.AddSetting(EnableSharedDirs, true, ValidateBool, SuccessfullyApplied,
+		"Mounts host's home directory at '/' in the CRC VM (true/false, default: true)")
 
 	if !version.IsInstaller() {
 		cfg.AddSetting(NetworkMode, string(defaultNetworkMode()), network.ValidateMode, network.SuccessfullyAppliedMode,

pkg/crc/machine/driver.go

@@ -57,19 +57,3 @@ func setDiskSize(host *host.Host, diskSize strongunits.GiB) error {
 
 	return updateDriverValue(host, diskSizeSetter)
 }
-
-func setSharedDirPassword(host *host.Host, password string) error {
-	driver, err := loadDriverConfig(host)
-	if err != nil {
-		return err
-	}
-
-	if len(driver.SharedDirs) == 0 {
-		return nil
-	}
-
-	for i := range driver.SharedDirs {
-		driver.SharedDirs[i].Password = password
-	}
-	return updateDriverStruct(host, driver)
-}

pkg/crc/machine/driver_darwin.go

@@ -9,7 +9,6 @@ import (
 	machineVf "github.com/crc-org/crc/v2/pkg/drivers/vfkit"
 	"github.com/crc-org/crc/v2/pkg/libmachine"
 	"github.com/crc-org/crc/v2/pkg/libmachine/host"
-	"github.com/crc-org/machine/libmachine/drivers"
 )
 
 func newHost(api libmachine.API, machineConfig config.MachineConfig) (*host.Host, error) {
@@ -35,7 +34,3 @@ func updateDriverConfig(host *host.Host, driver *machineVf.Driver) error {
 
 	return host.UpdateConfig(driverData)
 }
-
-func updateDriverStruct(_ *host.Host, _ *machineVf.Driver) error {
-	return drivers.ErrNotImplemented
-}

pkg/crc/machine/driver_linux.go

@@ -10,7 +10,6 @@ import (
 	"github.com/crc-org/crc/v2/pkg/libmachine"
 	"github.com/crc-org/crc/v2/pkg/libmachine/host"
 	machineLibvirt "github.com/crc-org/machine/drivers/libvirt"
-	"github.com/crc-org/machine/libmachine/drivers"
 )
 
 func newHost(api libmachine.API, machineConfig config.MachineConfig) (*host.Host, error) {
@@ -44,7 +43,3 @@ func (r *RPCServerDriver) SetConfigRaw(data []byte, _ *struct{}) error {
 	return json.Unmarshal(data, &r.ActualDriver)
 }
 */
-
-func updateDriverStruct(_ *host.Host, _ *machineLibvirt.Driver) error {
-	return drivers.ErrNotImplemented
-}

pkg/crc/machine/driver_windows.go

@@ -33,8 +33,3 @@ func updateDriverConfig(host *host.Host, driver *machineLibhvee.Driver) error {
 	}
 	return host.UpdateConfig(driverData)
 }
-
-func updateDriverStruct(host *host.Host, driver *machineLibhvee.Driver) error {
-	host.Driver = driver
-	return nil
-}

pkg/crc/machine/libhvee/driver_windows.go

@@ -1,6 +1,7 @@
 package libhvee
 
 import (
+	"fmt"
 	"path/filepath"
 	"strings"
 
@@ -35,22 +36,14 @@ func convertToUnixPath(path string) string {
 
 func configureShareDirs(machineConfig config.MachineConfig) []drivers.SharedDir {
 	var sharedDirs []drivers.SharedDir
-	for _, dir := range machineConfig.SharedDirs {
+	for i, dir := range machineConfig.SharedDirs {
 		sharedDir := drivers.SharedDir{
-			Source:   dir,
-			Target:   convertToUnixPath(dir),
-			Tag:      "crc-dir0", // smb share 'crc-dir0' is created in the msi
-			Type:     "cifs",
-			Username: machineConfig.SharedDirUsername,
-		}
-		sharedDir9p := drivers.SharedDir{
 			Source: dir,
-			Target: convertToUnixPath(dir) + "9p", // temporary solution until smb sharing is removed
-			Tag:    "crc-dir0",                    // same as above
-			//Tag:    fmt.Sprintf("dir%d", i),
-			Type: "9p",
+			Target: convertToUnixPath(dir),
+			Tag:    fmt.Sprintf("dir%d", i),
+			Type:   "9p",
 		}
-		sharedDirs = append(sharedDirs, sharedDir, sharedDir9p)
+		sharedDirs = append(sharedDirs, sharedDir)
 	}
 	return sharedDirs
 }

pkg/crc/machine/start.go

@@ -100,14 +100,6 @@ func (client *client) updateVMConfig(startConfig types.StartConfig, vm *virtualM
 		}
 	}
 
-	// we want to set the shared dir password on-the-fly to be used
-	// we do not want this value to be persisted to disk
-	if startConfig.SharedDirPassword != "" {
-		if err := setSharedDirPassword(vm.Host, startConfig.SharedDirPassword); err != nil {
-			return fmt.Errorf("Failed to set shared dir password: %w", err)
-		}
-	}
-
 	return nil
 }
 
@@ -214,7 +206,7 @@ func configureSharedDirs(vm *virtualMachine, sshRunner *crcssh.Runner) error {
 	if err != nil {
 		// the libvirt machine driver uses net/rpc, which wraps errors
 		// in rpc.ServerError, but without using golang 1.13 error
-		// wrapping feature. Moreover this package is marked as
+		// wrapping feature. Moreover, this package is marked as
 		// frozen/not accepting new features, so it's unlikely we'll
 		// ever be able to use errors.Is()
 		if err.Error() == drivers.ErrNotSupported.Error() || err.Error() == drivers.ErrNotImplemented.Error() {
@@ -249,16 +241,6 @@ func configureSharedDirs(vm *virtualMachine, sshRunner *crcssh.Runner) error {
 				return err
 			}
 
-		case "cifs":
-			smbUncPath := fmt.Sprintf("//%s/%s", hostVirtualIP, mount.Tag)
-			if _, _, err := sshRunner.RunPrivate("sudo", "mount", "-o", fmt.Sprintf("rw,uid=core,gid=core,username='%s',password='%s'", mount.Username, mount.Password), "-t", mount.Type, smbUncPath, mount.Target); err != nil {
-				err = &crcerrors.MaskedSecretError{
-					Err:    err,
-					Secret: mount.Password,
-				}
-				return fmt.Errorf("Failed to mount CIFS/SMB share '%s' please make sure configured password is correct: %w", mount.Tag, err)
-			}
-
 		case "9p":
 			// change owner to core user to allow mounting to it as a non-root user
 			if _, _, err := sshRunner.RunPrivileged("Changing owner of mount directory", "chown core:core", mount.Target); err != nil {

pkg/drivers/libhvee/libhvee_windows.go

@@ -271,11 +271,6 @@ func (d *Driver) GetIP() (string, error) {
 }
 
 func (d *Driver) GetSharedDirs() ([]drivers.SharedDir, error) {
-	for _, dir := range d.SharedDirs {
-		if !smbShareExists(dir.Tag) {
-			return []drivers.SharedDir{}, nil
-		}
-	}
 	return d.SharedDirs, nil
 }
 

pkg/drivers/libhvee/powershell_windows.go

@@ -2,7 +2,6 @@ package libhvee
 
 import (
 	"errors"
-	"fmt"
 
 	log "github.com/crc-org/crc/v2/pkg/crc/logging"
 	"github.com/crc-org/crc/v2/pkg/os/windows/powershell"
@@ -20,11 +19,6 @@ func cmdOut(args ...string) (string, error) {
 	return stdout, err
 }
 
-func cmd(args ...string) error {
-	_, err := cmdOut(args...)
-	return err
-}
-
 func hypervAvailable() error {
 	stdout, err := cmdOut("@(Get-Module -ListAvailable hyper-v).Name | Get-Unique")
 	if err != nil {
@@ -75,10 +69,3 @@ func isWindowsAdministrator() (bool, error) {
 	resp := crcstrings.FirstLine(stdout)
 	return resp == "True", nil
 }
-
-func smbShareExists(name string) bool {
-	if err := cmd(fmt.Sprintf("Get-SmbShare -Name %s", name)); err != nil {
-		return false
-	}
-	return true
-}