Skip to content

context/store: limit decompressed size of TLS files on import #7178

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
locker95 wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −4
Open

context/store: limit decompressed size of TLS files on import #7178

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
9 changes: 5 additions & 4 deletions cli/context/store/store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ func importTar(name string, s Writer, reader io.Reader) error {
return fmt.Errorf("%s: %w", hdr.Name, err)
}
if hdr.Name == metaFile {
data, err := io.ReadAll(tr)
data, err := io.ReadAll(&limitedReader{R: tr, N: maxAllowedFileSizeToImport})
if err != nil {
return err
}
Expand All @@ -416,7 +416,7 @@ func importTar(name string, s Writer, reader io.Reader) error {
}
importedMetaFile = true
} else if strings.HasPrefix(hdr.Name, "tls/") {
data, err := io.ReadAll(tr)
data, err := io.ReadAll(&limitedReader{R: tr, N: maxAllowedFileSizeToImport})
if err != nil {
return err
}
Expand Down Expand Up @@ -478,8 +478,9 @@ func importZip(name string, s Writer, reader io.Reader) error {
if err != nil {
return err
}
data, err := io.ReadAll(f)
defer f.Close()
// Cap decompressed size the same as meta.json (zip bombs).
data, err := io.ReadAll(&limitedReader{R: f, N: maxAllowedFileSizeToImport})
f.Close()
if err != nil {
return err
}
Expand Down