github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #92328 from jingxu97/June/evalpath

Browse Source 
Replace evalSymlink() with powershell command for subPath_windows.go
This commit is contained in:
Kubernetes Prow Robot 2020-07-13 01:40:35 -07:00 committed by GitHub
commit 1bcf42b442
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
pkg/volume/util/subpath/subpath_windows.go
View File

@ -21,6 +21,7 @@ package subpath
import (
"fmt"
"os"
"os/exec"
"path/filepath"
"strings"
"syscall"
@ -43,6 +44,32 @@ func NewNSEnter(mounter mount.Interface, ne *nsenter.Nsenter, rootDir string) In
return nil
}
// evalPath returns the path name after the evaluation of any symbolic links.
// If the path after evaluation starts with Volume or \??\Volume, it means that it was a symlink from
// volume (represented by volumeID) to the given path. In this case, the given path is returned.
func evalPath(path string) (linkedPath string, err error) {
cmd := fmt.Sprintf("Get-Item -Path %s | Select-Object -ExpandProperty Target", path)
output, err := exec.Command("powershell", "/c", cmd).CombinedOutput()
klog.V(4).Infof("evaluate symlink from %s: %s %v", path, string(output), err)
if err != nil {
return "", err
}
linkedPath = strings.TrimSpace(string(output))
if isVolumePrefix(linkedPath) {
return path, err
}
return linkedPath, err
}
// isVolumePrefix returns true if the given path name starts with "Volume" or volume prefix including
// "\\.\" or "\\?\". Otherwise, it returns false.
func isVolumePrefix(path string) bool {
if strings.HasPrefix(path, "Volume") || strings.HasPrefix(path, "\\\\?\\") || strings.HasPrefix(path, "\\\\.\\") {
return true
}
return false
}
// check whether hostPath is within volume path
// this func will lock all intermediate subpath directories, need to close handle outside of this func after container started
func lockAndCheckSubPath(volumePath, hostPath string) ([]uintptr, error) {
@ -50,11 +77,12 @@ func lockAndCheckSubPath(volumePath, hostPath string) ([]uintptr, error) {
return []uintptr{}, nil
}
finalSubPath, err := filepath.EvalSymlinks(hostPath)
finalSubPath, err := evalPath(hostPath)
if err != nil {
return []uintptr{}, fmt.Errorf("cannot read link %s: %s", hostPath, err)
return []uintptr{}, fmt.Errorf("cannot evaluate link %s: %s", hostPath, err)
}
finalVolumePath, err := filepath.EvalSymlinks(volumePath)
finalVolumePath, err := evalPath(volumePath)
if err != nil {
return []uintptr{}, fmt.Errorf("cannot read link %s: %s", volumePath, err)
}
@ -162,7 +190,7 @@ func (sp *subpath) CleanSubPaths(podDir string, volumeName string) error {
// SafeMakeDir makes sure that the created directory does not escape given base directory mis-using symlinks.
func (sp *subpath) SafeMakeDir(subdir string, base string, perm os.FileMode) error {
realBase, err := filepath.EvalSymlinks(base)
realBase, err := evalPath(base)
if err != nil {
return fmt.Errorf("error resolving symlinks in %s: %s", base, err)
}
@ -201,11 +229,11 @@ func doSafeMakeDir(pathname string, base string, perm os.FileMode) error {
}
// Ensure the existing directory is inside allowed base
fullExistingPath, err := filepath.EvalSymlinks(existingPath)
fullExistingPath, err := evalPath(existingPath)
if err != nil {
return fmt.Errorf("error opening existing directory %s: %s", existingPath, err)
}
fullBasePath, err := filepath.EvalSymlinks(base)
fullBasePath, err := evalPath(base)
if err != nil {
return fmt.Errorf("cannot read link %s: %s", base, err)
}