2016-08-03 09:35:25 +02:00
|
|
|
// Copyright 2016 Google Inc. All rights reserved.
|
|
|
|
//
|
|
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
// you may not use this file except in compliance with the License.
|
|
|
|
// You may obtain a copy of the License at
|
|
|
|
//
|
|
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
//
|
|
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
// See the License for the specific language governing permissions and
|
|
|
|
// limitations under the License.
|
|
|
|
|
|
|
|
package zip
|
|
|
|
|
|
|
|
import (
|
2016-08-05 00:43:03 +02:00
|
|
|
"errors"
|
2016-08-03 09:35:25 +02:00
|
|
|
"io"
|
|
|
|
)
|
|
|
|
|
2017-08-24 23:11:27 +02:00
|
|
|
const DataDescriptorFlag = 0x8
|
2017-09-20 02:13:11 +02:00
|
|
|
const ExtendedTimeStampTag = 0x5455
|
2017-08-24 23:11:27 +02:00
|
|
|
|
2016-08-03 09:35:25 +02:00
|
|
|
func (w *Writer) CopyFrom(orig *File, newName string) error {
|
|
|
|
if w.last != nil && !w.last.closed {
|
|
|
|
if err := w.last.close(); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
w.last = nil
|
|
|
|
}
|
|
|
|
|
|
|
|
fileHeader := orig.FileHeader
|
|
|
|
fileHeader.Name = newName
|
|
|
|
fh := &fileHeader
|
|
|
|
|
2017-09-20 02:13:11 +02:00
|
|
|
// In some cases, we need strip the extras if it change between Central Directory
|
|
|
|
// and Local File Header.
|
|
|
|
fh.Extra = stripExtras(fh.Extra)
|
2017-02-17 22:14:43 +01:00
|
|
|
|
2016-08-03 09:35:25 +02:00
|
|
|
h := &header{
|
|
|
|
FileHeader: fh,
|
|
|
|
offset: uint64(w.cw.count),
|
|
|
|
}
|
|
|
|
w.dir = append(w.dir, h)
|
|
|
|
|
|
|
|
if err := writeHeader(w.cw, fh); err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
dataOffset, err := orig.DataOffset()
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
io.Copy(w.cw, io.NewSectionReader(orig.zipr, dataOffset, int64(orig.CompressedSize64)))
|
|
|
|
|
2017-09-13 22:17:43 +02:00
|
|
|
if orig.hasDataDescriptor() {
|
|
|
|
// Write data descriptor.
|
|
|
|
var buf []byte
|
|
|
|
if fh.isZip64() {
|
|
|
|
buf = make([]byte, dataDescriptor64Len)
|
|
|
|
} else {
|
|
|
|
buf = make([]byte, dataDescriptorLen)
|
|
|
|
}
|
|
|
|
b := writeBuf(buf)
|
|
|
|
b.uint32(dataDescriptorSignature)
|
|
|
|
b.uint32(fh.CRC32)
|
|
|
|
if fh.isZip64() {
|
|
|
|
b.uint64(fh.CompressedSize64)
|
|
|
|
b.uint64(fh.UncompressedSize64)
|
|
|
|
} else {
|
|
|
|
b.uint32(fh.CompressedSize)
|
|
|
|
b.uint32(fh.UncompressedSize)
|
|
|
|
}
|
|
|
|
_, err = w.cw.Write(buf)
|
2016-08-03 09:35:25 +02:00
|
|
|
}
|
|
|
|
return err
|
|
|
|
}
|
2016-08-05 00:43:03 +02:00
|
|
|
|
2017-09-20 02:13:11 +02:00
|
|
|
// The zip64 extras change between the Central Directory and Local File Header, while we use
|
|
|
|
// the same structure for both. The Local File Haeder is taken care of by us writing a data
|
|
|
|
// descriptor with the zip64 values. The Central Directory Entry is written by Close(), where
|
|
|
|
// the zip64 extra is automatically created and appended when necessary.
|
|
|
|
//
|
|
|
|
// The extended-timestamp extra block changes between the Central Directory Header and Local
|
|
|
|
// File Header.
|
|
|
|
// Extended-Timestamp extra(LFH): <tag-size-flag-modtime-actime-changetime>
|
|
|
|
// Extended-Timestamp extra(CDH): <tag-size-flag-modtime>
|
|
|
|
func stripExtras(input []byte) []byte {
|
2017-02-17 22:14:43 +01:00
|
|
|
ret := []byte{}
|
|
|
|
|
|
|
|
for len(input) >= 4 {
|
|
|
|
r := readBuf(input)
|
|
|
|
tag := r.uint16()
|
|
|
|
size := r.uint16()
|
|
|
|
if int(size) > len(r) {
|
|
|
|
break
|
|
|
|
}
|
2017-09-20 02:13:11 +02:00
|
|
|
if tag != zip64ExtraId && tag != ExtendedTimeStampTag {
|
2017-02-17 22:14:43 +01:00
|
|
|
ret = append(ret, input[:4+size]...)
|
|
|
|
}
|
|
|
|
input = input[4+size:]
|
|
|
|
}
|
|
|
|
|
|
|
|
// Keep any trailing data
|
|
|
|
ret = append(ret, input...)
|
|
|
|
|
|
|
|
return ret
|
|
|
|
}
|
|
|
|
|
2016-08-05 00:43:03 +02:00
|
|
|
// CreateCompressedHeader adds a file to the zip file using the provied
|
|
|
|
// FileHeader for the file metadata.
|
|
|
|
// It returns a Writer to which the already compressed file contents
|
|
|
|
// should be written.
|
|
|
|
//
|
|
|
|
// The UncompressedSize64 and CRC32 entries in the FileHeader must be filled
|
|
|
|
// out already.
|
|
|
|
//
|
|
|
|
// The file's contents must be written to the io.Writer before the next
|
|
|
|
// call to Create, CreateHeader, CreateCompressedHeader, or Close. The
|
|
|
|
// provided FileHeader fh must not be modified after a call to
|
|
|
|
// CreateCompressedHeader
|
|
|
|
func (w *Writer) CreateCompressedHeader(fh *FileHeader) (io.WriteCloser, error) {
|
|
|
|
if w.last != nil && !w.last.closed {
|
|
|
|
if err := w.last.close(); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if len(w.dir) > 0 && w.dir[len(w.dir)-1].FileHeader == fh {
|
|
|
|
// See https://golang.org/issue/11144 confusion.
|
|
|
|
return nil, errors.New("archive/zip: invalid duplicate FileHeader")
|
|
|
|
}
|
|
|
|
|
2017-08-24 23:11:27 +02:00
|
|
|
fh.Flags |= DataDescriptorFlag // we will write a data descriptor
|
2016-08-05 00:43:03 +02:00
|
|
|
|
|
|
|
fh.CreatorVersion = fh.CreatorVersion&0xff00 | zipVersion20 // preserve compatibility byte
|
|
|
|
fh.ReaderVersion = zipVersion20
|
|
|
|
|
|
|
|
fw := &compressedFileWriter{
|
|
|
|
fileWriter{
|
|
|
|
zipw: w.cw,
|
|
|
|
compCount: &countWriter{w: w.cw},
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
h := &header{
|
|
|
|
FileHeader: fh,
|
|
|
|
offset: uint64(w.cw.count),
|
|
|
|
}
|
|
|
|
w.dir = append(w.dir, h)
|
|
|
|
fw.header = h
|
|
|
|
|
|
|
|
if err := writeHeader(w.cw, fh); err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
w.last = &fw.fileWriter
|
|
|
|
return fw, nil
|
|
|
|
}
|
|
|
|
|
2017-08-24 23:11:27 +02:00
|
|
|
// Updated version of CreateHeader that doesn't enforce writing a data descriptor
|
|
|
|
func (w *Writer) CreateHeaderAndroid(fh *FileHeader) (io.Writer, error) {
|
|
|
|
writeDataDescriptor := fh.Method != Store
|
|
|
|
if writeDataDescriptor {
|
|
|
|
fh.Flags &= DataDescriptorFlag
|
|
|
|
} else {
|
|
|
|
fh.Flags &= ^uint16(DataDescriptorFlag)
|
|
|
|
}
|
|
|
|
return w.createHeaderImpl(fh)
|
|
|
|
}
|
|
|
|
|
2016-08-05 00:43:03 +02:00
|
|
|
type compressedFileWriter struct {
|
|
|
|
fileWriter
|
|
|
|
}
|
|
|
|
|
|
|
|
func (w *compressedFileWriter) Write(p []byte) (int, error) {
|
|
|
|
if w.closed {
|
|
|
|
return 0, errors.New("zip: write to closed file")
|
|
|
|
}
|
|
|
|
return w.compCount.Write(p)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (w *compressedFileWriter) Close() error {
|
|
|
|
if w.closed {
|
|
|
|
return errors.New("zip: file closed twice")
|
|
|
|
}
|
|
|
|
w.closed = true
|
|
|
|
|
|
|
|
// update FileHeader
|
|
|
|
fh := w.header.FileHeader
|
|
|
|
fh.CompressedSize64 = uint64(w.compCount.count)
|
|
|
|
|
|
|
|
if fh.isZip64() {
|
|
|
|
fh.CompressedSize = uint32max
|
|
|
|
fh.UncompressedSize = uint32max
|
|
|
|
fh.ReaderVersion = zipVersion45 // requires 4.5 - File uses ZIP64 format extensions
|
|
|
|
} else {
|
|
|
|
fh.CompressedSize = uint32(fh.CompressedSize64)
|
|
|
|
fh.UncompressedSize = uint32(fh.UncompressedSize64)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Write data descriptor. This is more complicated than one would
|
|
|
|
// think, see e.g. comments in zipfile.c:putextended() and
|
|
|
|
// http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7073588.
|
|
|
|
// The approach here is to write 8 byte sizes if needed without
|
|
|
|
// adding a zip64 extra in the local header (too late anyway).
|
|
|
|
var buf []byte
|
|
|
|
if fh.isZip64() {
|
|
|
|
buf = make([]byte, dataDescriptor64Len)
|
|
|
|
} else {
|
|
|
|
buf = make([]byte, dataDescriptorLen)
|
|
|
|
}
|
|
|
|
b := writeBuf(buf)
|
|
|
|
b.uint32(dataDescriptorSignature) // de-facto standard, required by OS X
|
|
|
|
b.uint32(fh.CRC32)
|
|
|
|
if fh.isZip64() {
|
|
|
|
b.uint64(fh.CompressedSize64)
|
|
|
|
b.uint64(fh.UncompressedSize64)
|
|
|
|
} else {
|
|
|
|
b.uint32(fh.CompressedSize)
|
|
|
|
b.uint32(fh.UncompressedSize)
|
|
|
|
}
|
|
|
|
_, err := w.zipw.Write(buf)
|
|
|
|
return err
|
|
|
|
}
|