From: Steph Fox Date: Tue, 29 Jan 2008 11:58:27 +0000 (+0000) Subject: - One last tweak (so Phar and no-phar work the same again now) X-Git-Tag: RELEASE_2_0_0a1~722 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=76640a615f489a7efa8bec9e81f5094340619a04;p=php - One last tweak (so Phar and no-phar work the same again now) - Bunch of test fixes - Note: I added a silencer to the unlink() call in zip/tarmaker to avoid system warnings here. If this messes up tests elsewhere we'll need to re-think. --- diff --git a/ext/phar/shortarc.php b/ext/phar/shortarc.php index 8bd5401d7c..49efe8e6d1 100644 --- a/ext/phar/shortarc.php +++ b/ext/phar/shortarc.php @@ -1,15 +1,16 @@ 2,\n'c' => 'text/plain',\n'cc' => 'text/plain',\n'cpp' => 'text/plain',\n'c++' => 'text/plain',\n'dtd' => 'text/plain',\n'h' => 'text/plain',\n'log' => 'text/plain',\n'rng' => 'text/plain',\n'txt' => 'text/plain',\n'xsd' => 'text/plain',\n'php' => 1,\n'inc' => 1,\n'avi' => 'video/avi',\n'bmp' => 'image/bmp',\n'css' => 'text/css',\n'gif' => 'image/gif',\n'htm' => 'text/html',\n'html' => 'text/html',\n'htmls' => 'text/html',\n'ico' => 'image/x-ico',\n'jpe' => 'image/jpeg',\n'jpg' => 'image/jpeg',\n'jpeg' => 'image/jpeg',\n'js' => 'application/x-javascript',\n'midi' => 'audio/midi',\n'mid' => 'audio/midi',\n'mod' => 'audio/mod',\n'mov' => 'movie/quicktime',\n'mp3' => 'audio/mp3',\n'mpg' => 'video/mpeg',\n'mpeg' => 'video/mpeg',\n'pdf' => 'application/pdf',\n'png' => 'image/png',\n'swf' => 'application/shockwave-flash',\n'tif' => 'image/tiff',\n'tiff' => 'image/tiff',\n'wav' => 'audio/wav',\n'xbm' => 'image/xbm',\n'xml' => 'text/xml',\n);\n\nheader(\"Cache-Control: no-cache, must-revalidate\");\nheader(\"Pragma: no-cache\");\n\n$basename = basename(__FILE__);\nif (!strpos($_SERVER['REQUEST_URI'], $basename)) {\nchdir(Extract_Phar::$temp);\ninclude $web;\nreturn;\n}\n$pt = substr($_SERVER['REQUEST_URI'], strpos($_SERVER['REQUEST_URI'], $basename) + strlen($basename));\nif (!$pt || $pt == '/') {\n$pt = $web;\nheader('HTTP/1.1 301 Moved Permanently');\nheader('Location: ' . $_SERVER['REQUEST_URI'] . '/' . $pt);\nexit;\n}\n$a = realpath(Extract_Phar::$temp . DIRECTORY_SEPARATOR . $pt);\nif (!$a || strlen(dirn"; - static const char newstub1_1[] = "ame($a)) < strlen(Extract_Phar::$temp)) {\nheader('HTTP/1.0 404 Not Found');\necho \"\\n \\n File Not Found<title>\\n </head>\\n <body>\\n <h1>404 - File \", $pt, \" Not Found</h1>\\n </body>\\n</html>\";\nexit;\n}\n$b = pathinfo($a);\nif (!isset($b['extension'])) {\nheader('Content-Type: text/plain');\nheader('Content-Length: ' . filesize($a));\nreadfile($a);\nexit;\n}\nif (isset($mimes[$b['extension']])) {\nif ($mimes[$b['extension']] === 1) {\ninclude $a;\nexit;\n}\nif ($mimes[$b['extension']] === 2) {\nhighlight_file($a);\nexit;\n}\nheader('Content-Type: ' .$mimes[$b['extension']]);\nheader('Content-Length: ' . filesize($a));\nreadfile($a);\nexit;\n}\n}\n}\n\nclass Extract_Phar\n{\nstatic $temp;\nstatic $origdir;\nconst GZ = 0x1000;\nconst BZ2 = 0x2000;\nconst MASK = 0x3000;\nconst START = '"; + static const char newstub0[] = "<?php\n\n$web = '"; + static const char newstub1_0[] = "';\n\nif (in_array('phar', stream_get_wrappers()) && class_exists('Phar', 0)) {\nPhar::interceptFileFuncs();\nif ($web) {\nPhar::webPhar(null, $web);\n}\ninclude 'phar://' . __FILE__ . '/' . Extract_Phar::START;\nreturn;\n}\n\nif ($web) {\nif (@(isset($_SERVER['REQUEST_URI']) && isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'GET' || $_SERVER['REQUEST_METHOD'] == 'POST')) {\nExtract_Phar::go(true);\n$mimes = array(\n'phps' => 2,\n'c' => 'text/plain',\n'cc' => 'text/plain',\n'cpp' => 'text/plain',\n'c++' => 'text/plain',\n'dtd' => 'text/plain',\n'h' => 'text/plain',\n'log' => 'text/plain',\n'rng' => 'text/plain',\n'txt' => 'text/plain',\n'xsd' => 'text/plain',\n'php' => 1,\n'inc' => 1,\n'avi' => 'video/avi',\n'bmp' => 'image/bmp',\n'css' => 'text/css',\n'gif' => 'image/gif',\n'htm' => 'text/html',\n'html' => 'text/html',\n'htmls' => 'text/html',\n'ico' => 'image/x-ico',\n'jpe' => 'image/jpeg',\n'jpg' => 'image/jpeg',\n'jpeg' => 'image/jpeg',\n'js' => 'application/x-javascript',\n'midi' => 'audio/midi',\n'mid' => 'audio/midi',\n'mod' => 'audio/mod',\n'mov' => 'movie/quicktime',\n'mp3' => 'audio/mp3',\n'mpg' => 'video/mpeg',\n'mpeg' => 'video/mpeg',\n'pdf' => 'application/pdf',\n'png' => 'image/png',\n'swf' => 'application/shockwave-flash',\n'tif' => 'image/tiff',\n'tiff' => 'image/tiff',\n'wav' => 'audio/wav',\n'xbm' => 'image/xbm',\n'xml' => 'text/xml',\n);\n\nheader(\"Cache-Control: no-cache, must-revalidate\");\nheader(\"Pragma: no-cache\");\n\n$basename = basename(__FILE__);\nif (!strpos($_SERVER['REQUEST_URI'], $basename)) {\nchdir(Extract_Phar::$temp);\ninclude $web;\nreturn;\n}\n$pt = substr($_SERVER['REQUEST_URI'], strpos($_SERVER['REQUEST_URI'], $basename) + strlen($basename));\nif (!$pt || $pt == '/') {\n$pt = $web;\nheader('HTTP/1.1 301 Moved Permanently');\nheader('Location: ' . $_SERVER['REQUEST_URI'] . '/' . $pt);\nexit;\n}\n$a = realpath(Extract_Phar::$temp . DIRECTORY_SEPARATOR . $pt);\nif (!$a || strlen(dirname($a)) < strlen(Extract_Phar::$temp)) {\nheader('HTTP/1.0 404 Not Fo"; + static const char newstub1_1[] = "und');\necho \"<html>\\n <head>\\n <title>File Not Found<title>\\n </head>\\n <body>\\n <h1>404 - File \", $pt, \" Not Found</h1>\\n </body>\\n</html>\";\nexit;\n}\n$b = pathinfo($a);\nif (!isset($b['extension'])) {\nheader('Content-Type: text/plain');\nheader('Content-Length: ' . filesize($a));\nreadfile($a);\nexit;\n}\nif (isset($mimes[$b['extension']])) {\nif ($mimes[$b['extension']] === 1) {\ninclude $a;\nexit;\n}\nif ($mimes[$b['extension']] === 2) {\nhighlight_file($a);\nexit;\n}\nheader('Content-Type: ' .$mimes[$b['extension']]);\nheader('Content-Length: ' . filesize($a));\nreadfile($a);\nexit;\n}\n}\n}\n\nclass Extract_Phar\n{\nstatic $temp;\nstatic $origdir;\nconst GZ = 0x1000;\nconst BZ2 = 0x2000;\nconst MASK = 0x3000;\nconst START = '"; static const char newstub2[] = "';\nconst LEN = "; static const char newstub3_0[] = ";\n\nstatic function go($return = false)\n{\n$fp = fopen(__FILE__, 'rb');\nfseek($fp, self::LEN);\n$L = unpack('V', $a = fread($fp, 4));\n$m = '';\n\ndo {\n$read = 8192;\nif ($L[1] - strlen($m) < 8192) {\n$read = $L[1] - strlen($m);\n}\n$last = fread($fp, $read);\n$m .= $last;\n} while (strlen($last) && strlen($m) < $L[1]);\n\nif (strlen($m) < $L[1]) {\ndie('ERROR: manifest length read was \"' .\nstrlen($m) .'\" should be \"' .\n$L[1] . '\"');\n}\n\n$info = self::_unpack($m);\n$f = $info['c'];\n\nif ($f & self::GZ) {\nif (!function_exists('gzinflate')) {\ndie('Error: zlib extension is not enabled -' .\n' gzinflate() function needed for zlib-compressed .phars');\n}\n}\n\nif ($f & self::BZ2) {\nif (!function_exists('bzdecompress')) {\ndie('Error: bzip2 extension is not enabled -' .\n' bzdecompress() function needed for bz2-compressed .phars');\n}\n}\n\n$temp = self::tmpdir();\n\nif (!$temp || !is_writable($temp)) {\n$sessionpath = session_save_path();\nif (strpos ($sessionpath, \";\") !== false)\n$sessionpath = substr ($sessionpath, strpos ($sessionpath, \";\")+1);\nif (!file_exists($sessionpath) || !is_dir($sessionpath)) {\ndie('Could not locate temporary directory to extract phar');\n}\n$temp = $sessionpath;\n}\n\n$temp .= '/pharextract/'.basename(__FILE__, '.phar');\nself::$temp = $temp;\nself::$origdir = getcwd();\n@mkdir($temp, 0777, true);\n$temp = realpath($temp);\n\nif (!file_exists($temp . DIRECTORY_SEPARATOR . md5_file(__FILE__))) {\nself::_removeTmpFiles($temp, getcwd());\n@mkdir($temp, 0777, true);\n@file_put_contents($temp . '/' . md5_file(__FILE__), '');\n\nforeach ($info['m'] as $path => $file) {\n$a = !file_exists(dirname($temp . '/' . $path));\n@mkdir(dirname($temp . '/' . $path), 0777, true);\nclearstatcache();\n\nif ($path[strlen($path) - 1] == '/') {\n@mkdir($temp . '/' . $path, 0777);\n} else {\nfile_put_contents($temp . '/' . $path, self::extractFile($path, $file, $fp));\n@chmod($temp . '/' . $path, 0666);\n}\n}\n}\n\nchdir($temp);\n\nif (!$return) {\ninclude self::START;\n}\n}\n\nstatic fun"; static const char newstub3_1[] = "ction tmpdir()\n{\nif (strpos(PHP_OS, 'WIN') !== false) {\nif ($var = getenv('TMP') ? getenv('TMP') : getenv('TEMP')) {\nreturn $var;\n}\nif (is_dir('/temp') || mkdir('/temp')) {\nreturn realpath('/temp');\n}\nreturn false;\n}\nif ($var = getenv('TMPDIR')) {\nreturn $var;\n}\nreturn realpath('/tmp');\n}\n\nstatic function _unpack($m)\n{\n$info = unpack('V', substr($m, 0, 4));\n $l = unpack('V', substr($m, 10, 4));\n$m = substr($m, 14 + $l[1]);\n$s = unpack('V', substr($m, 0, 4));\n$o = 0;\n$start = 4 + $s[1];\n$ret['c'] = 0;\n\nfor ($i = 0; $i < $info[1]; $i++) {\n $len = unpack('V', substr($m, $start, 4));\n$start += 4;\n $savepath = substr($m, $start, $len[1]);\n$start += $len[1];\n $ret['m'][$savepath] = array_values(unpack('Va/Vb/Vc/Vd/Ve/Vf', substr($m, $start, 24)));\n$ret['m'][$savepath][3] = sprintf('%u', $ret['m'][$savepath][3]\n& 0xffffffff);\n$ret['m'][$savepath][7] = $o;\n$o += $ret['m'][$savepath][2];\n$start += 24 + $ret['m'][$savepath][5];\n$ret['c'] |= $ret['m'][$savepath][4] & self::MASK;\n}\nreturn $ret;\n}\n\nstatic function extractFile($path, $entry, $fp)\n{\n$data = '';\n$c = $entry[2];\n\nwhile ($c) {\nif ($c < 8192) {\n$data .= @fread($fp, $c);\n$c = 0;\n} else {\n$c -= 8192;\n$data .= @fread($fp, 8192);\n}\n}\n\nif ($entry[4] & self::GZ) {\n$data = gzinflate($data);\n} elseif ($entry[4] & self::BZ2) {\n$data = bzdecompress($data);\n}\n\nif (strlen($data) != $entry[0]) {\ndie(\"Invalid internal .phar file (size error \" . strlen($data) . \" != \" .\n$stat[7] . \")\");\n}\n\nif ($entry[3] != sprintf(\"%u\", crc32($data) & 0xffffffff)) {\ndie(\"Invalid internal .phar file (checksum error)\");\n}\n\nreturn $data;\n}\n\nstatic function _removeTmpFiles($temp, $origdir)\n{\nchdir($temp);\n\nforeach (glob('*') as $f) {\nif (file_exists($f)) {\nis_dir($f) ? @rmdir($f) : @unlink($f);\nif (file_exists($f) && is_dir($f)) {\nself::_removeTmpFiles($f, getcwd());\n}\n}\n}\n\n@rmdir($temp);\nclearstatcache();\nchdir($origdir);\n}\n}\n\nExtract_Phar::go();\n__HALT_COMPILER(); ?>"; - static const int newstub_len = 6650; + static const int newstub_len = 6581; *len = spprintf(stub, name_len + web_len + newstub_len, "%s%s%s%s%s%s%d%s%s", newstub0, web, newstub1_0, newstub1_1, index_php, newstub2, name_len + web_len + newstub_len, newstub3_0, newstub3_1); } \ No newline at end of file diff --git a/ext/phar/tests/nophar.phar b/ext/phar/tests/nophar.phar index 2fc9dbc040..3672e4f262 100644 Binary files a/ext/phar/tests/nophar.phar and b/ext/phar/tests/nophar.phar differ diff --git a/ext/phar/tests/nophar_web.phpt b/ext/phar/tests/nophar_web.phpt index 98f43e1ad8..c65a35c569 100644 --- a/ext/phar/tests/nophar_web.phpt +++ b/ext/phar/tests/nophar_web.phpt @@ -2,11 +2,9 @@ Phar: default web stub, no phar extension --SKIPIF-- <?php if (extension_loaded("phar")) die("skip");?> ---INI-- -error_reporting=E_ALL & ^E_NOTICE --ENV-- -SCRIPT_NAME=/nophar_web.php/ -REQUEST_URI=/nophar_web.php/ +SCRIPT_NAME=/nophar.phar +REQUEST_URI=/nophar.phar --FILE_EXTERNAL-- nophar.phar --EXPECT-- diff --git a/ext/phar/tests/phar_commitwrite.phpt b/ext/phar/tests/phar_commitwrite.phpt index 1a5e88ca5f..9601571348 100644 --- a/ext/phar/tests/phar_commitwrite.phpt +++ b/ext/phar/tests/phar_commitwrite.phpt @@ -29,16 +29,21 @@ unlink(dirname(__FILE__) . '/brandnewphar.phar'); __HALT_COMPILER(); ?> --EXPECT-- -string(7133) "<?php +string(6591) "<?php + $web = '0'; -if ($web) { + if (in_array('phar', stream_get_wrappers()) && class_exists('Phar', 0)) { Phar::interceptFileFuncs(); +if ($web) { Phar::webPhar(null, $web); +} include 'phar://' . __FILE__ . '/' . Extract_Phar::START; return; } -if (isset($_SERVER['REQUEST_URI']) && isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'GET' || $_SERVER['REQUEST_METHOD'] == 'POST') { + +if ($web) { +if (@(isset($_SERVER['REQUEST_URI']) && isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'GET' || $_SERVER['REQUEST_METHOD'] == 'POST')) { Extract_Phar::go(true); $mimes = array( 'phps' => 2, @@ -82,16 +87,22 @@ $mimes = array( 'xbm' => 'image/xbm', 'xml' => 'text/xml', ); + +header("Cache-Control: no-cache, must-revalidate"); +header("Pragma: no-cache"); + $basename = basename(__FILE__); if (!strpos($_SERVER['REQUEST_URI'], $basename)) { chdir(Extract_Phar::$temp); -include Extract_Phar::START; +include $web; +return; } $pt = substr($_SERVER['REQUEST_URI'], strpos($_SERVER['REQUEST_URI'], $basename) + strlen($basename)); if (!$pt || $pt == '/') { $pt = $web; header('HTTP/1.1 301 Moved Permanently'); header('Location: ' . $_SERVER['REQUEST_URI'] . '/' . $pt); +exit; } $a = realpath(Extract_Phar::$temp . DIRECTORY_SEPARATOR . $pt); if (!$a || strlen(dirname($a)) < strlen(Extract_Phar::$temp)) { @@ -108,12 +119,6 @@ exit; } if (isset($mimes[$b['extension']])) { if ($mimes[$b['extension']] === 1) { -$_SERVER['PHAR_PATH_INFO'] = $_SERVER['PATH_INFO']; -$_SERVER['PATH_INFO'] = substr($_SERVER['PATH_INFO'], strpos($_SERVER['PATH_INFO'], $basename) + strlen($basename)); -if (isset($_SERVER['PATH_TRANSLATED'])) { -$_SERVER['PHAR_PATH_TRANSLATED'] = $_SERVER['PATH_TRANSLATED']; -$_SERVER['PATH_TRANSLATED'] = $a; -} include $a; exit; } @@ -128,28 +133,24 @@ exit; } } } -if (in_array('phar', stream_get_wrappers()) && class_exists('Phar', 0)) { -Phar::interceptFileFuncs(); -include 'phar://' . __FILE__ . '/' . Extract_Phar::START; -return; -} + class Extract_Phar { static $temp; -static $tmp = array(); static $origdir; const GZ = 0x1000; const BZ2 = 0x2000; const MASK = 0x3000; const START = 'index.php'; -const LEN = 7133; +const LEN = 6591; + static function go($return = false) { -register_shutdown_function(array('Extract_Phar', '_removeTmpFiles')); $fp = fopen(__FILE__, 'rb'); fseek($fp, self::LEN); $L = unpack('V', $a = fread($fp, 4)); $m = ''; + do { $read = 8192; if ($L[1] - strlen($m) < 8192) { @@ -158,26 +159,32 @@ $read = $L[1] - strlen($m); $last = fread($fp, $read); $m .= $last; } while (strlen($last) && strlen($m) < $L[1]); + if (strlen($m) < $L[1]) { die('ERROR: manifest length read was "' . strlen($m) .'" should be "' . $L[1] . '"'); } + $info = self::_unpack($m); $f = $info['c']; + if ($f & self::GZ) { if (!function_exists('gzinflate')) { die('Error: zlib extension is not enabled -' . ' gzinflate() function needed for zlib-compressed .phars'); } } + if ($f & self::BZ2) { if (!function_exists('bzdecompress')) { die('Error: bzip2 extension is not enabled -' . ' bzdecompress() function needed for bz2-compressed .phars'); } } + $temp = self::tmpdir(); + if (!$temp || !is_writable($temp)) { $sessionpath = session_save_path(); if (strpos ($sessionpath, ";") !== false) @@ -187,32 +194,37 @@ die('Could not locate temporary directory to extract phar'); } $temp = $sessionpath; } -$temp .= '/pharextract'; + +$temp .= '/pharextract/'.basename(__FILE__, '.phar'); self::$temp = $temp; -while (file_exists($temp)) { -$temp .= 1; -} -@mkdir($temp); -@chmod($temp, 0777); -$temp = realpath($temp); -self::$tmp[] = $temp; self::$origdir = getcwd(); +@mkdir($temp, 0777, true); +$temp = realpath($temp); + +if (!file_exists($temp . DIRECTORY_SEPARATOR . md5_file(__FILE__))) { +self::_removeTmpFiles($temp, getcwd()); +@mkdir($temp, 0777, true); +@file_put_contents($temp . '/' . md5_file(__FILE__), ''); + foreach ($info['m'] as $path => $file) { $a = !file_exists(dirname($temp . '/' . $path)); @mkdir(dirname($temp . '/' . $path), 0777, true); clearstatcache(); -if ($a) self::$tmp[] = realpath(dirname($temp . '/' . $path)); + if ($path[strlen($path) - 1] == '/') { -mkdir($temp . '/' . $path); -@chmod($temp . '/' . $path, 0777); +@mkdir($temp . '/' . $path, 0777); } else { file_put_contents($temp . '/' . $path, self::extractFile($path, $file, $fp)); @chmod($temp . '/' . $path, 0666); } -self::$tmp[] = realpath($temp . '/' . $path); } +} + chdir($temp); -if (!$return) include self::START; + +if (!$return) { +include self::START; +} } static function tmpdir() @@ -235,24 +247,19 @@ return realpath('/tmp'); static function _unpack($m) { $info = unpack('V', substr($m, 0, 4)); -// skip API version, phar flags, alias, metadata -$l = unpack('V', substr($m, 10, 4)); + $l = unpack('V', substr($m, 10, 4)); $m = substr($m, 14 + $l[1]); $s = unpack('V', substr($m, 0, 4)); $o = 0; $start = 4 + $s[1]; $ret['c'] = 0; + for ($i = 0; $i < $info[1]; $i++) { -// length of the file name -$len = unpack('V', substr($m, $start, 4)); + $len = unpack('V', substr($m, $start, 4)); $start += 4; -// file name -$savepath = substr($m, $start, $len[1]); + $savepath = substr($m, $start, $len[1]); $start += $len[1]; -// retrieve manifest data: -// 0 = size, 1 = timestamp, 2 = compressed size, 3 = crc32, 4 = flags -// 5 = metadata length -$ret['m'][$savepath] = array_values(unpack('Va/Vb/Vc/Vd/Ve/Vf', substr($m, $start, 24))); + $ret['m'][$savepath] = array_values(unpack('Va/Vb/Vc/Vd/Ve/Vf', substr($m, $start, 24))); $ret['m'][$savepath][3] = sprintf('%u', $ret['m'][$savepath][3] & 0xffffffff); $ret['m'][$savepath][7] = $o; @@ -267,6 +274,7 @@ static function extractFile($path, $entry, $fp) { $data = ''; $c = $entry[2]; + while ($c) { if ($c < 8192) { $data .= @fread($fp, $c); @@ -276,30 +284,41 @@ $c -= 8192; $data .= @fread($fp, 8192); } } + if ($entry[4] & self::GZ) { $data = gzinflate($data); } elseif ($entry[4] & self::BZ2) { $data = bzdecompress($data); } + if (strlen($data) != $entry[0]) { die("Invalid internal .phar file (size error " . strlen($data) . " != " . $stat[7] . ")"); } + if ($entry[3] != sprintf("%u", crc32($data) & 0xffffffff)) { die("Invalid internal .phar file (checksum error)"); } + return $data; } -static function _removeTmpFiles() +static function _removeTmpFiles($temp, $origdir) { -if (count(self::$tmp)) { -foreach (array_reverse(self::$tmp) as $f) { -if (file_exists($f)) is_dir($f) ? @rmdir($f) : @unlink($f); -} +chdir($temp); +foreach (glob('*') as $f) { +if (file_exists($f)) { +is_dir($f) ? @rmdir($f) : @unlink($f); +if (file_exists($f) && is_dir($f)) { +self::_removeTmpFiles($f, getcwd()); +} } -chdir(self::$origdir); +} + +@rmdir($temp); +clearstatcache(); +chdir($origdir); } } diff --git a/ext/phar/tests/phar_createdefaultstub.phpt b/ext/phar/tests/phar_createdefaultstub.phpt index a72f8748a3..7bca0511e9 100644 --- a/ext/phar/tests/phar_createdefaultstub.phpt +++ b/ext/phar/tests/phar_createdefaultstub.phpt @@ -34,16 +34,21 @@ echo $e->getMessage() . "\n"; ?> ===DONE=== --EXPECT-- -string(7133) "<?php +string(6591) "<?php + $web = '0'; -if ($web) { + if (in_array('phar', stream_get_wrappers()) && class_exists('Phar', 0)) { Phar::interceptFileFuncs(); +if ($web) { Phar::webPhar(null, $web); +} include 'phar://' . __FILE__ . '/' . Extract_Phar::START; return; } -if (isset($_SERVER['REQUEST_URI']) && isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'GET' || $_SERVER['REQUEST_METHOD'] == 'POST') { + +if ($web) { +if (@(isset($_SERVER['REQUEST_URI']) && isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'GET' || $_SERVER['REQUEST_METHOD'] == 'POST')) { Extract_Phar::go(true); $mimes = array( 'phps' => 2, @@ -87,16 +92,22 @@ $mimes = array( 'xbm' => 'image/xbm', 'xml' => 'text/xml', ); + +header("Cache-Control: no-cache, must-revalidate"); +header("Pragma: no-cache"); + $basename = basename(__FILE__); if (!strpos($_SERVER['REQUEST_URI'], $basename)) { chdir(Extract_Phar::$temp); -include Extract_Phar::START; +include $web; +return; } $pt = substr($_SERVER['REQUEST_URI'], strpos($_SERVER['REQUEST_URI'], $basename) + strlen($basename)); if (!$pt || $pt == '/') { $pt = $web; header('HTTP/1.1 301 Moved Permanently'); header('Location: ' . $_SERVER['REQUEST_URI'] . '/' . $pt); +exit; } $a = realpath(Extract_Phar::$temp . DIRECTORY_SEPARATOR . $pt); if (!$a || strlen(dirname($a)) < strlen(Extract_Phar::$temp)) { @@ -113,12 +124,6 @@ exit; } if (isset($mimes[$b['extension']])) { if ($mimes[$b['extension']] === 1) { -$_SERVER['PHAR_PATH_INFO'] = $_SERVER['PATH_INFO']; -$_SERVER['PATH_INFO'] = substr($_SERVER['PATH_INFO'], strpos($_SERVER['PATH_INFO'], $basename) + strlen($basename)); -if (isset($_SERVER['PATH_TRANSLATED'])) { -$_SERVER['PHAR_PATH_TRANSLATED'] = $_SERVER['PATH_TRANSLATED']; -$_SERVER['PATH_TRANSLATED'] = $a; -} include $a; exit; } @@ -133,28 +138,24 @@ exit; } } } -if (in_array('phar', stream_get_wrappers()) && class_exists('Phar', 0)) { -Phar::interceptFileFuncs(); -include 'phar://' . __FILE__ . '/' . Extract_Phar::START; -return; -} + class Extract_Phar { static $temp; -static $tmp = array(); static $origdir; const GZ = 0x1000; const BZ2 = 0x2000; const MASK = 0x3000; const START = 'index.php'; -const LEN = 7133; +const LEN = 6591; + static function go($return = false) { -register_shutdown_function(array('Extract_Phar', '_removeTmpFiles')); $fp = fopen(__FILE__, 'rb'); fseek($fp, self::LEN); $L = unpack('V', $a = fread($fp, 4)); $m = ''; + do { $read = 8192; if ($L[1] - strlen($m) < 8192) { @@ -163,26 +164,32 @@ $read = $L[1] - strlen($m); $last = fread($fp, $read); $m .= $last; } while (strlen($last) && strlen($m) < $L[1]); + if (strlen($m) < $L[1]) { die('ERROR: manifest length read was "' . strlen($m) .'" should be "' . $L[1] . '"'); } + $info = self::_unpack($m); $f = $info['c']; + if ($f & self::GZ) { if (!function_exists('gzinflate')) { die('Error: zlib extension is not enabled -' . ' gzinflate() function needed for zlib-compressed .phars'); } } + if ($f & self::BZ2) { if (!function_exists('bzdecompress')) { die('Error: bzip2 extension is not enabled -' . ' bzdecompress() function needed for bz2-compressed .phars'); } } + $temp = self::tmpdir(); + if (!$temp || !is_writable($temp)) { $sessionpath = session_save_path(); if (strpos ($sessionpath, ";") !== false) @@ -192,32 +199,37 @@ die('Could not locate temporary directory to extract phar'); } $temp = $sessionpath; } -$temp .= '/pharextract'; + +$temp .= '/pharextract/'.basename(__FILE__, '.phar'); self::$temp = $temp; -while (file_exists($temp)) { -$temp .= 1; -} -@mkdir($temp); -@chmod($temp, 0777); -$temp = realpath($temp); -self::$tmp[] = $temp; self::$origdir = getcwd(); +@mkdir($temp, 0777, true); +$temp = realpath($temp); + +if (!file_exists($temp . DIRECTORY_SEPARATOR . md5_file(__FILE__))) { +self::_removeTmpFiles($temp, getcwd()); +@mkdir($temp, 0777, true); +@file_put_contents($temp . '/' . md5_file(__FILE__), ''); + foreach ($info['m'] as $path => $file) { $a = !file_exists(dirname($temp . '/' . $path)); @mkdir(dirname($temp . '/' . $path), 0777, true); clearstatcache(); -if ($a) self::$tmp[] = realpath(dirname($temp . '/' . $path)); + if ($path[strlen($path) - 1] == '/') { -mkdir($temp . '/' . $path); -@chmod($temp . '/' . $path, 0777); +@mkdir($temp . '/' . $path, 0777); } else { file_put_contents($temp . '/' . $path, self::extractFile($path, $file, $fp)); @chmod($temp . '/' . $path, 0666); } -self::$tmp[] = realpath($temp . '/' . $path); } +} + chdir($temp); -if (!$return) include self::START; + +if (!$return) { +include self::START; +} } static function tmpdir() @@ -240,24 +252,19 @@ return realpath('/tmp'); static function _unpack($m) { $info = unpack('V', substr($m, 0, 4)); -// skip API version, phar flags, alias, metadata -$l = unpack('V', substr($m, 10, 4)); + $l = unpack('V', substr($m, 10, 4)); $m = substr($m, 14 + $l[1]); $s = unpack('V', substr($m, 0, 4)); $o = 0; $start = 4 + $s[1]; $ret['c'] = 0; + for ($i = 0; $i < $info[1]; $i++) { -// length of the file name -$len = unpack('V', substr($m, $start, 4)); + $len = unpack('V', substr($m, $start, 4)); $start += 4; -// file name -$savepath = substr($m, $start, $len[1]); + $savepath = substr($m, $start, $len[1]); $start += $len[1]; -// retrieve manifest data: -// 0 = size, 1 = timestamp, 2 = compressed size, 3 = crc32, 4 = flags -// 5 = metadata length -$ret['m'][$savepath] = array_values(unpack('Va/Vb/Vc/Vd/Ve/Vf', substr($m, $start, 24))); + $ret['m'][$savepath] = array_values(unpack('Va/Vb/Vc/Vd/Ve/Vf', substr($m, $start, 24))); $ret['m'][$savepath][3] = sprintf('%u', $ret['m'][$savepath][3] & 0xffffffff); $ret['m'][$savepath][7] = $o; @@ -272,6 +279,7 @@ static function extractFile($path, $entry, $fp) { $data = ''; $c = $entry[2]; + while ($c) { if ($c < 8192) { $data .= @fread($fp, $c); @@ -281,30 +289,41 @@ $c -= 8192; $data .= @fread($fp, 8192); } } + if ($entry[4] & self::GZ) { $data = gzinflate($data); } elseif ($entry[4] & self::BZ2) { $data = bzdecompress($data); } + if (strlen($data) != $entry[0]) { die("Invalid internal .phar file (size error " . strlen($data) . " != " . $stat[7] . ")"); } + if ($entry[3] != sprintf("%u", crc32($data) & 0xffffffff)) { die("Invalid internal .phar file (checksum error)"); } + return $data; } -static function _removeTmpFiles() +static function _removeTmpFiles($temp, $origdir) { -if (count(self::$tmp)) { -foreach (array_reverse(self::$tmp) as $f) { -if (file_exists($f)) is_dir($f) ? @rmdir($f) : @unlink($f); -} +chdir($temp); +foreach (glob('*') as $f) { +if (file_exists($f)) { +is_dir($f) ? @rmdir($f) : @unlink($f); +if (file_exists($f) && is_dir($f)) { +self::_removeTmpFiles($f, getcwd()); } -chdir(self::$origdir); +} +} + +@rmdir($temp); +clearstatcache(); +chdir($origdir); } } @@ -312,16 +331,21 @@ Extract_Phar::go(); __HALT_COMPILER(); ?>" ============================================================================ ============================================================================ -string(7144) "<?php +string(6602) "<?php + $web = '0'; -if ($web) { + if (in_array('phar', stream_get_wrappers()) && class_exists('Phar', 0)) { Phar::interceptFileFuncs(); +if ($web) { Phar::webPhar(null, $web); +} include 'phar://' . __FILE__ . '/' . Extract_Phar::START; return; } -if (isset($_SERVER['REQUEST_URI']) && isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'GET' || $_SERVER['REQUEST_METHOD'] == 'POST') { + +if ($web) { +if (@(isset($_SERVER['REQUEST_URI']) && isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'GET' || $_SERVER['REQUEST_METHOD'] == 'POST')) { Extract_Phar::go(true); $mimes = array( 'phps' => 2, @@ -365,16 +389,22 @@ $mimes = array( 'xbm' => 'image/xbm', 'xml' => 'text/xml', ); + +header("Cache-Control: no-cache, must-revalidate"); +header("Pragma: no-cache"); + $basename = basename(__FILE__); if (!strpos($_SERVER['REQUEST_URI'], $basename)) { chdir(Extract_Phar::$temp); -include Extract_Phar::START; +include $web; +return; } $pt = substr($_SERVER['REQUEST_URI'], strpos($_SERVER['REQUEST_URI'], $basename) + strlen($basename)); if (!$pt || $pt == '/') { $pt = $web; header('HTTP/1.1 301 Moved Permanently'); header('Location: ' . $_SERVER['REQUEST_URI'] . '/' . $pt); +exit; } $a = realpath(Extract_Phar::$temp . DIRECTORY_SEPARATOR . $pt); if (!$a || strlen(dirname($a)) < strlen(Extract_Phar::$temp)) { @@ -391,12 +421,6 @@ exit; } if (isset($mimes[$b['extension']])) { if ($mimes[$b['extension']] === 1) { -$_SERVER['PHAR_PATH_INFO'] = $_SERVER['PATH_INFO']; -$_SERVER['PATH_INFO'] = substr($_SERVER['PATH_INFO'], strpos($_SERVER['PATH_INFO'], $basename) + strlen($basename)); -if (isset($_SERVER['PATH_TRANSLATED'])) { -$_SERVER['PHAR_PATH_TRANSLATED'] = $_SERVER['PATH_TRANSLATED']; -$_SERVER['PATH_TRANSLATED'] = $a; -} include $a; exit; } @@ -411,28 +435,24 @@ exit; } } } -if (in_array('phar', stream_get_wrappers()) && class_exists('Phar', 0)) { -Phar::interceptFileFuncs(); -include 'phar://' . __FILE__ . '/' . Extract_Phar::START; -return; -} + class Extract_Phar { static $temp; -static $tmp = array(); static $origdir; const GZ = 0x1000; const BZ2 = 0x2000; const MASK = 0x3000; const START = 'my/custom/thingy.php'; -const LEN = 7145; +const LEN = 6603; + static function go($return = false) { -register_shutdown_function(array('Extract_Phar', '_removeTmpFiles')); $fp = fopen(__FILE__, 'rb'); fseek($fp, self::LEN); $L = unpack('V', $a = fread($fp, 4)); $m = ''; + do { $read = 8192; if ($L[1] - strlen($m) < 8192) { @@ -441,26 +461,32 @@ $read = $L[1] - strlen($m); $last = fread($fp, $read); $m .= $last; } while (strlen($last) && strlen($m) < $L[1]); + if (strlen($m) < $L[1]) { die('ERROR: manifest length read was "' . strlen($m) .'" should be "' . $L[1] . '"'); } + $info = self::_unpack($m); $f = $info['c']; + if ($f & self::GZ) { if (!function_exists('gzinflate')) { die('Error: zlib extension is not enabled -' . ' gzinflate() function needed for zlib-compressed .phars'); } } + if ($f & self::BZ2) { if (!function_exists('bzdecompress')) { die('Error: bzip2 extension is not enabled -' . ' bzdecompress() function needed for bz2-compressed .phars'); } } + $temp = self::tmpdir(); + if (!$temp || !is_writable($temp)) { $sessionpath = session_save_path(); if (strpos ($sessionpath, ";") !== false) @@ -470,32 +496,37 @@ die('Could not locate temporary directory to extract phar'); } $temp = $sessionpath; } -$temp .= '/pharextract'; + +$temp .= '/pharextract/'.basename(__FILE__, '.phar'); self::$temp = $temp; -while (file_exists($temp)) { -$temp .= 1; -} -@mkdir($temp); -@chmod($temp, 0777); -$temp = realpath($temp); -self::$tmp[] = $temp; self::$origdir = getcwd(); +@mkdir($temp, 0777, true); +$temp = realpath($temp); + +if (!file_exists($temp . DIRECTORY_SEPARATOR . md5_file(__FILE__))) { +self::_removeTmpFiles($temp, getcwd()); +@mkdir($temp, 0777, true); +@file_put_contents($temp . '/' . md5_file(__FILE__), ''); + foreach ($info['m'] as $path => $file) { $a = !file_exists(dirname($temp . '/' . $path)); @mkdir(dirname($temp . '/' . $path), 0777, true); clearstatcache(); -if ($a) self::$tmp[] = realpath(dirname($temp . '/' . $path)); + if ($path[strlen($path) - 1] == '/') { -mkdir($temp . '/' . $path); -@chmod($temp . '/' . $path, 0777); +@mkdir($temp . '/' . $path, 0777); } else { file_put_contents($temp . '/' . $path, self::extractFile($path, $file, $fp)); @chmod($temp . '/' . $path, 0666); } -self::$tmp[] = realpath($temp . '/' . $path); } +} + chdir($temp); -if (!$return) include self::START; + +if (!$return) { +include self::START; +} } static function tmpdir() @@ -518,24 +549,19 @@ return realpath('/tmp'); static function _unpack($m) { $info = unpack('V', substr($m, 0, 4)); -// skip API version, phar flags, alias, metadata -$l = unpack('V', substr($m, 10, 4)); + $l = unpack('V', substr($m, 10, 4)); $m = substr($m, 14 + $l[1]); $s = unpack('V', substr($m, 0, 4)); $o = 0; $start = 4 + $s[1]; $ret['c'] = 0; + for ($i = 0; $i < $info[1]; $i++) { -// length of the file name -$len = unpack('V', substr($m, $start, 4)); + $len = unpack('V', substr($m, $start, 4)); $start += 4; -// file name -$savepath = substr($m, $start, $len[1]); + $savepath = substr($m, $start, $len[1]); $start += $len[1]; -// retrieve manifest data: -// 0 = size, 1 = timestamp, 2 = compressed size, 3 = crc32, 4 = flags -// 5 = metadata length -$ret['m'][$savepath] = array_values(unpack('Va/Vb/Vc/Vd/Ve/Vf', substr($m, $start, 24))); + $ret['m'][$savepath] = array_values(unpack('Va/Vb/Vc/Vd/Ve/Vf', substr($m, $start, 24))); $ret['m'][$savepath][3] = sprintf('%u', $ret['m'][$savepath][3] & 0xffffffff); $ret['m'][$savepath][7] = $o; @@ -550,6 +576,7 @@ static function extractFile($path, $entry, $fp) { $data = ''; $c = $entry[2]; + while ($c) { if ($c < 8192) { $data .= @fread($fp, $c); @@ -559,30 +586,41 @@ $c -= 8192; $data .= @fread($fp, 8192); } } + if ($entry[4] & self::GZ) { $data = gzinflate($data); } elseif ($entry[4] & self::BZ2) { $data = bzdecompress($data); } + if (strlen($data) != $entry[0]) { die("Invalid internal .phar file (size error " . strlen($data) . " != " . $stat[7] . ")"); } + if ($entry[3] != sprintf("%u", crc32($data) & 0xffffffff)) { die("Invalid internal .phar file (checksum error)"); } + return $data; } -static function _removeTmpFiles() +static function _removeTmpFiles($temp, $origdir) { -if (count(self::$tmp)) { -foreach (array_reverse(self::$tmp) as $f) { -if (file_exists($f)) is_dir($f) ? @rmdir($f) : @unlink($f); -} +chdir($temp); +foreach (glob('*') as $f) { +if (file_exists($f)) { +is_dir($f) ? @rmdir($f) : @unlink($f); +if (file_exists($f) && is_dir($f)) { +self::_removeTmpFiles($f, getcwd()); +} +} } -chdir(self::$origdir); + +@rmdir($temp); +clearstatcache(); +chdir($origdir); } } @@ -590,7 +628,7 @@ Extract_Phar::go(); __HALT_COMPILER(); ?>" ============================================================================ ============================================================================ -int(7524) +int(6982) ============================================================================ ============================================================================ Illegal filename passed in for stub creation, was 401 characters long, and only 400 or less is allowed @@ -598,16 +636,21 @@ Illegal filename passed in for stub creation, was 401 characters long, and only ============================================================================ ============================================================================ ============================================================================ -string(7154) "<?php +string(6612) "<?php + $web = 'the/web.php'; -if ($web) { + if (in_array('phar', stream_get_wrappers()) && class_exists('Phar', 0)) { Phar::interceptFileFuncs(); +if ($web) { Phar::webPhar(null, $web); +} include 'phar://' . __FILE__ . '/' . Extract_Phar::START; return; } -if (isset($_SERVER['REQUEST_URI']) && isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'GET' || $_SERVER['REQUEST_METHOD'] == 'POST') { + +if ($web) { +if (@(isset($_SERVER['REQUEST_URI']) && isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'GET' || $_SERVER['REQUEST_METHOD'] == 'POST')) { Extract_Phar::go(true); $mimes = array( 'phps' => 2, @@ -651,16 +694,22 @@ $mimes = array( 'xbm' => 'image/xbm', 'xml' => 'text/xml', ); + +header("Cache-Control: no-cache, must-revalidate"); +header("Pragma: no-cache"); + $basename = basename(__FILE__); if (!strpos($_SERVER['REQUEST_URI'], $basename)) { chdir(Extract_Phar::$temp); -include Extract_Phar::START; +include $web; +return; } $pt = substr($_SERVER['REQUEST_URI'], strpos($_SERVER['REQUEST_URI'], $basename) + strlen($basename)); if (!$pt || $pt == '/') { $pt = $web; header('HTTP/1.1 301 Moved Permanently'); header('Location: ' . $_SERVER['REQUEST_URI'] . '/' . $pt); +exit; } $a = realpath(Extract_Phar::$temp . DIRECTORY_SEPARATOR . $pt); if (!$a || strlen(dirname($a)) < strlen(Extract_Phar::$temp)) { @@ -677,12 +726,6 @@ exit; } if (isset($mimes[$b['extension']])) { if ($mimes[$b['extension']] === 1) { -$_SERVER['PHAR_PATH_INFO'] = $_SERVER['PATH_INFO']; -$_SERVER['PATH_INFO'] = substr($_SERVER['PATH_INFO'], strpos($_SERVER['PATH_INFO'], $basename) + strlen($basename)); -if (isset($_SERVER['PATH_TRANSLATED'])) { -$_SERVER['PHAR_PATH_TRANSLATED'] = $_SERVER['PATH_TRANSLATED']; -$_SERVER['PATH_TRANSLATED'] = $a; -} include $a; exit; } @@ -697,28 +740,24 @@ exit; } } } -if (in_array('phar', stream_get_wrappers()) && class_exists('Phar', 0)) { -Phar::interceptFileFuncs(); -include 'phar://' . __FILE__ . '/' . Extract_Phar::START; -return; -} + class Extract_Phar { static $temp; -static $tmp = array(); static $origdir; const GZ = 0x1000; const BZ2 = 0x2000; const MASK = 0x3000; const START = 'my/custom/thingy.php'; -const LEN = 7156; +const LEN = 6614; + static function go($return = false) { -register_shutdown_function(array('Extract_Phar', '_removeTmpFiles')); $fp = fopen(__FILE__, 'rb'); fseek($fp, self::LEN); $L = unpack('V', $a = fread($fp, 4)); $m = ''; + do { $read = 8192; if ($L[1] - strlen($m) < 8192) { @@ -727,26 +766,32 @@ $read = $L[1] - strlen($m); $last = fread($fp, $read); $m .= $last; } while (strlen($last) && strlen($m) < $L[1]); + if (strlen($m) < $L[1]) { die('ERROR: manifest length read was "' . strlen($m) .'" should be "' . $L[1] . '"'); } + $info = self::_unpack($m); $f = $info['c']; + if ($f & self::GZ) { if (!function_exists('gzinflate')) { die('Error: zlib extension is not enabled -' . ' gzinflate() function needed for zlib-compressed .phars'); } } + if ($f & self::BZ2) { if (!function_exists('bzdecompress')) { die('Error: bzip2 extension is not enabled -' . ' bzdecompress() function needed for bz2-compressed .phars'); } } + $temp = self::tmpdir(); + if (!$temp || !is_writable($temp)) { $sessionpath = session_save_path(); if (strpos ($sessionpath, ";") !== false) @@ -756,32 +801,37 @@ die('Could not locate temporary directory to extract phar'); } $temp = $sessionpath; } -$temp .= '/pharextract'; + +$temp .= '/pharextract/'.basename(__FILE__, '.phar'); self::$temp = $temp; -while (file_exists($temp)) { -$temp .= 1; -} -@mkdir($temp); -@chmod($temp, 0777); -$temp = realpath($temp); -self::$tmp[] = $temp; self::$origdir = getcwd(); +@mkdir($temp, 0777, true); +$temp = realpath($temp); + +if (!file_exists($temp . DIRECTORY_SEPARATOR . md5_file(__FILE__))) { +self::_removeTmpFiles($temp, getcwd()); +@mkdir($temp, 0777, true); +@file_put_contents($temp . '/' . md5_file(__FILE__), ''); + foreach ($info['m'] as $path => $file) { $a = !file_exists(dirname($temp . '/' . $path)); @mkdir(dirname($temp . '/' . $path), 0777, true); clearstatcache(); -if ($a) self::$tmp[] = realpath(dirname($temp . '/' . $path)); + if ($path[strlen($path) - 1] == '/') { -mkdir($temp . '/' . $path); -@chmod($temp . '/' . $path, 0777); +@mkdir($temp . '/' . $path, 0777); } else { file_put_contents($temp . '/' . $path, self::extractFile($path, $file, $fp)); @chmod($temp . '/' . $path, 0666); } -self::$tmp[] = realpath($temp . '/' . $path); } +} + chdir($temp); -if (!$return) include self::START; + +if (!$return) { +include self::START; +} } static function tmpdir() @@ -804,24 +854,19 @@ return realpath('/tmp'); static function _unpack($m) { $info = unpack('V', substr($m, 0, 4)); -// skip API version, phar flags, alias, metadata -$l = unpack('V', substr($m, 10, 4)); + $l = unpack('V', substr($m, 10, 4)); $m = substr($m, 14 + $l[1]); $s = unpack('V', substr($m, 0, 4)); $o = 0; $start = 4 + $s[1]; $ret['c'] = 0; + for ($i = 0; $i < $info[1]; $i++) { -// length of the file name -$len = unpack('V', substr($m, $start, 4)); + $len = unpack('V', substr($m, $start, 4)); $start += 4; -// file name -$savepath = substr($m, $start, $len[1]); + $savepath = substr($m, $start, $len[1]); $start += $len[1]; -// retrieve manifest data: -// 0 = size, 1 = timestamp, 2 = compressed size, 3 = crc32, 4 = flags -// 5 = metadata length -$ret['m'][$savepath] = array_values(unpack('Va/Vb/Vc/Vd/Ve/Vf', substr($m, $start, 24))); + $ret['m'][$savepath] = array_values(unpack('Va/Vb/Vc/Vd/Ve/Vf', substr($m, $start, 24))); $ret['m'][$savepath][3] = sprintf('%u', $ret['m'][$savepath][3] & 0xffffffff); $ret['m'][$savepath][7] = $o; @@ -836,6 +881,7 @@ static function extractFile($path, $entry, $fp) { $data = ''; $c = $entry[2]; + while ($c) { if ($c < 8192) { $data .= @fread($fp, $c); @@ -845,30 +891,41 @@ $c -= 8192; $data .= @fread($fp, 8192); } } + if ($entry[4] & self::GZ) { $data = gzinflate($data); } elseif ($entry[4] & self::BZ2) { $data = bzdecompress($data); } + if (strlen($data) != $entry[0]) { die("Invalid internal .phar file (size error " . strlen($data) . " != " . $stat[7] . ")"); } + if ($entry[3] != sprintf("%u", crc32($data) & 0xffffffff)) { die("Invalid internal .phar file (checksum error)"); } + return $data; } -static function _removeTmpFiles() +static function _removeTmpFiles($temp, $origdir) { -if (count(self::$tmp)) { -foreach (array_reverse(self::$tmp) as $f) { -if (file_exists($f)) is_dir($f) ? @rmdir($f) : @unlink($f); -} +chdir($temp); +foreach (glob('*') as $f) { +if (file_exists($f)) { +is_dir($f) ? @rmdir($f) : @unlink($f); +if (file_exists($f) && is_dir($f)) { +self::_removeTmpFiles($f, getcwd()); } -chdir(self::$origdir); +} +} + +@rmdir($temp); +clearstatcache(); +chdir($origdir); } } @@ -876,6 +933,6 @@ Extract_Phar::go(); __HALT_COMPILER(); ?>" ============================================================================ ============================================================================ -int(7532) +int(6990) Illegal web filename passed in for stub creation, was 401 characters long, and only 400 or less is allowed ===DONE=== \ No newline at end of file diff --git a/ext/phar/tests/tar/tar_001.phpt b/ext/phar/tests/tar/tar_001.phpt index 785f42cecd..c0e7ea308c 100644 --- a/ext/phar/tests/tar/tar_001.phpt +++ b/ext/phar/tests/tar/tar_001.phpt @@ -25,6 +25,6 @@ echo $e->getMessage() . "\n"; @unlink(dirname(__FILE__) . '/tar_001.phar'); ?> --EXPECTF-- -Warning: fopen(phar://%s/tar_001.phar/tar_001.phpt): failed to open stream: phar error: "%s/tar_001.phar" is a corrupted tar file in %star_001.php on line %d -Cannot open phar file '%s/tar_001.phar' with alias '(null)': phar error: "%s/tar_001.phar" is a corrupted tar file +Warning: fopen(phar://%star_001.phar/tar_001.phpt): failed to open stream: phar error: "%star_001.phar" is a corrupted tar file in %star_001.php on line %d +Cannot open phar file '%star_001.phar' with alias '(null)': phar error: "%star_001.phar" is a corrupted tar file ===DONE=== \ No newline at end of file diff --git a/ext/phar/tests/tar/tar_002.phpt b/ext/phar/tests/tar/tar_002.phpt index 212b3b8186..b9e4c59392 100644 --- a/ext/phar/tests/tar/tar_002.phpt +++ b/ext/phar/tests/tar/tar_002.phpt @@ -27,6 +27,6 @@ echo $e->getMessage() . "\n"; @unlink(dirname(__FILE__) . '/tar_002.phar'); ?> --EXPECTF-- -Warning: fopen(phar://%s/tar_002.phar/tar_002.phpt): failed to open stream: phar error: "%s/tar_002.phar" is a corrupted tar file in %star_002.php on line %d -Cannot open phar file '%s/tar_002.phar' with alias '(null)': phar error: "%s/tar_002.phar" is a corrupted tar file +Warning: fopen(phar://%star_002.phar/tar_002.phpt): failed to open stream: phar error: "%star_002.phar" is a corrupted tar file in %star_002.php on line %d +Cannot open phar file '%star_002.phar' with alias '(null)': phar error: "%star_002.phar" is a corrupted tar file ===DONE=== \ No newline at end of file diff --git a/ext/phar/tests/zip/tarmaker.php.inc b/ext/phar/tests/zip/tarmaker.php.inc index da2add772b..831fa4a6f1 100644 --- a/ext/phar/tests/zip/tarmaker.php.inc +++ b/ext/phar/tests/zip/tarmaker.php.inc @@ -73,6 +73,6 @@ class tarmaker function __destruct() { - unlink($this->tmppath); + @unlink($this->tmppath); } } \ No newline at end of file