mirror/php-zip
1
0
Fork 0
mirror of https://github.com/Ne-Lexa/php-zip.git synced 2025-03-21 06:59:40 +01:00
Code Issues Releases Wiki Activity

Merge branch 'hotfix/3.0.1'

Browse Source
This commit is contained in:
Ne-Lexa 2017-03-15 19:03:17 +03:00
commit f99c0278fd
8 changed files with 94 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/PhpZip/Crypto/TraditionalPkwareEncryptionEngine.php
View File

@ -155,12 +155,12 @@ class TraditionalPkwareEncryptionEngine implements CryptoEngine
if ($this->entry->getGeneralPurposeBitFlag(ZipEntry::GPBF_DATA_DESCRIPTOR)) {
// compare against the file type from extended local headers
$checkByte = ($this->entry->getTime() >> 8) & 0xff;
$checkByte = ($this->entry->getDosTime() >> 8) & 0xff;
} else {
// compare against the CRC otherwise
$checkByte = ($this->entry->getCrc() >> 24) & 0xff;
}
if ($headerBytes[11] !== $checkByte) {
if ($byte !== $checkByte) {
throw new ZipAuthenticationException("Bad password for entry " . $this->entry->getName());
}
@ -192,9 +192,9 @@ class TraditionalPkwareEncryptionEngine implements CryptoEngine
*/
public function encrypt($data)
{
$crc = ($this->entry->isDataDescriptorRequired() ?
($this->entry->getTime() & 0x0000ffff) << 16 :
$this->entry->getCrc());
$crc = $this->entry->isDataDescriptorRequired() ?
($this->entry->getDosTime() & 0x0000ffff) << 16 :
$this->entry->getCrc();
$headerBytes = CryptoUtil::randomBytes(self::STD_DEC_HDR_SIZE);
// Initialize again since the generated bytes were encrypted.

14
src/PhpZip/Model/CentralDirectory.php
View File

@ -166,6 +166,18 @@ class CentralDirectory
return $this->entries[$entryName];
}
/**
* @param string $entryName
* @return ZipEntry
* @throws ZipNotFoundEntry
*/
public function getModifiedEntry($entryName){
if (!isset($this->modifiedEntries[$entryName])) {
throw new ZipNotFoundEntry('Zip modified entry ' . $entryName . ' not found');
}
return $this->modifiedEntries[$entryName];
}
/**
* @return EndOfCentralDirectory
*/
@ -420,7 +432,7 @@ class CentralDirectory
// compression method 2 bytes
$entry->getMethod(),
// last mod file datetime 4 bytes
$entry->getTime(),
$entry->getDosTime(),
// crc-32 4 bytes
$entry->getCrc(),
// compressed size 4 bytes

26
src/PhpZip/Model/Entry/ZipAbstractEntry.php
View File

@ -485,7 +485,7 @@ abstract class ZipAbstractEntry implements ZipEntry
if (!$this->isInit(self::BIT_DATE_TIME)) {
return self::UNKNOWN;
}
return DateTimeConverter::toUnixTimestamp($this->dosTime & 0xffffffff);
return DateTimeConverter::toUnixTimestamp($this->getDosTime());
}
/**
@ -506,6 +506,30 @@ abstract class ZipAbstractEntry implements ZipEntry
return $this;
}
/**
* Get Dos Time
*
* @return int
*/
public function getDosTime()
{
return $this->dosTime & 0xffffffff;
}
/**
* Set Dos Time
* @param int $dosTime
* @throws ZipException
*/
public function setDosTime($dosTime)
{
if (0x00000000 > $dosTime || $dosTime > 0xffffffff) {
throw new ZipException('DosTime out of range');
}
$this->dosTime = $dosTime;
$this->setInit(self::BIT_DATE_TIME, true);
}
/**
* Returns the external file attributes.
*

2
src/PhpZip/Model/Entry/ZipNewEntry.php
View File

@ -218,7 +218,7 @@ abstract class ZipNewEntry extends ZipAbstractEntry
$this->getMethod(),
// last mod file time 2 bytes
// last mod file date 2 bytes
$this->getTime(),
$this->getDosTime(),
// crc-32 4 bytes
$dd ? 0 : $this->getCrc(),
// compressed size 4 bytes

4
src/PhpZip/Model/Entry/ZipReadEntry.php
View File

@ -96,7 +96,7 @@ class ZipReadEntry extends ZipAbstractEntry
$this->setPlatform($data['versionMadeBy'] >> 8);
$this->setGeneralPurposeBitFlags($data['gpbf']);
$this->setMethod($data['rawMethod']);
$this->setTime($data['rawTime']);
$this->setDosTime($data['rawTime']);
$this->setCrc($data['rawCrc']);
$this->setCompressedSize($data['rawCompressedSize']);
$this->setSize($data['rawSize']);
@ -282,7 +282,7 @@ class ZipReadEntry extends ZipAbstractEntry
$this->getMethod(),
// last mod file time 2 bytes
// last mod file date 2 bytes
$this->getTime(),
$this->getDosTime(),
// crc-32 4 bytes
$dd ? 0 : $this->getCrc(),
// compressed size 4 bytes

14
src/PhpZip/Model/ZipEntry.php
View File

@ -281,6 +281,20 @@ interface ZipEntry
*/
public function setTime($unixTimestamp);
/**
* Get Dos Time
*
* @return int
*/
public function getDosTime();
/**
* Set Dos Time
* @param int $dosTime
* @throws ZipException
*/
public function setDosTime($dosTime);
/**
* Returns the external file attributes.
*

3
src/PhpZip/ZipFile.php
View File

@ -461,6 +461,9 @@ class ZipFile implements \Countable, \ArrayAccess, \Iterator
$localName = basename($filename);
}
$this->addFromStream($handle, $localName, $compressionMethod);
$this->centralDirectory
->getModifiedEntry($localName)
->setTime(filemtime($filename));
return $this;
}

73
tests/PhpZip/ZipFileTest.php
View File

@ -447,7 +447,8 @@ class ZipFileTest extends ZipTestCase
$zipFile->close();
}
public function testDeleteNewEntry(){
public function testDeleteNewEntry()
{
$zipFile = new ZipFile();
$zipFile['entry1'] = '';
$zipFile['entry2'] = '';
@ -466,7 +467,8 @@ class ZipFileTest extends ZipTestCase
* @expectedException \PhpZip\Exception\ZipNotFoundEntry
* @expectedExceptionMessage Not found entry entry
*/
public function testDeleteFromNameNotFoundEntry(){
public function testDeleteFromNameNotFoundEntry()
{
$zipFile = new ZipFile();
$zipFile->deleteFromName('entry');
}
@ -790,17 +792,19 @@ class ZipFileTest extends ZipTestCase
* @expectedException \PhpZip\Exception\InvalidArgumentException
* @expectedExceptionMessage Invalid compression level. Minimum level -1. Maximum level 9
*/
public function testSetInvalidCompressionLevel(){
public function testSetInvalidCompressionLevel()
{
$zipFile = new ZipFile();
$zipFile->setCompressionLevel(-2);
}
/**
/**
* /**
* @expectedException \PhpZip\Exception\InvalidArgumentException
* @expectedExceptionMessage Invalid compression level. Minimum level -1. Maximum level 9
*/
public function testSetInvalidCompressionLevel2(){
public function testSetInvalidCompressionLevel2()
{
$zipFile = new ZipFile();
$zipFile->setCompressionLevel(10);
}
@ -817,11 +821,6 @@ class ZipFileTest extends ZipTestCase
'test empty/dir' => null,
];
$extractPath = sys_get_temp_dir() . '/zipExtract' . uniqid();
if (!is_dir($extractPath)) {
mkdir($extractPath, 0755, true);
}
$zipFile = new ZipFile();
foreach ($entries as $entryName => $value) {
if ($value === null) {
@ -833,10 +832,12 @@ class ZipFileTest extends ZipTestCase
$zipFile->saveAsFile($this->outputFilename);
$zipFile->close();
self::assertTrue(mkdir($this->outputDirname, 0755, true));
$zipFile->openFile($this->outputFilename);
$zipFile->extractTo($extractPath);
$zipFile->extractTo($this->outputDirname);
foreach ($entries as $entryName => $value) {
$fullExtractedFilename = $extractPath . DIRECTORY_SEPARATOR . $entryName;
$fullExtractedFilename = $this->outputDirname . DIRECTORY_SEPARATOR . $entryName;
if ($value === null) {
self::assertTrue(is_dir($fullExtractedFilename));
self::assertTrue(FilesUtil::isEmptyDir($fullExtractedFilename));
@ -847,8 +848,6 @@ class ZipFileTest extends ZipTestCase
}
}
$zipFile->close();
FilesUtil::removeDir($extractPath);
}
/**
@ -876,11 +875,7 @@ class ZipFileTest extends ZipTestCase
'test empty/dir2/'
];
$extractPath = sys_get_temp_dir() . '/zipExtractTest';
if (is_dir($extractPath)) {
FilesUtil::removeDir($extractPath);
}
self::assertTrue(mkdir($extractPath, 0755, true));
self::assertTrue(mkdir($this->outputDirname, 0755, true));
$zipFile = new ZipFile();
$zipFile->addAll($entries);
@ -888,10 +883,10 @@ class ZipFileTest extends ZipTestCase
$zipFile->close();
$zipFile->openFile($this->outputFilename);
$zipFile->extractTo($extractPath, $extractEntries);
$zipFile->extractTo($this->outputDirname, $extractEntries);
foreach ($entries as $entryName => $value) {
$fullExtractFilename = $extractPath . DIRECTORY_SEPARATOR . $entryName;
$fullExtractFilename = $this->outputDirname . DIRECTORY_SEPARATOR . $entryName;
if (in_array($entryName, $extractEntries)) {
if ($value === null) {
self::assertTrue(is_dir($fullExtractFilename));
@ -909,12 +904,11 @@ class ZipFileTest extends ZipTestCase
}
}
}
self::assertFalse(is_file($extractPath . DIRECTORY_SEPARATOR . 'test/test/test.txt'));
$zipFile->extractTo($extractPath, 'test/test/test.txt');
self::assertTrue(is_file($extractPath . DIRECTORY_SEPARATOR . 'test/test/test.txt'));
self::assertFalse(is_file($this->outputDirname . DIRECTORY_SEPARATOR . 'test/test/test.txt'));
$zipFile->extractTo($this->outputDirname, 'test/test/test.txt');
self::assertTrue(is_file($this->outputDirname . DIRECTORY_SEPARATOR . 'test/test/test.txt'));
$zipFile->close();
FilesUtil::removeDir($extractPath);
}
/**
@ -958,15 +952,11 @@ class ZipFileTest extends ZipTestCase
$zipFile->saveAsFile($this->outputFilename);
$zipFile->close();
$extractPath = sys_get_temp_dir() . '/zipExtractTest';
if (is_dir($extractPath)) {
FilesUtil::removeDir($extractPath);
}
self::assertTrue(mkdir($extractPath, 0444, true));
self::assertTrue(chmod($extractPath, 0444));
self::assertTrue(mkdir($this->outputDirname, 0444, true));
self::assertTrue(chmod($this->outputDirname, 0444));
$zipFile->openFile($this->outputFilename);
$zipFile->extractTo($extractPath);
$zipFile->extractTo($this->outputDirname);
}
/**
@ -1059,7 +1049,8 @@ class ZipFileTest extends ZipTestCase
* @expectedException \PhpZip\Exception\ZipException
* @expectedExceptionMessage Invalid encryption method
*/
public function testSetEncryptionMethodInvalid(){
public function testSetEncryptionMethodInvalid()
{
$zipFile = new ZipFile();
$encryptionMethod = 9999;
$zipFile->withNewPassword('pass', $encryptionMethod);
@ -1539,14 +1530,10 @@ class ZipFileTest extends ZipTestCase
*/
public function testSaveAsFileNotWritable()
{
$this->outputFilename = sys_get_temp_dir() . '/zipExtractTest';
if (is_dir($this->outputFilename)) {
FilesUtil::removeDir($this->outputFilename);
}
self::assertTrue(mkdir($this->outputFilename, 0444, true));
self::assertTrue(chmod($this->outputFilename, 0444));
self::assertTrue(mkdir($this->outputDirname, 0444, true));
self::assertTrue(chmod($this->outputDirname, 0444));
$this->outputFilename .= '/' . uniqid() . '.zip';
$this->outputFilename = $this->outputDirname . DIRECTORY_SEPARATOR . basename($this->outputFilename);
$zipFile = new ZipFile();
$zipFile->saveAsFile($this->outputFilename);
@ -1699,7 +1686,8 @@ class ZipFileTest extends ZipTestCase
* @expectedException \PhpZip\Exception\ZipNotFoundEntry
* @expectedExceptionMessage Zip entry bad entry name not found
*/
public function testNotFoundEntry(){
public function testNotFoundEntry()
{
$zipFile = new ZipFile();
$zipFile['bad entry name'];
}
@ -1761,7 +1749,8 @@ class ZipFileTest extends ZipTestCase
* @expectedException \PhpZip\Exception\ZipException
* @expectedExceptionMessage input stream is null
*/
public function testRewriteNullStream(){
public function testRewriteNullStream()
{
$zipFile = new ZipFile();
$zipFile->rewrite();
}