-
Notifications
You must be signed in to change notification settings - Fork 3
Expand file tree
/
Copy pathreader.go
More file actions
707 lines (639 loc) · 16.9 KB
/
reader.go
File metadata and controls
707 lines (639 loc) · 16.9 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
package zipstream
import (
"archive/zip"
"bufio"
"bytes"
"encoding/binary"
"errors"
"fmt"
"hash"
"hash/crc32"
"io"
"math"
"sync"
"time"
"github.com/klauspost/compress/flate"
)
const (
rawReaderBufSize = 16384
headerIdentifierLen = 4
fileHeaderLen = 26
dataDescriptorLen = 16 // four uint32: descriptor signature, crc32, compressed size, size
zip64DataDescriptorLen = 24 // four uint32: descriptor signature, crc32 and uint64: compressed size, size
fileHeaderSignature = 0x04034b50
directoryHeaderSignature = 0x02014b50
directoryEndSignature = 0x06054b50
dataDescriptorSignature = 0x08074b50
// Extra header IDs.
// See http://mdfs.net/Docs/Comp/Archiving/Zip/ExtraField
Zip64ExtraID = 0x0001 // Zip64 extended information
NtfsExtraID = 0x000a // NTFS
UnixExtraID = 0x000d // UNIX
ExtTimeExtraID = 0x5455 // Extended timestamp
InfoZipUnixExtraID = 0x5855 // Info-ZIP Unix extension
)
var (
byteBuf [1]byte
bufPool = newSyncPool[[]byte](func() []byte {
return make([]byte, rawReaderBufSize)
}, nil)
)
type Entry struct {
zip.FileHeader
r io.Reader
rawReader byteCountReader
dataReader io.ReadCloser // the entry file reader
zip64 bool
eof bool
}
func (e *Entry) hasDataDescriptor() bool {
return e.Flags&8 != 0
}
// IsDir just simply verify whether the filename ends with a forward slash "/".
func (e *Entry) IsDir() bool {
return len(e.Name) > 0 && e.Name[len(e.Name)-1] == '/'
}
func (e *Entry) Open() (io.ReadCloser, error) {
if e.eof {
return nil, errors.New("this file has read to end")
}
if e.dataReader != nil {
return nil, errors.New("repeated Open is not supported")
}
decomp := decompressor(e.Method)
if decomp == nil {
return nil, zip.ErrAlgorithm
}
e.dataReader = &checksumReader{
rc: decomp(e.rawReader),
hash: crc32.NewIEEE(),
entry: e,
}
return e.dataReader, nil
}
// OpenRaw read the entry's original compressed(or stored) data, you must be
// aware that this method may be significantly slower than the same one in
// standard package [archive/zip], especially handle the entry with a data
// descriptor because we must decompress all the file to determine its EOF position.
// See the Unit Test case BenchmarkOpenRaw for details.
func (e *Entry) OpenRaw() (io.ReadCloser, error) {
if e.eof {
return nil, errors.New("this file has read to end")
}
if e.dataReader != nil {
return nil, errors.New("repeated Open is not supported")
}
if e.Method == zip.Store {
return e.Open()
}
e.dataReader = newRawReader(e)
return e.dataReader, nil
}
func (e *Entry) Skip() error {
if e.dataReader == nil {
_, err := e.Open()
if err != nil {
return err
}
}
return e.dataReader.Close()
}
type Reader struct {
r *bufio.Reader
localFileEnd bool
curEntry *Entry
err error
}
func NewReader(r io.Reader) *Reader {
br, ok := r.(*bufio.Reader)
if !ok {
br = bufio.NewReader(r)
}
return &Reader{
r: br,
}
}
func (z *Reader) readEntry() (*Entry, error) {
buf := make([]byte, fileHeaderLen)
if _, err := io.ReadFull(z.r, buf); err != nil {
return nil, fmt.Errorf("unable to read local file header: %w", err)
}
lr := readBuf(buf)
readerVersion := lr.uint16()
flags := lr.uint16()
method := lr.uint16()
modifiedTime := lr.uint16()
modifiedDate := lr.uint16()
crc32Sum := lr.uint32()
compressedSize := lr.uint32()
uncompressedSize := lr.uint32()
filenameLen := int(lr.uint16())
extraAreaLen := int(lr.uint16())
entry := &Entry{
FileHeader: zip.FileHeader{
ReaderVersion: readerVersion,
Flags: flags,
Method: method,
ModifiedTime: modifiedTime,
ModifiedDate: modifiedDate,
CRC32: crc32Sum,
CompressedSize: compressedSize,
UncompressedSize: uncompressedSize,
CompressedSize64: uint64(compressedSize),
UncompressedSize64: uint64(uncompressedSize),
},
r: z.r,
eof: false,
}
nameAndExtraBuf := make([]byte, filenameLen+extraAreaLen)
if _, err := io.ReadFull(z.r, nameAndExtraBuf); err != nil {
return nil, fmt.Errorf("unable to read entry name and extra area: %w", err)
}
entry.Name = string(nameAndExtraBuf[:filenameLen])
entry.Extra = nameAndExtraBuf[filenameLen:]
entry.NonUTF8 = flags&0x800 == 0
if flags&1 == 1 {
return nil, fmt.Errorf("encrypted ZIP entry not supported")
}
if flags&8 == 8 && method != zip.Deflate {
// Generally "Store" files should not be followed by a data descriptor,
// even though the specification doesn’t explicitly prohibit it.
// Besides, in this case we are not able to determine the end position of file,
// the only behavior is reporting an error.
return nil, fmt.Errorf("only DEFLATED entries can have data descriptor")
}
needCSize := entry.CompressedSize == ^uint32(0)
needUSize := entry.UncompressedSize == ^uint32(0)
ler := readBuf(entry.Extra)
var modified time.Time
parseExtras:
for len(ler) >= 4 { // need at least tag and size
fieldTag := ler.uint16()
fieldSize := int(ler.uint16())
if len(ler) < fieldSize {
break
}
fieldBuf := ler.sub(fieldSize)
switch fieldTag {
case Zip64ExtraID:
entry.zip64 = true
// update directory values from the zip64 extra block.
// They should only be consulted if the sizes read earlier
// are maxed out.
// See golang.org/issue/13367.
if needUSize {
needUSize = false
if len(fieldBuf) < 8 {
return nil, zip.ErrFormat
}
entry.UncompressedSize64 = fieldBuf.uint64()
}
if needCSize {
needCSize = false
if len(fieldBuf) < 8 {
return nil, zip.ErrFormat
}
entry.CompressedSize64 = fieldBuf.uint64()
}
case NtfsExtraID:
if len(fieldBuf) < 4 {
continue parseExtras
}
fieldBuf.uint32() // reserved (ignored)
for len(fieldBuf) >= 4 { // need at least tag and size
attrTag := fieldBuf.uint16()
attrSize := int(fieldBuf.uint16())
if len(fieldBuf) < attrSize {
continue parseExtras
}
attrBuf := fieldBuf.sub(attrSize)
if attrTag != 1 || attrSize != 24 {
continue // Ignore irrelevant attributes
}
const ticksPerSecond = 1e7 // Windows timestamp resolution
ts := int64(attrBuf.uint64()) // ModTime since Windows epoch
secs := ts / ticksPerSecond
nsecs := (1e9 / ticksPerSecond) * int64(ts%ticksPerSecond)
epoch := time.Date(1601, time.January, 1, 0, 0, 0, 0, time.UTC)
modified = time.Unix(epoch.Unix()+secs, nsecs)
}
case UnixExtraID, InfoZipUnixExtraID:
if len(fieldBuf) < 8 {
continue parseExtras
}
fieldBuf.uint32() // AcTime (ignored)
ts := int64(fieldBuf.uint32()) // ModTime since Unix epoch
modified = time.Unix(ts, 0)
case ExtTimeExtraID:
if len(fieldBuf) < 5 || fieldBuf.uint8()&1 == 0 {
continue parseExtras
}
ts := int64(fieldBuf.uint32()) // ModTime since Unix epoch
modified = time.Unix(ts, 0)
}
}
msDosModified := MSDosTimeToTime(entry.ModifiedDate, entry.ModifiedTime)
entry.Modified = msDosModified
if !modified.IsZero() {
entry.Modified = modified.UTC()
// If legacy MS-DOS timestamps are set, we can use the delta between
// the legacy and extended versions to estimate timezone offset.
//
// A non-UTC timezone is always used (even if offset is zero).
// Thus, FileHeader.Modified.Location() == time.UTC is useful for
// determining whether extended timestamps are present.
// This is necessary for users that need to do additional time
// calculations when dealing with legacy ZIP formats.
if entry.ModifiedTime != 0 || entry.ModifiedDate != 0 {
entry.Modified = modified.In(timeZone(msDosModified.Sub(modified)))
}
}
if needCSize {
return nil, zip.ErrFormat
}
// If "general purpose bit flag" Bit 3 is set, the fields crc-32,
// compressed size and uncompressed size are set to zero in the
// local header. The correct values are put in the
// data descriptor immediately following the compressed
// data.
if entry.IsDir() {
entry.rawReader = countable(bytes.NewReader(nil))
} else if !entry.hasDataDescriptor() {
entry.rawReader = countable(newLimitByteReader(z.r, int64(entry.CompressedSize64)))
} else {
entry.rawReader = countable(z.r) // use the deflate reader to determine the entry's EOF.
}
return entry, nil
}
// Next indicates whether there is more entry can be read,
// You can check err to judge if there is any failure when it returns false.
func (z *Reader) Next() bool {
if z.err != nil {
return false
}
if z.localFileEnd {
return false
}
if z.curEntry != nil && !z.curEntry.eof {
if err := z.curEntry.Skip(); err != nil {
z.err = fmt.Errorf("unable to skip previos file data: %w", err)
return false
}
z.curEntry.eof = true
}
headerSigBuf := make([]byte, headerIdentifierLen)
if _, err := io.ReadFull(z.r, headerSigBuf); err != nil {
z.err = fmt.Errorf("unable to read header identifier: %w", err)
return false
}
headerSig := binary.LittleEndian.Uint32(headerSigBuf)
if headerSig != fileHeaderSignature {
if headerSig == directoryHeaderSignature || headerSig == directoryEndSignature {
z.localFileEnd = true
return false
}
z.err = zip.ErrFormat
return false
}
return true
}
func (z *Reader) Err() error {
return z.err
}
func (z *Reader) Entry() (*Entry, error) {
entry, err := z.readEntry()
if err != nil {
return nil, fmt.Errorf("unable to read zip file header: %w", err)
}
z.curEntry = entry
return entry, nil
}
// GetNextEntry return next entry in the zip archive
// Deprecated, together use Next and Entry instead
func (z *Reader) GetNextEntry() (*Entry, error) {
if z.Next() {
return z.Entry()
}
if z.err != nil {
return nil, z.err
}
return nil, io.EOF
}
var (
decompressors sync.Map // map[uint16]Decompressor
)
func init() {
decompressors.Store(zip.Store, zip.Decompressor(io.NopCloser))
decompressors.Store(zip.Deflate, zip.Decompressor(newDeflateReader))
}
func decompressor(method uint16) zip.Decompressor {
di, ok := decompressors.Load(method)
if !ok {
return nil
}
return di.(zip.Decompressor)
}
var deflateReaderPool sync.Pool
// We use github.com/klauspost/compress/flate instead of the standard compress/flate because
// the latter’s documentation says that it may read beyond the end of the Deflate stream.
func newDeflateReader(r io.Reader) io.ReadCloser {
fr, ok := deflateReaderPool.Get().(io.ReadCloser)
if ok {
fr.(flate.Resetter).Reset(r, nil)
} else {
fr = flate.NewReader(r)
}
return &pooledDeflateReader{fr: fr}
}
type pooledDeflateReader struct {
mu sync.Mutex // guards Close and Read
fr io.ReadCloser
}
func (r *pooledDeflateReader) Read(p []byte) (n int, err error) {
r.mu.Lock()
defer r.mu.Unlock()
if r.fr == nil {
return 0, errors.New("Read after Close")
}
return r.fr.Read(p)
}
func (r *pooledDeflateReader) Close() error {
r.mu.Lock()
defer r.mu.Unlock()
var err error
if r.fr != nil {
err = r.fr.Close()
deflateReaderPool.Put(r.fr)
r.fr = nil
}
return err
}
func readDataDescriptor(r io.Reader, entry *Entry, zip64 bool) error {
entry.zip64 = zip64
ddLen := dataDescriptorLen
if zip64 {
ddLen = zip64DataDescriptorLen
}
buf := make([]byte, ddLen)
// The spec says: "Although not originally assigned a
// signature, the value 0x08074b50 has commonly been adopted
// as a signature value for the data descriptor record.
// Implementers should be aware that ZIP files may be
// encountered with or without this signature marking data
// descriptors and should account for either case when reading
// ZIP files to ensure compatibility."
//
// dataDescriptorLen includes the size of the signature but
// first read just those 4 bytes to see if it exists.
_, err := io.ReadFull(r, buf[:4])
if err != nil {
return err
}
off := 0
if binary.LittleEndian.Uint32(buf[:4]) != dataDescriptorSignature {
// No data descriptor signature. Reserve these four bytes.
off += 4
}
_, err = io.ReadFull(r, buf[off:ddLen-4])
if err != nil {
return err
}
entry.eof = true
b := readBuf(buf[:ddLen-4])
entry.CRC32 = b.uint32()
if zip64 {
entry.CompressedSize64 = b.uint64()
entry.UncompressedSize64 = b.uint64()
} else {
entry.CompressedSize64 = uint64(b.uint32())
entry.UncompressedSize64 = uint64(b.uint32())
}
return nil
}
type shadowReader struct {
ch chan []byte
buf []byte
offset int
size int
err error
}
func (s *shadowReader) Read(p []byte) (n int, err error) {
var ok bool
for n < len(p) {
if s.offset >= len(s.buf) {
if s.err != nil {
return n, s.err
}
bufPool.Put(s.buf)
s.buf, ok = <-s.ch
if !ok {
return n, io.EOF
}
s.offset = 0
}
size := copy(p[n:], s.buf[s.offset:])
s.offset += size
n += size
}
if s.offset < len(s.buf) {
return n, nil // there is unread data, do not return error
}
return n, s.err
}
type readerBridge struct {
r byteReader
buf []byte
size int
err error
shadow *shadowReader
closed bool
}
func newReaderBridge(r byteReader) *readerBridge {
initBuf := bufPool.Get()
return &readerBridge{
r: r,
buf: bufPool.Get(),
shadow: &shadowReader{
ch: make(chan []byte),
buf: initBuf, // avoid nil value checking
offset: len(initBuf),
},
}
}
func (r *readerBridge) closeChan() {
if !r.closed {
close(r.shadow.ch)
r.closed = true
}
}
func (r *readerBridge) flush(err error) {
if r.size > 0 {
r.shadow.ch <- r.buf[:r.size]
r.size = 0
}
r.closeChan()
if r.err != nil {
r.shadow.err = r.err
return
}
r.err = err
r.shadow.err = err
}
func (r *readerBridge) Read(p []byte) (n int, err error) {
if r.err != nil {
return 0, r.err
}
n, err = r.r.Read(p[:min(len(r.buf)-r.size, len(p))])
r.size += copy(r.buf[r.size:], p[:n])
r.err = err
if err != nil || (r.size >= len(r.buf)) {
r.shadow.ch <- r.buf[:r.size]
r.buf = bufPool.Get()
r.size = 0
if err != nil {
r.shadow.err = err
r.closeChan()
}
}
return n, err
}
func (r *readerBridge) ReadByte() (byte, error) {
n, err := r.Read(byteBuf[:])
if n > 0 {
return byteBuf[0], err
}
return 0, err
}
type rawReader struct {
r io.Reader
uSize uint64 // number of uncompressed bytes read so far
entry *Entry
err error
}
func newRawReader(e *Entry) *rawReader {
rr := &rawReader{
entry: e,
}
if !e.hasDataDescriptor() {
rr.r = e.rawReader
return rr
}
bridge := newReaderBridge(e.rawReader)
fr := flate.NewReader(bridge)
go func() {
buf := make([]byte, rawReaderBufSize)
for {
n, err := fr.Read(buf)
rr.uSize += uint64(n)
if err != nil {
rr.err = err
bridge.flush(err)
break
}
}
_ = fr.Close()
}()
rr.r = bridge.shadow
return rr
}
func (r *rawReader) Read(p []byte) (n int, err error) {
if r.err != nil {
return 0, r.err
}
n, err = r.r.Read(p)
if errors.Is(err, io.EOF) {
if r.entry.hasDataDescriptor() {
zip64 := r.entry.rawReader.NRead() > math.MaxUint32 || r.uSize > math.MaxUint32
if err := readDataDescriptor(r.entry.r, r.entry, zip64); err != nil {
if errors.Is(err, io.EOF) {
r.err = io.ErrUnexpectedEOF
return n, r.err
} else {
r.err = err
return n, r.err
}
}
}
if r.entry.CompressedSize64 > 0 && r.entry.rawReader.NRead() != r.entry.CompressedSize64 {
r.err = io.ErrUnexpectedEOF
return n, r.err
}
// skip crc32 checksum verification, it's the caller's duty in raw deflate reader
r.entry.eof = true
}
r.err = err
return n, err
}
func (r *rawReader) Close() error {
if !r.entry.eof {
_, err := io.Copy(io.Discard, r)
if err != nil {
return err
}
r.entry.eof = true
}
return nil
}
type checksumReader struct {
rc io.ReadCloser
hash hash.Hash32
uSize uint64 // number of uncompressed bytes read so far
entry *Entry
err error // sticky error
}
func (r *checksumReader) Read(b []byte) (n int, err error) {
if r.err != nil {
return 0, r.err
}
n, err = r.rc.Read(b)
r.hash.Write(b[:n])
r.uSize += uint64(n)
if err == nil {
return
}
if errors.Is(err, io.EOF) {
if r.entry.UncompressedSize64 > 0 && r.uSize != r.entry.UncompressedSize64 {
r.err = io.ErrUnexpectedEOF
return n, r.err
}
if r.entry.hasDataDescriptor() {
zip64 := r.entry.rawReader.NRead() > math.MaxUint32 || r.uSize > math.MaxUint32
if err := readDataDescriptor(r.entry.r, r.entry, zip64); err != nil {
if errors.Is(err, io.EOF) {
r.err = io.ErrUnexpectedEOF
return n, r.err
} else {
r.err = err
return n, r.err
}
}
if r.entry.rawReader.NRead() != r.entry.CompressedSize64 {
r.err = fmt.Errorf("invalid entry compressed size (expected %d but got %d bytes)",
r.entry.CompressedSize64, r.entry.rawReader.NRead())
return n, r.err
}
if r.uSize != r.entry.UncompressedSize64 {
r.err = fmt.Errorf("invalid entry size (expected %d but got %d bytes)",
r.entry.UncompressedSize64, r.uSize)
return n, r.err
}
}
r.entry.eof = true
if r.entry.CRC32 != 0 && r.hash.Sum32() != r.entry.CRC32 {
r.err = zip.ErrChecksum
return n, r.err
}
}
r.err = err
return n, r.err
}
func (r *checksumReader) Close() error {
if !r.entry.eof {
_, err := io.Copy(io.Discard, r)
if err != nil {
return err
}
r.entry.eof = true
}
return r.rc.Close()
}