Skip to content

Commit

Permalink
Merge branch 'hotfix/3.1.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
Ne-Lexa committed Nov 15, 2017
2 parents 0788892 + ba2e314 commit d67fc4d
Show file tree
Hide file tree
Showing 4 changed files with 178 additions and 122 deletions.
18 changes: 11 additions & 7 deletions src/PhpZip/Stream/ZipInputStream.php
Original file line number Diff line number Diff line change
Expand Up @@ -481,9 +481,11 @@ public function copyEntry(ZipEntry $entry, ZipOutputStreamInterface $out)
$pos = PHP_INT_SIZE === 4 ? sprintf('%u', $pos) : $pos;
$pos = $this->mapper->map($pos);

$extraLength = strlen($entry->getExtra());
$nameLength = strlen($entry->getName());

fseek($this->in, $pos + ZipEntry::LOCAL_FILE_HEADER_MIN_LEN - 2, SEEK_SET);
$extraLength = unpack('v', fread($this->in, 2))[1];

$length = ZipEntry::LOCAL_FILE_HEADER_MIN_LEN + $extraLength + $nameLength;

$padding = 0;
Expand All @@ -505,7 +507,7 @@ public function copyEntry(ZipEntry $entry, ZipOutputStreamInterface $out)
} else {
stream_copy_to_stream($this->in, $out->getStream(), $length);
}
$this->copyEntryData($entry, $out);
stream_copy_to_stream($this->in, $out->getStream(), $entry->getCompressedSize());
if ($entry->getGeneralPurposeBitFlag(ZipEntry::GPBF_DATA_DESCRIPTOR)) {
$length = 12;
if ($entry->isZip64ExtensionsRequired()) {
Expand All @@ -524,11 +526,13 @@ public function copyEntryData(ZipEntry $entry, ZipOutputStreamInterface $out)
$offset = $entry->getOffset();
$offset = PHP_INT_SIZE === 4 ? sprintf('%u', $offset) : $offset;
$offset = $this->mapper->map($offset);
$position = $offset + ZipEntry::LOCAL_FILE_HEADER_MIN_LEN +
strlen($entry->getName()) + strlen($entry->getExtra());
$length = $entry->getCompressedSize();
fseek($this->in, $position, SEEK_SET);
stream_copy_to_stream($this->in, $out->getStream(), $length);
$nameLength = strlen($entry->getName());

fseek($this->in, $offset + ZipEntry::LOCAL_FILE_HEADER_MIN_LEN - 2, SEEK_SET);
$extraLength = unpack('v', fread($this->in, 2))[1];

fseek($this->in, $offset + ZipEntry::LOCAL_FILE_HEADER_MIN_LEN + $nameLength + $extraLength, SEEK_SET);
stream_copy_to_stream($this->in, $out->getStream(), $entry->getCompressedSize());
}

public function __destruct()
Expand Down
157 changes: 157 additions & 0 deletions tests/PhpZip/ZipAlignTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,157 @@
<?php

namespace PhpZip;

use PhpZip\Util\CryptoUtil;

/**
* Test ZipAlign
*/
class ZipAlignTest extends ZipTestCase
{
public function testApkAlignedAndReSave()
{
$filename = __DIR__ . '/resources/test.apk';

self::assertCorrectZipArchive($filename);
self::doZipAlignVerify($this->outputFilename);

$zipFile = new ZipFile();
$zipFile->openFile($filename);
$zipFile->saveAsFile($this->outputFilename);
$zipFile->close();

self::assertCorrectZipArchive($this->outputFilename);
self::doZipAlignVerify($this->outputFilename);
}

public function testApkAlignedAndSetZipAlignAndReSave()
{
$filename = __DIR__ . '/resources/test.apk';

self::assertCorrectZipArchive($filename);
self::doZipAlignVerify($this->outputFilename);

$zipFile = new ZipFile();
$zipFile->openFile($filename);
$zipFile->setZipAlign(4);
$zipFile->saveAsFile($this->outputFilename);
$zipFile->close();

self::assertCorrectZipArchive($this->outputFilename);
self::doZipAlignVerify($this->outputFilename);
}

/**
* Test zip alignment.
*/
public function testZipAlignSourceZip()
{
$zipFile = new ZipFile();
for ($i = 0; $i < 100; $i++) {
$zipFile->addFromString(
'entry' . $i . '.txt',
CryptoUtil::randomBytes(mt_rand(100, 4096)),
ZipFileInterface::METHOD_STORED
);
}
$zipFile->saveAsFile($this->outputFilename);
$zipFile->close();

self::assertCorrectZipArchive($this->outputFilename);

$result = self::doZipAlignVerify($this->outputFilename);
if ($result === null) {
return;
} // zip align not installed

// check not zip align
self::assertFalse($result);

$zipFile->openFile($this->outputFilename);
$zipFile->setZipAlign(4);
$zipFile->saveAsFile($this->outputFilename);
$zipFile->close();

self::assertCorrectZipArchive($this->outputFilename);

$result = self::doZipAlignVerify($this->outputFilename, true);
self::assertNotNull($result);

// check zip align
self::assertTrue($result);
}

public function testZipAlignNewFiles()
{
$zipFile = new ZipFile();
for ($i = 0; $i < 100; $i++) {
$zipFile->addFromString(
'entry' . $i . '.txt',
CryptoUtil::randomBytes(mt_rand(100, 4096)),
ZipFileInterface::METHOD_STORED
);
}
$zipFile->setZipAlign(4);
$zipFile->saveAsFile($this->outputFilename);
$zipFile->close();

self::assertCorrectZipArchive($this->outputFilename);

$result = self::doZipAlignVerify($this->outputFilename);
if ($result === null) {
return;
} // zip align not installed
// check not zip align
self::assertTrue($result);
}

public function testZipAlignFromModifiedZipArchive()
{
$zipFile = new ZipFile();
for ($i = 0; $i < 100; $i++) {
$zipFile->addFromString(
'entry' . $i . '.txt',
CryptoUtil::randomBytes(mt_rand(100, 4096)),
ZipFileInterface::METHOD_STORED
);
}
$zipFile->saveAsFile($this->outputFilename);
$zipFile->close();

self::assertCorrectZipArchive($this->outputFilename);

$result = self::doZipAlignVerify($this->outputFilename);
if ($result === null) {
return;
} // zip align not installed

// check not zip align
self::assertFalse($result);

$zipFile->openFile($this->outputFilename);
$zipFile->deleteFromRegex("~entry2[\d]+\.txt$~s");
for ($i = 0; $i < 100; $i++) {
$isStored = (bool)mt_rand(0, 1);

$zipFile->addFromString(
'entry_new_' . ($isStored ? 'stored' : 'deflated') . '_' . $i . '.txt',
CryptoUtil::randomBytes(mt_rand(100, 4096)),
$isStored ?
ZipFileInterface::METHOD_STORED :
ZipFileInterface::METHOD_DEFLATED
);
}
$zipFile->setZipAlign(4);
$zipFile->saveAsFile($this->outputFilename);
$zipFile->close();

self::assertCorrectZipArchive($this->outputFilename);

$result = self::doZipAlignVerify($this->outputFilename, true);
self::assertNotNull($result);

// check zip align
self::assertTrue($result);
}
}
125 changes: 10 additions & 115 deletions tests/PhpZip/ZipFileTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,11 @@ public function testRename()
$zipFile->openFile($this->outputFilename);
$zipFile->rename($oldName, $newName);
$zipFile->addFromString('file1.txt', 'content');
$zipFile->rename('file1.txt', 'file2.txt');
$zipFile->addFromString('file2.txt', 'content');
$zipFile->addFromString('file3.txt', 'content');
$zipFile->rename('file1.txt', 'file_long_name.txt');
$zipFile->rename('file2.txt', 'file4.txt');
$zipFile->rename('file3.txt', 'fi.txt');
$zipFile->saveAsFile($this->outputFilename);
$zipFile->close();

Expand All @@ -414,7 +418,11 @@ public function testRename()
self::assertFalse(isset($zipFile[$oldName]));
self::assertTrue(isset($zipFile[$newName]));
self::assertFalse(isset($zipFile['file1.txt']));
self::assertTrue(isset($zipFile['file2.txt']));
self::assertFalse(isset($zipFile['file2.txt']));
self::assertFalse(isset($zipFile['file3.txt']));
self::assertTrue(isset($zipFile['file_long_name.txt']));
self::assertTrue(isset($zipFile['file4.txt']));
self::assertTrue(isset($zipFile['fi.txt']));
$zipFile->close();
}

Expand Down Expand Up @@ -1737,119 +1745,6 @@ public function testRewriteNullStream()
$zipFile->rewrite();
}

/**
* Test zip alignment.
*/
public function testZipAlignSourceZip()
{
$zipFile = new ZipFile();
for ($i = 0; $i < 100; $i++) {
$zipFile->addFromString(
'entry' . $i . '.txt',
CryptoUtil::randomBytes(mt_rand(100, 4096)),
ZipFileInterface::METHOD_STORED
);
}
$zipFile->saveAsFile($this->outputFilename);
$zipFile->close();

self::assertCorrectZipArchive($this->outputFilename);

$result = self::doZipAlignVerify($this->outputFilename);
if ($result === null) {
return;
} // zip align not installed

// check not zip align
self::assertFalse($result);

$zipFile->openFile($this->outputFilename);
$zipFile->setZipAlign(4);
$zipFile->saveAsFile($this->outputFilename);
$zipFile->close();

self::assertCorrectZipArchive($this->outputFilename);

$result = self::doZipAlignVerify($this->outputFilename, true);
self::assertNotNull($result);

// check zip align
self::assertTrue($result);
}

public function testZipAlignNewFiles()
{
$zipFile = new ZipFile();
for ($i = 0; $i < 100; $i++) {
$zipFile->addFromString(
'entry' . $i . '.txt',
CryptoUtil::randomBytes(mt_rand(100, 4096)),
ZipFileInterface::METHOD_STORED
);
}
$zipFile->setZipAlign(4);
$zipFile->saveAsFile($this->outputFilename);
$zipFile->close();

self::assertCorrectZipArchive($this->outputFilename);

$result = self::doZipAlignVerify($this->outputFilename);
if ($result === null) {
return;
} // zip align not installed
// check not zip align
self::assertTrue($result);
}

public function testZipAlignFromModifiedZipArchive()
{
$zipFile = new ZipFile();
for ($i = 0; $i < 100; $i++) {
$zipFile->addFromString(
'entry' . $i . '.txt',
CryptoUtil::randomBytes(mt_rand(100, 4096)),
ZipFileInterface::METHOD_STORED
);
}
$zipFile->saveAsFile($this->outputFilename);
$zipFile->close();

self::assertCorrectZipArchive($this->outputFilename);

$result = self::doZipAlignVerify($this->outputFilename);
if ($result === null) {
return;
} // zip align not installed

// check not zip align
self::assertFalse($result);

$zipFile->openFile($this->outputFilename);
$zipFile->deleteFromRegex("~entry2[\d]+\.txt$~s");
for ($i = 0; $i < 100; $i++) {
$isStored = (bool)mt_rand(0, 1);

$zipFile->addFromString(
'entry_new_' . ($isStored ? 'stored' : 'deflated') . '_' . $i . '.txt',
CryptoUtil::randomBytes(mt_rand(100, 4096)),
$isStored ?
ZipFileInterface::METHOD_STORED :
ZipFileInterface::METHOD_DEFLATED
);
}
$zipFile->setZipAlign(4);
$zipFile->saveAsFile($this->outputFilename);
$zipFile->close();

self::assertCorrectZipArchive($this->outputFilename);

$result = self::doZipAlignVerify($this->outputFilename, true);
self::assertNotNull($result);

// check zip align
self::assertTrue($result);
}

public function testFilename0()
{
$zipFile = new ZipFile();
Expand Down
Binary file added tests/PhpZip/resources/test.apk
Binary file not shown.

0 comments on commit d67fc4d

Please sign in to comment.