ayo/kitty
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

diff kitten: Strip suid/sgid bits from extracted files

Browse source
This commit is contained in:
Kovid Goyal 2026-06-03 05:45:04 +05:30
parent cb0f05c4e4
commit e6e5524f67
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kittens/diff/main.go
View file

@ -88,7 +88,7 @@ func get_ssh_file(hostname, rpath string) (string, error) {
return "", fmt.Errorf("Failed to ssh into remote host %s to get file %s with error: %w", hostname, rpath, err) return "", fmt.Errorf("Failed to ssh into remote host %s to get file %s with error: %w", hostname, rpath, err)
} }
tf := tar.NewReader(bytes.NewReader(stdout)) tf := tar.NewReader(bytes.NewReader(stdout))
count, err := utils.ExtractAllFromTar(tf, tdir) count, err := utils.ExtractAllFromTar(tf, tdir, utils.TarExtractOptions{DontPreserveSuidAndSgid: true})
if err != nil { if err != nil {
return "", fmt.Errorf("Failed to untar data from remote host %s to get file %s with error: %w", hostname, rpath, err) return "", fmt.Errorf("Failed to untar data from remote host %s to get file %s with error: %w", hostname, rpath, err)
} }

4
tools/utils/tar.go
View file

@ -18,6 +18,7 @@ var _ = fmt.Print
type TarExtractOptions struct { type TarExtractOptions struct {
DontPreservePermissions bool DontPreservePermissions bool
DontPreserveSuidAndSgid bool
} }
func volnamelen(path string) int { func volnamelen(path string) int {
@ -189,6 +190,9 @@ func ExtractAllFromTar(tr *tar.Reader, dest_path string, optss ...TarExtractOpti
set_metadata := func(chmod func(mode fs.FileMode) error, hdr_mode int64) (err error) { set_metadata := func(chmod func(mode fs.FileMode) error, hdr_mode int64) (err error) {
if !opts.DontPreservePermissions && chmod != nil { if !opts.DontPreservePermissions && chmod != nil {
perms := mode(hdr_mode) perms := mode(hdr_mode)
if opts.DontPreserveSuidAndSgid {
perms = perms &^ (os.ModeSetuid | os.ModeSetgid)
}
if err = chmod(perms); err != nil { if err = chmod(perms); err != nil {
return err return err
} }