kubernetes-csi/csi-driver-nfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: volume copy src dir fix

Browse Source
This commit is contained in:
Jan Wozniak 2023-03-14 17:06:40 +01:00
parent 61a6301ff9
commit 784da6fa80
No known key found for this signature in database
GPG Key ID: 962A0F0B52A6DC7F
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/nfs/controllerserver.go
View File

@ -320,7 +320,8 @@ func (cs *ControllerServer) copyFromVolume(ctx context.Context, req *csi.CreateV
if err != nil { if err != nil {
return status.Error(codes.NotFound, err.Error()) return status.Error(codes.NotFound, err.Error())
} }
srcPath := getInternalVolumePath(cs.Driver.workingMountDir, srcVol) // Note that the source path must include trailing '/.', can't use 'filepath.Join()' as it performs path cleaning
srcPath := fmt.Sprintf("%v/.", getInternalVolumePath(cs.Driver.workingMountDir, srcVol))
dstPath := getInternalVolumePath(cs.Driver.workingMountDir, dstVol) dstPath := getInternalVolumePath(cs.Driver.workingMountDir, dstVol)
klog.V(2).Infof("copy volume from volume %v -> %v", srcPath, dstPath) klog.V(2).Infof("copy volume from volume %v -> %v", srcPath, dstPath)
@ -345,13 +346,12 @@ func (cs *ControllerServer) copyFromVolume(ctx context.Context, req *csi.CreateV
} }
}() }()
// recursive 'cp' with '-a' to handle symlinks. Note that the source path must include trailing '/.', // recursive 'cp' with '-a' to handle symlinks
// which is the reason why 'filepath.Join()' is not used as it would perform path cleaning out, err := exec.Command("cp", "-a", srcPath, dstPath).CombinedOutput()
out, err := exec.Command("cp", "-a", fmt.Sprintf("%v%v.", srcPath, filepath.Separator), dstPath).CombinedOutput()
klog.V(2).Infof("copied %s -> %s output: %v", srcPath, dstPath, string(out))
if err != nil { if err != nil {
return status.Error(codes.Internal, err.Error()) return status.Error(codes.Internal, fmt.Sprintf("%v: %v", err, string(out)))
} }
klog.V(2).Infof("copied %s -> %s", srcPath, dstPath)
return nil return nil
} }