Skip to content

fix arbitrary file access during archive extraction ("Zip Slip") #34982

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix arbitrary file access during archive extraction ("Zip Slip") #34982

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions sdks/go/pkg/beam/core/runtime/xlangx/expansionx/download.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,24 @@ func extractJar(source, dest string) error {

for _, file := range reader.File {
fileName := filepath.Join(dest, file.Name)

// Validate the file path to prevent directory traversal
absFileName, err := filepath.Abs(fileName)
if err != nil {
return fmt.Errorf("error resolving absolute path for %s: %w", fileName, err)
}
absDest, err := filepath.Abs(dest)
if err != nil {
return fmt.Errorf("error resolving absolute path for destination %s: %w", dest, err)
}
if !strings.HasPrefix(absFileName, absDest+string(os.PathSeparator)) {
return fmt.Errorf("invalid file path %s: outside of destination directory %s", absFileName, absDest)
}

if file.FileInfo().IsDir() {
os.MkdirAll(fileName, 0700)
if err := os.MkdirAll(absFileName, 0700); err != nil {
return fmt.Errorf("error creating directory %s: %w", absFileName, err)
}
continue
}

Expand All @@ -152,9 +168,9 @@ func extractJar(source, dest string) error {
}
defer sf.Close()

df, err := os.OpenFile(fileName, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0777)
df, err := os.OpenFile(absFileName, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0777)
if err != nil {
return fmt.Errorf("error opening destination file %s: %w", fileName, err)
return fmt.Errorf("error opening destination file %s: %w", absFileName, err)
}
defer df.Close()

Expand Down
Loading