cvs: pear-core /PEAR2 Config.php test.php /PEAR2/Package Tar.php Xml.php

cellog Fri Dec 29 05:48:22 2006 UTC Modified files: /pear-core/PEAR2 Config.php test.php /pear-core/PEAR2/Package Tar.php Xml.php Log: add support for tarred packages, uncompressed or compressed with gz or bzip. removal of temporary directories still does not work # this is MUCH smaller than Archive_Tar...

http://cvs.php.net/viewvc.cgi/pear-core/PEAR2/Config.php?r1=1.1&r2=1.2&diff_format=u Index: pear-core/PEAR2/Config.php diff -u pear-core/PEAR2/Config.php:1.1 pear-core/PEAR2/Config.php:1.2 --- pear-core/PEAR2/Config.php:1.1 Thu Dec 28 20:42:31 2006 +++ pear-core/PEAR2/Config.php Fri Dec 29 05:48:22 2006 @@ -113,6 +113,9 @@ function __construct($pearDirectory, $userfile = false) { + $pearDirectory = str_replace('\\', '/', $pearDirectory); + $pearDirectory = str_replace('//', '/', $pearDirectory); + $pearDirectory = str_replace('/', DIRECTORY_SEPARATOR, $pearDirectory); self::_constructDefaults(); $this->loadConfigFile($pearDirectory, $userfile); $this->pearDir = $pearDirectory; @@ -237,6 +240,9 @@ function saveConfig($userfile = false) { + $userfile = str_replace('\\', '/', $userfile); + $userfile = str_replace('//', '/', $userfile); + $userfile = str_replace('/', DIRECTORY_SEPARATOR, $userfile); if (!$userfile) { if (class_exists('COM')) { $userfile = $this->_locateLocalSettingsDirectory() . DIRECTORY_SEPARATOR . @@ -251,7 +257,7 @@ $x->$var = $this->$var; } if (!file_exists(dirname($userfile))) { - mkdir(dirname($userfile), null, true); + mkdir(dirname($userfile), 0777, true); } file_put_contents($userfile, $x->asXML()); http://cvs.php.net/viewvc.cgi/pear-core/PEAR2/test.php?r1=1.1&r2=1.2&diff_format=u Index: pear-core/PEAR2/test.php diff -u pear-core/PEAR2/test.php:1.1 pear-core/PEAR2/test.php:1.2 --- pear-core/PEAR2/test.php:1.1 Thu Dec 28 20:42:31 2006 +++ pear-core/PEAR2/test.php Fri Dec 29 05:48:22 2006 @@ -7,8 +7,8 @@ PEAR2_Autoload($class); } define('OS_WINDOWS', true); -$g = new PEAR2_Config('G:/Documents/PEAR2/testpear'); +$g = new PEAR2_Config('C:/development/pear-core/testpear'); $g->saveConfig(); -$a = new PEAR2_Package('C:/development/pear-core/package2.xml'); +$a = new PEAR2_Package('C:/development/pear-core/PEAR-1.5.0a1.tgz'); $b = new PEAR2_Installer; $b->install($a); \ No newline at end of file http://cvs.php.net/viewvc.cgi/pear-core/PEAR2/Package/Tar.php?r1=1.1&r2=1.2&diff_format=u Index: pear-core/PEAR2/Package/Tar.php diff -u pear-core/PEAR2/Package/Tar.php:1.1 pear-core/PEAR2/Package/Tar.php:1.2 --- pear-core/PEAR2/Package/Tar.php:1.1 Thu Dec 28 20:42:32 2006 +++ pear-core/PEAR2/Package/Tar.php Fri Dec 29 05:48:22 2006 @@ -1,5 +1,331 @@ <?php -class PEAR2_Package_Tar +class PEAR2_Package_Tar implements ArrayAccess, Iterator { - + private $_fp; + private $_packagename; + private $_internalFileLength; + private $_footerLength; + private $_parent; + private $_packagefile; + static private $_tempfiles = array(); + + /** + * @param string $package path to package file + */ + function __construct($package, PEAR2_Package $parent) + { + $this->_parent = $parent; + $this->_packagename = $package; + $info = pathinfo($package); + switch ($info['extension']) { + case 'tgz' : + $package = 'compress.zlib://' . $package; + break; + case 'tbz' : + $package = 'compress.bz2://' . $package; + } + $this->_fp = fopen($package, 'rb'); + if (!$this->_fp) { + throw new PEAR2_Package_Tar_Exception('Cannot open package ' . $package); + } + } + + function sortstuff($a, $b) + { + $countslasha = substr_count($a, DIRECTORY_SEPARATOR); + $countslashb = substr_count($b, DIRECTORY_SEPARATOR); + if ($countslasha > $countslashb) return -1; + if ($countslashb > $countslasha) return 1; + $dira = dirname($a); + $dirb = dirname($b); + if ($dira == $dirb) { + return strnatcasecmp($a, $b); + } + if (strlen($dira) > strlen($dirb)) return -1; + if (strlen($dirb) > strlen($dira)) return 1; + return 0; + } + + function __destruct() + { + usort(self::$_tempfiles, array('PEAR2_Package_Tar', 'sortstuff')); + foreach (self::$_tempfiles as $fileOrDir) { + if (!file_exists($fileOrDir)) continue; + if (is_file($fileOrDir)) { + unlink($fileOrDir); + } elseif (is_dir($fileOrDir)) { + if (!@rmdir($fileOrDir)) { + $dir = opendir($fileOrDir); + while (false !== ($entry = readdir($dir))) { + if ($entry == '.' || $entry == '..') { + continue; + } + unlink($fileOrDir . DIRECTORY_SEPARATOR . $entry); + } + } + } + } + } + + private static function _addTempFile($file) + { + self::$_tempfiles[] = $file; + } + + private static function _addTempDirectory($dir) + { + do { + self::$_tempfiles[] = $dir; + $dir = dirname($dir); + } while (!file_exists($dir)); + } + + function offsetExists($offset) + { + $this->_extract(); + return $this->_packagefile->offsetExists($offset); + } + + function offsetGet($offset) + { + $this->_extract(); + return $this->_packagefile->offsetGet($offset); + } + + function offsetSet($offset, $value) + { + return; + } + + function offsetUnset($offset) + { + return; + } + + function current() + { + $this->_extract(); + return $this->_packagefile->current(); + } + + function key() + { + return $this->_packagefile->key(); + } + + function next () + { + $this->_extract(); + $this->_packagefile->next(); + } + + function rewind() + { + $this->_extract(); + $this->_packagefile->rewind(); + } + + function __call($func, $args) + { + $this->_extract(); + // delegate to the internal object + return call_user_func_array(array($this->_packagefile, $func), $args); + } + + function __get($var) + { + $this->_extract(); + return $this->_packagefile->$var; + } + + function getPackageFile() + { + $this->_extract(); + return $this->_packagefile->getPackageFile(); + } + + function valid() + { + $this->_extract(); + return $this->_packagefile->valid(); + } + + private function _processHeader($rawHeader) + { + if (strlen($rawHeader) < 512 || $rawHeader == pack("a512", "")) { + throw new PEAR2_Package_Tar_Exception( + 'Error: "' . $this->_packagename . '" has corrupted tar header'); + } + + $header = unpack( + "a100filename/a8mode/a8uid/a8gid/a12size/a12mtime/". + "a8checksum/a1type/a100linkname/a6magic/a2version/". + "a32uname/a32gname/a8devmajor/a8devminor/a155path", + $rawHeader); + $this->_internalFileLength = octdec($header['size']); + if ($this->_internalFileLength % 512 == 0) { + $this->_footerLength = 0; + } else { + $this->_footerLength = 512 - $this->_internalFileLength % 512; + } + return $header; + } + + private function _readHeader($rawHeader) + { + if (!strlen($rawHeader)) { + $this->_internalFileLength = $this->_footerLength = 0; + return true; + } + + if (strlen($rawHeader) != 512) { + throw new PEAR2_Package_Tar_Exception( + 'Invalid block size : ' . strlen($rawHeader)); + } + $header = $this->_processHeader($rawHeader); + if ($header['type'] == 'L') { + // filenames longer than 100 characters + // borrowed from Archive_Tar written by Vincent Blavet + $longFilename = ''; + $n = floor($header['size'] / 512); + for ($i=0; $i < $n; $i++) { + $content = fread($this->_fp, 512); + $longFilename .= $content; + } + if (($header['size'] % 512) != 0) { + $content = fread($this->_fp, 512); + $longFilename .= $content; + } + // ----- Read the next header + $newHeader = fread($this->_fp, 512); + $header = $this->_processHeader($newHeader); + $header['filename'] = trim($longFilename); + $rawHeader = $newHeader; + } + if ($this->_maliciousFilename($header['filename'])) { + throw new PEAR2_Package_Tar_Exception('Malicious .tar detected, file "' . + $header['filename'] . + '" will not install in desired directory tree'); + } + + $checksum = 256; // 8 * ord(' '); + $c1 = str_split($rawHeader); + $checkheader = array_merge(array_slice($c1, 0, 148), array_slice($c1, 156)); + if (!function_exists('_pear2tarchecksum')) { + function _pear2tarchecksum($a, $b) {return $a + ord($b);} + } + $checksum += array_reduce($checkheader, '_pear2tarchecksum'); + + // ----- Extract the checksum + $header['checksum'] = octdec(trim($header['checksum'])); + if ($header['checksum'] != $checksum) { + $header['filename'] = ''; + + // ----- Look for last block (empty block) + if (($checksum == 256) && ($header['checksum'] == 0)) { + return true; + } + + throw new PEAR2_Package_Tar_Exception( + 'Invalid checksum for header of file "' . $header['filename'] . + '" : ' . $checksum . ' calculated, ' . + $header['checksum'] . ' expected'); + } + + $header['filename'] = trim($header['filename']); + $header['mode'] = octdec(trim($header['mode'])); + $header['uid'] = octdec(trim($header['uid'])); + $header['gid'] = octdec(trim($header['gid'])); + $header['size'] = octdec(trim($header['size'])); + $header['mtime'] = octdec(trim($header['mtime'])); + if ($header['type'] == '5') { + $header['size'] = 0; + } + $header['linkname'] = trim($header['linkname']); + return $header; + } + + /** + * Detect and report a malicious file name + * + * @param string $file + * @return bool + * @access private + */ + private function _maliciousFilename($file) + { + if (strpos($file, '/../') !== false) { + return true; + } + if (strpos($file, '../') === 0) { + return true; + } + return false; + } + + /** + * Extract the archive so we can work with the contents + * + */ + private function _extract() + { + if (isset($this->_packagefile)) { + return; + } + $packagexml = false; + $where = (string) PEAR2_Config::current()->temp_dir; + $where = str_replace('\\', '/', $where); + $where = str_replace('//', '/', $where); + $where = str_replace('/', DIRECTORY_SEPARATOR, $where); + if (!file_exists($where)) { + mkdir($where, 0777, true); + } + $where = realpath($where); + if (dirname($where . 'a') != $where) { + $where .= DIRECTORY_SEPARATOR; + } + do { + $header = fread($this->_fp, 512); + if ($header == pack('a512', '')) { + // end of archive + break; + } + $header = $this->_readHeader($header); + $extract = $where . $header['filename']; + $extract = str_replace('\\', '/', $extract); + $extract = str_replace('//', '/', $extract); + $extract = str_replace('/', DIRECTORY_SEPARATOR, $extract); + self::_addTempFile($extract); + if (!file_exists(dirname($extract))) { + self::_addTempDirectory(dirname($extract)); + mkdir(dirname($extract), 0777, true); + } + $fp = fopen($extract, 'wb'); + $amount = stream_copy_to_stream($this->_fp, $fp, $this->_internalFileLength); + if ($amount != $this->_internalFileLength) { + throw new PEAR2_Package_Tar_Exception( + 'Unable to fully extract ' . $header['filename'] . ' from ' . + $this->_packagename); + } + if ($this->_footerLength) { + fseek($this->_fp, $this->_footerLength, SEEK_CUR); + } + if (preg_match('/package.xml$/', $header['filename']) && + $header['filename'] != 'package.xml') { + $packagexml = $where . $header['filename']; + } + if (!$packagexml) { + if ($header['filename'] == 'package2.xml') { + $packagexml = $where . $header['filename']; + } elseif ($header['filename'] == 'package.xml') { + $packagexml = $where . $header['filename']; + } + } + } while ($this->_internalFileLength); + if (!$packagexml) { + throw new PEAR2_Package_Tar_Exception('Archive ' . $this->_packagename . + ' does not contain a package.xml file'); + } + $this->_packagefile = new PEAR2_Package_Xml($packagexml, $this->_parent); + } } \ No newline at end of file http://cvs.php.net/viewvc.cgi/pear-core/PEAR2/Package/Xml.php?r1=1.1&r2=1.2&diff_format=u Index: pear-core/PEAR2/Package/Xml.php diff -u pear-core/PEAR2/Package/Xml.php:1.1 pear-core/PEAR2/Package/Xml.php:1.2 --- pear-core/PEAR2/Package/Xml.php:1.1 Thu Dec 28 20:42:32 2006 +++ pear-core/PEAR2/Package/Xml.php Fri Dec 29 05:48:22 2006 @@ -32,22 +32,22 @@ return; } - function current () + function current() { return key($this->_packagefile->info->_packageInfo['filelist']); } - function key () + function key() { return 1; } - function next () + function next() { next($this->_packagefile->info->_packageInfo['filelist']); } - function rewind () + function rewind() { reset($this->_packagefile->info->_packageInfo['filelist']); } @@ -68,7 +68,7 @@ return $this->_packagefile; } - function valid () + function valid() { return key($this->_packagefile->info->_packageInfo['filelist']); }