mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-06-08 14:18:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix failure of tarfile extract when dest_path has symlinks

Browse Source
This commit is contained in:
Kovid Goyal
2025-04-21 09:46:30 +05:30
parent 4d69eea4af
commit 6f673929eb
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tools/utils/tar.go
View File

@@ -171,10 +171,13 @@ func ExtractAllFromTar(tr *tar.Reader, dest_path string, optss ...TarExtractOpti
if len(optss) > 0 { if len(optss) > 0 {
opts = optss[0] opts = optss[0]
} }
dest_path, err = filepath.Abs(dest_path) if dest_path, err = filepath.Abs(dest_path); err != nil {
if err != nil {
return return
} }
if dest_path, err = filepath.EvalSymlinks(dest_path); err != nil {
return
}
dest_path = filepath.Clean(dest_path)
mode := func(hdr int64) fs.FileMode { mode := func(hdr int64) fs.FileMode {
return fs.FileMode(hdr) & (fs.ModePerm | fs.ModeSetgid | fs.ModeSetuid | fs.ModeSticky) return fs.FileMode(hdr) & (fs.ModePerm | fs.ModeSetgid | fs.ModeSetuid | fs.ModeSticky)
@@ -190,6 +193,7 @@ func ExtractAllFromTar(tr *tar.Reader, dest_path string, optss ...TarExtractOpti
count++ count++
return return
} }
needed_prefix := dest_path + string(os.PathSeparator)
for { for {
var hdr *tar.Header var hdr *tar.Header
@@ -208,7 +212,7 @@ func ExtractAllFromTar(tr *tar.Reader, dest_path string, optss ...TarExtractOpti
if dest, err = EvalSymlinksThatExist(dest); err != nil { if dest, err = EvalSymlinksThatExist(dest); err != nil {
return count, err return count, err
} }
if !strings.HasPrefix(filepath.Clean(dest), filepath.Clean(dest_path)+string(os.PathSeparator)) { if !strings.HasPrefix(dest, needed_prefix) {
continue continue
} }
switch hdr.Typeflag { switch hdr.Typeflag {