Skip to content

Find, verify, and analyze leaked credentials

Avoid reading decompressed data into memory (#2196)

ahravd8cb65833c1f
diff --git a/pkg/handlers/archive.go b/pkg/handlers/archive.go
index 4efc27b3c..a2e0b6d65 100644
--- a/pkg/handlers/archive.go
+++ b/pkg/handlers/archive.go
@@ -84,13 +84,6 @@ func (a *Archive) FromFile(originalCtx logContext.Context, data io.Reader) chan
return archiveChan
}
-type decompressorInfo struct {
- depth int
- reader io.Reader
- archiveChan chan []byte
- archiver archiver.Decompressor
-}
-
// openArchive takes a reader and extracts the contents up to the maximum depth.
func (a *Archive) openArchive(ctx logContext.Context, depth int, reader io.Reader, archiveChan chan []byte) error {
if depth >= maxDepth {
@@ -108,11 +101,14 @@ func (a *Archive) openArchive(ctx logContext.Context, depth int, reader io.Reade
switch archive := format.(type) {
case archiver.Decompressor:
- info := decompressorInfo{depth: depth, reader: arReader, archiveChan: archiveChan, archiver: archive}
-
- return a.handleDecompressor(ctx, info)
+ // Decompress tha archive and feed the decompressed data back into the archive handler to extract any nested archives.
+ compReader, err := archive.OpenReader(arReader)
+ if err != nil {
+ return err
+ }
+ return a.openArchive(ctx, depth+1, compReader, archiveChan)
case archiver.Extractor:
- return archive.Extract(logContext.WithValue(ctx, depthKey, depth+1), reader, nil, a.extractorHandler(archiveChan))
+ return archive.Extract(logContext.WithValue(ctx, depthKey, depth+1), arReader, nil, a.extractorHandler(archiveChan))
default:
return fmt.Errorf("unknown archive type: %s", format.Name())
}
@@ -133,18 +129,6 @@ func (a *Archive) handleNonArchiveContent(ctx logContext.Context, reader io.Read
return nil
}
-func (a *Archive) handleDecompressor(ctx logContext.Context, info decompressorInfo) error {
- compReader, err := info.archiver.OpenReader(info.reader)
- if err != nil {
- return err
- }
- fileBytes, err := a.ReadToMax(ctx, compReader)
- if err != nil {
- return err
- }
- return a.openArchive(ctx, info.depth+1, bytes.NewReader(fileBytes), info.archiveChan)
-}
-
// IsFiletype returns true if the provided reader is an archive.
func (a *Archive) IsFiletype(_ logContext.Context, reader io.Reader) (io.Reader, bool) {
format, readerB, err := archiver.Identify("", reader)