MyFavMirrors
/
minio
mirror of https://github.com/minio/minio.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

s3zip: Limit over-read for single file (#16161)

This commit is contained in:
Klaus Post 2022-12-02 17:53:24 +01:00 committed by GitHub
parent 1cd875de1e
commit 98cffbce03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/s3-zip-handlers.go
View File

@ -179,8 +179,13 @@ func (api objectAPIHandlers) getObjectInArchiveFileHandler(ctx context.Context,
var rc io.ReadCloser var rc io.ReadCloser
if file.UncompressedSize64 > 0 { if file.UncompressedSize64 > 0 {
// We do not know where the file ends, but the returned reader only returns UncompressedSize. // There may be number of header bytes before the content.
rs := &HTTPRangeSpec{Start: file.Offset, End: -1} // Reading 64K extra. This should more than cover name and any "extra" details.
end := file.Offset + int64(file.CompressedSize64) + 64<<10
if end > zipObjInfo.Size {
end = zipObjInfo.Size
}
rs := &HTTPRangeSpec{Start: file.Offset, End: end}
gr, err := objectAPI.GetObjectNInfo(ctx, bucket, zipPath, rs, nil, readLock, opts) gr, err := objectAPI.GetObjectNInfo(ctx, bucket, zipPath, rs, nil, readLock, opts)
if err != nil { if err != nil {
writeErrorResponse(ctx, w, toAPIError(ctx, err), r.URL) writeErrorResponse(ctx, w, toAPIError(ctx, err), r.URL)