zishuo/runc
1
0
Fork 0
mirror of https://github.com/opencontainers/runc.git synced 2025-10-25 00:20:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4630 from kolyshkin/clean-path

Browse Source 
libc/utils: simplify CleanPath
This commit is contained in:
Rodrigo Campos
2025-02-13 13:59:23 -03:00
committed by GitHub
parent 199a307569 8db6ffbeef
commit b0b186e64d
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libcontainer/utils/utils.go
View File

@@ -50,19 +50,19 @@ func CleanPath(path string) string {
// Ensure that all paths are cleaned (especially problematic ones like // Ensure that all paths are cleaned (especially problematic ones like
// "/../../../../../" which can cause lots of issues). // "/../../../../../" which can cause lots of issues).
path = filepath.Clean(path)
if filepath.IsAbs(path) {
return filepath.Clean(path)
}
// If the path isn't absolute, we need to do more processing to fix paths // If the path isn't absolute, we need to do more processing to fix paths
// such as "../../../../<etc>/some/path". We also shouldn't convert absolute // such as "../../../../<etc>/some/path". We also shouldn't convert absolute
// paths to relative ones. // paths to relative ones.
if !filepath.IsAbs(path) { path = filepath.Clean(string(os.PathSeparator) + path)
path = filepath.Clean(string(os.PathSeparator) + path) // This can't fail, as (by definition) all paths are relative to root.
// This can't fail, as (by definition) all paths are relative to root. path, _ = filepath.Rel(string(os.PathSeparator), path)
path, _ = filepath.Rel(string(os.PathSeparator), path)
}
// Clean the path again for good measure. return path
return filepath.Clean(path)
} }
// stripRoot returns the passed path, stripping the root path if it was // stripRoot returns the passed path, stripping the root path if it was