Merge pull request #66 from andyzhangx/smb-remount

fix: SMB remount issue

Author: k8s-ci-robot

internal/os/filesystem/api.go

@@ -3,6 +3,8 @@ package filesystem
 import (
 	"fmt"
 	"os"
+	"os/exec"
+	"strings"
 )
 
 // Implements the Filesystem OS API calls. All code here should be very simple
@@ -31,6 +33,25 @@ func (APIImplementor) PathExists(path string) (bool, error) {
 	return pathExists(path)
 }
 
+func pathValid(path string) (bool, error) {
+	cmd := exec.Command("powershell", "/c", `Test-Path $Env:remoteapth`)
+	cmd.Env = append(os.Environ(), fmt.Sprintf("remoteapth=%s", path))
+	output, err := cmd.CombinedOutput()
+	if err != nil {
+		return false, fmt.Errorf("returned output: %s, error: %v", string(output), err)
+	}
+
+	return strings.HasPrefix(strings.ToLower(string(output)), "true"), nil
+}
+
+// PathValid determines whether all elements of a path exist
+//   https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.management/test-path?view=powershell-7
+// for a remote path, determines whether connection is ok
+//   e.g. in a SMB server connection, if password is changed, connection will be lost, this func will return false
+func (APIImplementor) PathValid(path string) (bool, error) {
+	return pathValid(path)
+}
+
 func (APIImplementor) Mkdir(path string) error {
 	return os.MkdirAll(path, 0755)
 }

internal/os/filesystem/api_test.go

@@ -0,0 +1,39 @@
+// +build windows
+
+package filesystem
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestPathValid(t *testing.T) {
+	tests := []struct {
+		remotepath     string
+		expectedResult bool
+		expectError    bool
+	}{
+		{
+			"c:",
+			true,
+			false,
+		},
+		{
+			"invalid-path",
+			false,
+			false,
+		},
+	}
+
+	for _, test := range tests {
+		result, err := pathValid(test.remotepath)
+		assert.Equal(t, result, test.expectedResult, "Expect result not equal with pathValid(%s) return: %q, expected: %q, error: %v",
+			test.remotepath, result, test.expectedResult, err)
+		if test.expectError {
+			assert.NotNil(t, err, "Expect error during pathValid(%s)", test.remotepath)
+		} else {
+			assert.Nil(t, err, "Expect error is nil during pathValid(%s)", test.remotepath)
+		}
+	}
+}

internal/server/filesystem/server.go

@@ -23,6 +23,7 @@ var absPathRegexWindows = regexp.MustCompile(`^[a-zA-Z]:\\`)
 
 type API interface {
 	PathExists(path string) (bool, error)
+	PathValid(path string) (bool, error)
 	Mkdir(path string) error
 	Rmdir(path string, force bool) error
 	LinkPath(tgt string, src string) error
@@ -139,6 +140,12 @@ func (s *Server) PathExists(ctx context.Context, request *internal.PathExistsReq
 	}, err
 }
 
+// PathValid checks if the given path is accessiable.
+func (s *Server) PathValid(ctx context.Context, path string) (bool, error) {
+	klog.V(4).Infof("calling PathValid with path %q", path)
+	return s.hostAPI.PathValid(path)
+}
+
 func (s *Server) Mkdir(ctx context.Context, request *internal.MkdirRequest, version apiversion.Version) (*internal.MkdirResponse, error) {
 	klog.V(4).Infof("calling Mkdir with path %q", request.Path)
 	err := s.validatePathWindows(request.Context, request.Path)

internal/server/filesystem/server_test.go

@@ -13,6 +13,9 @@ type fakeFileSystemAPI struct{}
 func (fakeFileSystemAPI) PathExists(path string) (bool, error) {
 	return true, nil
 }
+func (fakeFileSystemAPI) PathValid(path string) (bool, error) {
+	return true, nil
+}
 func (fakeFileSystemAPI) Mkdir(path string) error {
 	return nil
 }

internal/server/smb/server.go

@@ -45,6 +45,22 @@ func (s *Server) NewSmbGlobalMapping(context context.Context, request *internal.
 		isMapped = false
 	}
 
+	valid, err := s.fsServer.PathValid(context, remotePath)
+	if err != nil {
+		klog.Errorf("PathValid(%s) failed with %v", remotePath, err)
+		return response, fmt.Errorf("PathValid(%s) failed with %v", remotePath, err)
+	}
+
+	if isMapped && !valid {
+		klog.V(4).Infof("Remote %s is not valid, removing now", remotePath)
+		err := s.hostAPI.RemoveSmbGlobalMapping(remotePath)
+		if err != nil {
+			klog.Errorf("RemoveSmbGlobalMapping(%s) failed with %v", remotePath, err)
+			return response, err
+		}
+		isMapped = false
+	}
+
 	if !isMapped {
 		klog.V(4).Infof("Remote %s not mapped. Mapping now!", remotePath)
 		err := s.hostAPI.NewSmbGlobalMapping(remotePath, request.Username, request.Password)

internal/server/smb/server_test.go

@@ -32,6 +32,9 @@ type fakeFileSystemAPI struct{}
 func (fakeFileSystemAPI) PathExists(path string) (bool, error) {
 	return true, nil
 }
+func (fakeFileSystemAPI) PathValid(path string) (bool, error) {
+	return true, nil
+}
 func (fakeFileSystemAPI) Mkdir(path string) error {
 	return nil
 }