From b80ede9727190a76c60b49804753c3c9059f4b87 Mon Sep 17 00:00:00 2001
From: Manohar Reddy <b.manu199@gmail.com>
Date: Wed, 12 May 2021 05:49:09 +0000
Subject: [PATCH] fixed issues with StageVolume in createVolume

---
 charts/latest/csi-driver-smb-v0.7.0.tgz | Bin 3260 -> 3276 bytes
 pkg/smb/controllerserver.go             |  16 ++++++++++++----
 test/integration/run-test.sh            |   8 ++++----
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/charts/latest/csi-driver-smb-v0.7.0.tgz b/charts/latest/csi-driver-smb-v0.7.0.tgz
index 3ade0c358b9314735a6c1ab227b37af4f219d040..e2dd42f98ee34f63e71894769daff990981abecd 100644
GIT binary patch
delta 2988
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

delta 2935
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

diff --git a/pkg/smb/controllerserver.go b/pkg/smb/controllerserver.go
index 80f80a2e82d..9064095306c 100644
--- a/pkg/smb/controllerserver.go
+++ b/pkg/smb/controllerserver.go
@@ -181,7 +181,7 @@ func (d *Driver) ListSnapshots(ctx context.Context, req *csi.ListSnapshotsReques
 }
 
 // Given a smbVolume, return a CSI volume id
-func (d *Driver) getVolumeIDFromNfsVol(vol *smbVolume) string {
+func (d *Driver) getVolumeIDFromSmbVol(vol *smbVolume) string {
 	idElements := make([]string, totalIDElements)
 	idElements[idsourceField] = strings.Trim(vol.sourceField, "/")
 	idElements[idBaseDir] = strings.Trim(vol.baseDir, "/")
@@ -214,6 +214,10 @@ func (d *Driver) internalMount(ctx context.Context, vol *smbVolume, volCap *csi.
 		},
 		VolumeCapability: volCap,
 		VolumeId:         vol.id,
+		Secrets: map[string]string{
+			usernameField: "sanity",
+			passwordField: "sanitytestpassword",
+		},
 	})
 	return err
 }
@@ -238,8 +242,9 @@ func (d *Driver) newSMBVolume(name string, size int64, params map[string]string)
 		baseDir     string
 	)
 
+	trimChar := '"'
+
 	// Validate parameters (case-insensitive).
-	// TODO do more strict validation.
 	for k, v := range params {
 		switch strings.ToLower(k) {
 		case paramSource:
@@ -247,7 +252,7 @@ func (d *Driver) newSMBVolume(name string, size int64, params map[string]string)
 		case paramShare:
 			baseDir = v
 		default:
-			return nil, fmt.Errorf("invalid parameter %q", k)
+			klog.Warningf("invalid parameter %q", k)
 		}
 	}
 
@@ -255,6 +260,9 @@ func (d *Driver) newSMBVolume(name string, size int64, params map[string]string)
 	if sourceField == "" {
 		return nil, fmt.Errorf("%v is a required parameter", paramSource)
 	}
+	// sanitize the sourceField string
+	sourceField = strings.Trim(sourceField, string(trimChar))
+
 	if baseDir == "" {
 		return nil, fmt.Errorf("%v is a required parameter", paramShare)
 	}
@@ -265,7 +273,7 @@ func (d *Driver) newSMBVolume(name string, size int64, params map[string]string)
 		subDir:      name,
 		size:        size,
 	}
-	vol.id = d.getVolumeIDFromNfsVol(vol)
+	vol.id = d.getVolumeIDFromSmbVol(vol)
 
 	return vol, nil
 }
diff --git a/test/integration/run-test.sh b/test/integration/run-test.sh
index bf73ceda89e..9cbc9240010 100755
--- a/test/integration/run-test.sh
+++ b/test/integration/run-test.sh
@@ -24,7 +24,7 @@ readonly dirname="/tmp/$(date +%s)"
 
 mkdir "$dirname"
 export PERMISSIONS=0777
-docker run -it --name samba -p 445:445 -v "$dirname":/mount -e ACCOUNT_USERNAME='test' -e SAMBA_VOLUME_CONFIG_username='[share]; path=/mount/; guest ok = yes; read only = no; browseable = yes' -d servercontainers/samba:4.9.4
+docker run -e PERMISSIONS=0777 -p 445:445 --name samba -d andyzhangx/samba:win-fix -s "share;/smbshare/;yes;no;no;all;none" -u "sanity;sanitytestpassword" -p
 function cleanup {
   echo 'stop and delete samba container'
   docker stop samba
@@ -54,8 +54,8 @@ trap cleanup EXIT
 
 sleep 5
 # set secret for csc node stage
-export X_CSI_SECRETS=username=username,"password=test"
-params='source="//0.0.0.0/share",createSubDir="true"'
+export X_CSI_SECRETS=username=sanity,"password=sanitytestpassword"
+params='source="//0.0.0.0/share",createSubDir=true,share=share'
 # Begin to run CSI functions one by one
 echo 'Create volume test:'
 readonly value=$("$CSC_BIN" controller new --endpoint "$endpoint" --cap 1,block "$volname" --req-bytes 2147483648 --params "$params")
@@ -76,7 +76,7 @@ echo 'Mount volume test:'
 sleep 2
 
 echo "node stats test:"
-csc node stats --endpoint "$endpoint" "$volumeid:$target_path:$staging_target_path"
+"$CSC_BIN" node stats --endpoint "$endpoint" "$volumeid:$target_path:$staging_target_path"
 sleep 2
 
 echo 'Unmount volume test:'