jani                                     Sat, 25 Jul 2009 00:43:42 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=284733

Log:
- Fix tests .oO(why are there so many things broken in this branch..?)

Changed paths:
    U   php/php-src/branches/PHP_5_3/tests/security/open_basedir.inc
    U   php/php-src/branches/PHP_5_3/tests/security/open_basedir_copy.phpt

Modified: php/php-src/branches/PHP_5_3/tests/security/open_basedir.inc
===================================================================
--- php/php-src/branches/PHP_5_3/tests/security/open_basedir.inc        
2009-07-25 00:35:25 UTC (rev 284732)
+++ php/php-src/branches/PHP_5_3/tests/security/open_basedir.inc        
2009-07-25 00:43:42 UTC (rev 284733)
@@ -90,7 +90,6 @@
     global $savedDirectory;
     echo "*** Testing open_basedir configuration [$function] ***\n";
     $directory = getcwd();
-    var_dump($directory);
     $savedDirectory = $directory;
     var_dump(chdir($directory));
     create_directories();

Modified: php/php-src/branches/PHP_5_3/tests/security/open_basedir_copy.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/tests/security/open_basedir_copy.phpt  
2009-07-25 00:35:25 UTC (rev 284732)
+++ php/php-src/branches/PHP_5_3/tests/security/open_basedir_copy.phpt  
2009-07-25 00:43:42 UTC (rev 284733)
@@ -1,11 +1,78 @@
 --TEST--
 Test open_basedir configuration
 --INI--
-open_basedir={PWD}
+open_basedir=.
 --FILE--
 <?php
-$thisdir = dirname(__FILE__);
+require_once "open_basedir.inc";
+test_open_basedir_before("copy");

-var_dump(touch($thisdir . "afile"));
+var_dump(copy("ok.txt", "../bad"));
+var_dump(copy("ok.txt", "../bad/bad.txt"));
+var_dump(copy("ok.txt", ".."));
+var_dump(copy("ok.txt", "../"));
+var_dump(copy("ok.txt", "/"));
+var_dump(copy("ok.txt", "../bad/."));
+var_dump(copy("ok.txt", "../bad/./bad.txt"));
+var_dump(copy("ok.txt", "./../."));

+var_dump(copy("ok.txt", "copy.txt"));
+var_dump(unlink("copy.txt"));
+test_open_basedir_after("copy");
 ?>
+--CLEAN--
+<?php
+require_once "open_basedir.inc";
+delete_directories();
+?>
+--EXPECTF--
+*** Testing open_basedir configuration [copy] ***
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+
+Warning: copy(): open_basedir restriction in effect. File(../bad) is not 
within the allowed path(s): (.) in %s on line %d
+
+Warning: copy(../bad): failed to open stream: %s in %s on line %d
+bool(false)
+
+Warning: copy(): open_basedir restriction in effect. File(../bad/bad.txt) is 
not within the allowed path(s): (.) in %s on line %d
+
+Warning: copy(../bad/bad.txt): failed to open stream: %s in %s on line %d
+bool(false)
+
+Warning: copy(): open_basedir restriction in effect. File(..) is not within 
the allowed path(s): (.) in %s on line %d
+
+Warning: copy(..): failed to open stream: %s in %s on line %d
+bool(false)
+
+Warning: copy(): open_basedir restriction in effect. File(../) is not within 
the allowed path(s): (.) in %s on line %d
+
+Warning: copy(../): failed to open stream: %s in %s on line %d
+bool(false)
+
+Warning: copy(): open_basedir restriction in effect. File(/) is not within the 
allowed path(s): (.) in %s on line %d
+
+Warning: copy(/): failed to open stream: %s in %s on line %d
+bool(false)
+
+Warning: copy(): open_basedir restriction in effect. File(../bad/.) is not 
within the allowed path(s): (.) in %s on line %d
+
+Warning: copy(../bad/.): failed to open stream: %s in %s on line %d
+bool(false)
+
+Warning: copy(): open_basedir restriction in effect. File(../bad/./bad.txt) is 
not within the allowed path(s): (.) in %s on line %d
+
+Warning: copy(../bad/./bad.txt): failed to open stream: %s in %s on line %d
+bool(false)
+
+Warning: copy(): open_basedir restriction in effect. File(./../.) is not 
within the allowed path(s): (.) in %s on line %d
+
+Warning: copy(./../.): failed to open stream: %s in %s on line %d
+bool(false)
+bool(true)
+bool(true)
+*** Finished testing open_basedir configuration [copy] ***
+

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to