Collect all the open_basedir security tests into one place

diff --git a/ext/standard/tests/file/open_basedir.inc b/ext/standard/tests/file/open_basedir.inc
deleted file mode 100644 (file)
index 7fd0afc..0000000
--- a/ext/standard/tests/file/open_basedir.inc
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-
-// This file contains helper functions for testing open_basedir configuration
-// Care must be taken with where the directories are created because different
-// SAPIs set the working directory differently. So simply creating a directory
-// relative to the current working directory like this: mkdir("blah") might 
-// actually create it in several different places depending on the SAPI..!
-//
-// Note also depending on the version of php being tested, so the open_basedir
-// configuration may or may not be changeable from a script (PHP_INI_SYSTEM).
-//
-// For this reason we set the open_basedir to . (current directory) and then
-// move around to various directories for testing using chdir(). This is NOT
-// recommended for production use as . bypasses all semblence of security..!
-//
-// Although safe mode has been removed in php 6.0, open_basedir is still valid.
-//      See http://www.php.net/features.safe-mode for more information
-
-function recursive_delete_directory($directory) {
-
-    // Remove any trailing slash first
-    if (substr($directory, -1) == '/') {
-        $directory = substr($directory, 0, -1);
-    }
-
-    // Make sure the directory is valid
-    if (is_dir($directory) == FALSE) {
-        return FALSE;
-    } 
-
-    // Check we can access the directory
-    if (is_readable($directory) == FALSE) {
-        return FALSE;
-    }
-
-    $handle = opendir($directory);
-
-    // Scan through the directory contents
-    while (FALSE !== ($item = readdir($handle))) {
-        if ($item != '.') {
-             if ($item != '..') {
-                $path = ($directory.'/'.$item);
-                if (is_dir($path) == TRUE) {
-                    recursive_delete_directory($path);
-                } else {
-                                       @chmod($path, 0777);
-                    unlink($path);
-                }
-            }
-        }
-    }
-
-    closedir($handle);
-       @chmod($directory, 0777);
-    rmdir($directory);
-
-    return TRUE;
-}
-
-function create_directories() {
-    delete_directories();
-    $directory = dirname(__FILE__);
-
-    var_dump(mkdir($directory."/test"));
-    var_dump(mkdir($directory."/test/ok"));
-    var_dump(mkdir($directory."/test/bad"));
-    file_put_contents($directory."/test/ok/ok.txt", "Hello World!");
-    file_put_contents($directory."/test/bad/bad.txt", "Hello World!");
-}
-
-function delete_directories() {
-    $directory = (dirname(__FILE__)."/test");
-    recursive_delete_directory($directory);
-}
-
-function test_open_basedir_error($function) {
-    var_dump($function("../bad"));
-    var_dump($function("../bad/bad.txt"));
-    var_dump($function(".."));
-    var_dump($function("../"));
-    var_dump($function("/"));
-    var_dump($function("../bad/."));
-    $directory = dirname(__FILE__);
-    var_dump($function($directory."/test/bad/bad.txt"));
-    var_dump($function($directory."/test/bad/../bad/bad.txt"));
-}
-
-function test_open_basedir_before($function, $change = TRUE) {
-    echo "*** Testing open_basedir configuration [$function] ***\n";
-    $directory = dirname(__FILE__);
-    var_dump(chdir($directory));
-    create_directories();
-
-    // Optionally change directory
-    if ($change == TRUE) {
-        var_dump(chdir($directory."/test/ok"));
-    }
-}
-
-// Delete directories using a --CLEAN-- section!
-function test_open_basedir_after($function) {
-    echo "*** Finished testing open_basedir configuration [$function] ***\n";
-}
-
-// This is used by functions that return an array on success
-function test_open_basedir_array($function) {
-    test_open_basedir_before($function);
-    test_open_basedir_error($function); 
-    var_dump(is_array($function("./../.")));
-    var_dump(is_array($function("../ok")));
-    var_dump(is_array($function("ok.txt")));
-    var_dump(is_array($function("../ok/ok.txt")));
-    $directory = dirname(__FILE__);
-    var_dump(is_array($function($directory."/test/ok/ok.txt")));
-    var_dump(is_array($function($directory."/test/ok/../ok/ok.txt")));
-    test_open_basedir_after($function);
-}
-
-function test_open_basedir($function) {
-    test_open_basedir_before($function);
-    test_open_basedir_error($function);     
-    var_dump($function("./../."));
-    var_dump($function("../ok"));
-    var_dump($function("ok.txt"));
-    var_dump($function("../ok/ok.txt"));
-    $directory = dirname(__FILE__);
-    var_dump($function($directory."/test/ok/ok.txt"));
-    var_dump($function($directory."/test/ok/../ok/ok.txt"));
-    test_open_basedir_after($function);
-}
-
-?>
-

diff --git a/ext/standard/tests/dir/open_basedir.inc b/tests/security/open_basedir.inc
similarity index 100%
rename from ext/standard/tests/dir/open_basedir.inc
rename to tests/security/open_basedir.inc

diff --git a/ext/standard/tests/file/open_basedir_chdir.phpt b/tests/security/open_basedir_chdir.phpt
similarity index 100%
rename from ext/standard/tests/file/open_basedir_chdir.phpt
rename to tests/security/open_basedir_chdir.phpt

diff --git a/ext/standard/tests/file/open_basedir_chmod.phpt b/tests/security/open_basedir_chmod.phpt
similarity index 100%
rename from ext/standard/tests/file/open_basedir_chmod.phpt
rename to tests/security/open_basedir_chmod.phpt

diff --git a/ext/standard/tests/file/open_basedir_copy.phpt b/tests/security/open_basedir_copy.phpt
similarity index 100%
rename from ext/standard/tests/file/open_basedir_copy.phpt
rename to tests/security/open_basedir_copy.phpt

diff --git a/ext/standard/tests/file/open_basedir_copy_variation1.phpt b/tests/security/open_basedir_copy_variation1.phpt
similarity index 100%
rename from ext/standard/tests/file/open_basedir_copy_variation1.phpt
rename to tests/security/open_basedir_copy_variation1.phpt

diff --git a/ext/standard/tests/dir/open_basedir_dir.phpt b/tests/security/open_basedir_dir.phpt
similarity index 100%
rename from ext/standard/tests/dir/open_basedir_dir.phpt
rename to tests/security/open_basedir_dir.phpt

diff --git a/ext/standard/tests/file/open_basedir_disk_free_space.phpt b/tests/security/open_basedir_disk_free_space.phpt
similarity index 100%
rename from ext/standard/tests/file/open_basedir_disk_free_space.phpt
rename to tests/security/open_basedir_disk_free_space.phpt

diff --git a/tests/security/open_basedir_error_log.phpt b/tests/security/open_basedir_error_log.phpt
new file mode 100644 (file)
index 0000000..62bb5ca
--- /dev/null
+++ b/tests/security/open_basedir_error_log.phpt
@@ -0,0 +1,43 @@
+--TEST--
+Test open_basedir configuration
+--INI--
+open_basedir=.
+--FILE--
+<?php
+require_once "open_basedir.inc";
+test_open_basedir_before("error_log");
+$directory = dirname(__FILE__);
+
+var_dump(ini_set("error_log", $directory."/test/bad/bad.txt"));
+var_dump(ini_set("error_log", $directory."/test/bad.txt"));
+var_dump(ini_set("error_log", $directory."/bad.txt"));
+var_dump(ini_set("error_log", $directory."/test/ok/ok.txt"));
+var_dump(ini_set("error_log", $directory."/test/ok/ok.txt"));
+
+test_open_basedir_after("error_log");
+?>
+--CLEAN--
+<?php
+require_once "open_basedir.inc";
+delete_directories();
+?>
+--EXPECTF--
+*** Testing open_basedir configuration [error_log] ***
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+
+Warning: ini_set(): open_basedir restriction in effect. File(%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d
+bool(false)
+
+Warning: ini_set(): open_basedir restriction in effect. File(%s/test/bad.txt) is not within the allowed path(s): (.) in %s on line %d
+bool(false)
+
+Warning: ini_set(): open_basedir restriction in effect. File(%s/bad.txt) is not within the allowed path(s): (.) in %s on line %d
+bool(false)
+string(0) ""
+string(%d) "%s/test/ok/ok.txt"
+*** Finished testing open_basedir configuration [error_log] ***
+

diff --git a/tests/security/open_basedir_error_log_variation.phpt b/tests/security/open_basedir_error_log_variation.phpt
new file mode 100644 (file)
index 0000000..c0295f6
--- /dev/null
+++ b/tests/security/open_basedir_error_log_variation.phpt
@@ -0,0 +1,48 @@
+--TEST--
+Test open_basedir configuration
+--INI--
+open_basedir=.
+--FILE--
+<?php
+require_once "open_basedir.inc";
+test_open_basedir_before("error_log");
+$directory = dirname(__FILE__);
+define("DESTINATION_IS_FILE", 3);
+
+var_dump(error_log("Hello World!", DESTINATION_IS_FILE, $directory."/test/bad/bad.txt"));
+var_dump(error_log("Hello World!", DESTINATION_IS_FILE, $directory."/test/bad.txt"));
+var_dump(error_log("Hello World!", DESTINATION_IS_FILE, $directory."/bad.txt"));
+var_dump(error_log("Hello World!", DESTINATION_IS_FILE, $directory."/test/ok/ok.txt"));
+
+test_open_basedir_after("error_log");
+?>
+--CLEAN--
+<?php
+require_once "open_basedir.inc";
+delete_directories();
+?>
+--EXPECTF--
+*** Testing open_basedir configuration [error_log] ***
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+bool(true)
+
+Warning: error_log(): open_basedir restriction in effect. File(%s/test/bad/bad.txt) is not within the allowed path(s): (.) in %s on line %d
+
+Warning: error_log(%s/test/bad/bad.txt): failed to open stream: Operation not permitted in %s on line %d
+bool(false)
+
+Warning: error_log(): open_basedir restriction in effect. File(%s/test/bad.txt) is not within the allowed path(s): (.) in %s on line %d
+
+Warning: error_log(%s/test/bad.txt): failed to open stream: Operation not permitted in %s on line %d
+bool(false)
+
+Warning: error_log(): open_basedir restriction in effect. File(%s/bad.txt) is not within the allowed path(s): (.) in %s on line %d
+
+Warning: error_log(%s/bad.txt): failed to open stream: Operation not permitted in %s on line %d
+bool(false)
+bool(true)
+*** Finished testing open_basedir configuration [error_log] ***
+

diff --git a/ext/standard/tests/file/open_basedir_file.phpt b/tests/security/open_basedir_file.phpt
similarity index 100%
rename from ext/standard/tests/file/open_basedir_file.phpt
rename to tests/security/open_basedir_file.phpt

diff --git a/ext/standard/tests/file/open_basedir_file_exists.phpt b/tests/security/open_basedir_file_exists.phpt
similarity index 100%
rename from ext/standard/tests/file/open_basedir_file_exists.phpt
rename to tests/security/open_basedir_file_exists.phpt

diff --git a/ext/standard/tests/file/open_basedir_file_get_contents.phpt b/tests/security/open_basedir_file_get_contents.phpt
similarity index 100%
rename from ext/standard/tests/file/open_basedir_file_get_contents.phpt
rename to tests/security/open_basedir_file_get_contents.phpt

diff --git a/ext/standard/tests/file/open_basedir_file_put_contents.phpt b/tests/security/open_basedir_file_put_contents.phpt
similarity index 100%
rename from ext/standard/tests/file/open_basedir_file_put_contents.phpt
rename to tests/security/open_basedir_file_put_contents.phpt

diff --git a/ext/standard/tests/file/open_basedir_fileatime.phpt b/tests/security/open_basedir_fileatime.phpt
similarity index 100%
rename from ext/standard/tests/file/open_basedir_fileatime.phpt
rename to tests/security/open_basedir_fileatime.phpt

diff --git a/ext/standard/tests/file/open_basedir_filectime.phpt b/tests/security/open_basedir_filectime.phpt
similarity index 100%
rename from ext/standard/tests/file/open_basedir_filectime.phpt
rename to tests/security/open_basedir_filectime.phpt

diff --git a/ext/standard/tests/file/open_basedir_filegroup.phpt b/tests/security/open_basedir_filegroup.phpt
similarity index 100%
rename from ext/standard/tests/file/open_basedir_filegroup.phpt
rename to tests/security/open_basedir_filegroup.phpt

diff --git a/ext/standard/tests/file/open_basedir_fileinode.phpt b/tests/security/open_basedir_fileinode.phpt
similarity index 100%
rename from ext/standard/tests/file/open_basedir_fileinode.phpt
rename to tests/security/open_basedir_fileinode.phpt

diff --git a/ext/standard/tests/file/open_basedir_filemtime.phpt b/tests/security/open_basedir_filemtime.phpt
similarity index 100%
rename from ext/standard/tests/file/open_basedir_filemtime.phpt
rename to tests/security/open_basedir_filemtime.phpt

diff --git a/ext/standard/tests/file/open_basedir_fileowner.phpt b/tests/security/open_basedir_fileowner.phpt
similarity index 100%
rename from ext/standard/tests/file/open_basedir_fileowner.phpt
rename to tests/security/open_basedir_fileowner.phpt

diff --git a/ext/standard/tests/file/open_basedir_fileperms.phpt b/tests/security/open_basedir_fileperms.phpt
similarity index 100%
rename from ext/standard/tests/file/open_basedir_fileperms.phpt
rename to tests/security/open_basedir_fileperms.phpt

diff --git a/ext/standard/tests/file/open_basedir_filesize.phpt b/tests/security/open_basedir_filesize.phpt
similarity index 100%
rename from ext/standard/tests/file/open_basedir_filesize.phpt
rename to tests/security/open_basedir_filesize.phpt

diff --git a/ext/standard/tests/file/open_basedir_filetype.phpt b/tests/security/open_basedir_filetype.phpt
similarity index 100%
rename from ext/standard/tests/file/open_basedir_filetype.phpt
rename to tests/security/open_basedir_filetype.phpt

diff --git a/ext/standard/tests/file/open_basedir_fopen.phpt b/tests/security/open_basedir_fopen.phpt
similarity index 100%
rename from ext/standard/tests/file/open_basedir_fopen.phpt
rename to tests/security/open_basedir_fopen.phpt

diff --git a/ext/standard/tests/file/open_basedir_glob-win32.phpt b/tests/security/open_basedir_glob-win32.phpt
similarity index 100%
rename from ext/standard/tests/file/open_basedir_glob-win32.phpt
rename to tests/security/open_basedir_glob-win32.phpt

diff --git a/ext/standard/tests/file/open_basedir_glob.phpt b/tests/security/open_basedir_glob.phpt
similarity index 100%
rename from ext/standard/tests/file/open_basedir_glob.phpt
rename to tests/security/open_basedir_glob.phpt

diff --git a/ext/standard/tests/file/open_basedir_is_dir.phpt b/tests/security/open_basedir_is_dir.phpt
similarity index 100%
rename from ext/standard/tests/file/open_basedir_is_dir.phpt
rename to tests/security/open_basedir_is_dir.phpt

diff --git a/ext/standard/tests/file/open_basedir_is_executable.phpt b/tests/security/open_basedir_is_executable.phpt
similarity index 100%
rename from ext/standard/tests/file/open_basedir_is_executable.phpt
rename to tests/security/open_basedir_is_executable.phpt

diff --git a/ext/standard/tests/file/open_basedir_is_file.phpt b/tests/security/open_basedir_is_file.phpt
similarity index 100%
rename from ext/standard/tests/file/open_basedir_is_file.phpt
rename to tests/security/open_basedir_is_file.phpt

diff --git a/ext/standard/tests/file/open_basedir_is_link.phpt b/tests/security/open_basedir_is_link.phpt
similarity index 100%
rename from ext/standard/tests/file/open_basedir_is_link.phpt
rename to tests/security/open_basedir_is_link.phpt

diff --git a/ext/standard/tests/file/open_basedir_is_readable.phpt b/tests/security/open_basedir_is_readable.phpt
similarity index 100%
rename from ext/standard/tests/file/open_basedir_is_readable.phpt
rename to tests/security/open_basedir_is_readable.phpt

diff --git a/ext/standard/tests/file/open_basedir_is_writable.phpt b/tests/security/open_basedir_is_writable.phpt
similarity index 100%
rename from ext/standard/tests/file/open_basedir_is_writable.phpt
rename to tests/security/open_basedir_is_writable.phpt

diff --git a/ext/standard/tests/file/open_basedir_link.phpt b/tests/security/open_basedir_link.phpt
similarity index 100%
rename from ext/standard/tests/file/open_basedir_link.phpt
rename to tests/security/open_basedir_link.phpt

diff --git a/ext/standard/tests/file/open_basedir_linkinfo.phpt b/tests/security/open_basedir_linkinfo.phpt
similarity index 100%
rename from ext/standard/tests/file/open_basedir_linkinfo.phpt
rename to tests/security/open_basedir_linkinfo.phpt

diff --git a/ext/standard/tests/file/open_basedir_lstat.phpt b/tests/security/open_basedir_lstat.phpt
similarity index 100%
rename from ext/standard/tests/file/open_basedir_lstat.phpt
rename to tests/security/open_basedir_lstat.phpt

diff --git a/ext/standard/tests/file/open_basedir_mkdir.phpt b/tests/security/open_basedir_mkdir.phpt
similarity index 100%
rename from ext/standard/tests/file/open_basedir_mkdir.phpt
rename to tests/security/open_basedir_mkdir.phpt

diff --git a/ext/standard/tests/dir/open_basedir_opendir.phpt b/tests/security/open_basedir_opendir.phpt
similarity index 100%
rename from ext/standard/tests/dir/open_basedir_opendir.phpt
rename to tests/security/open_basedir_opendir.phpt

diff --git a/ext/standard/tests/file/open_basedir_parse_ini_file.phpt b/tests/security/open_basedir_parse_ini_file.phpt
similarity index 100%
rename from ext/standard/tests/file/open_basedir_parse_ini_file.phpt
rename to tests/security/open_basedir_parse_ini_file.phpt

diff --git a/ext/standard/tests/file/open_basedir_readlink.phpt b/tests/security/open_basedir_readlink.phpt
similarity index 100%
rename from ext/standard/tests/file/open_basedir_readlink.phpt
rename to tests/security/open_basedir_readlink.phpt

diff --git a/ext/standard/tests/file/open_basedir_realpath.phpt b/tests/security/open_basedir_realpath.phpt
similarity index 100%
rename from ext/standard/tests/file/open_basedir_realpath.phpt
rename to tests/security/open_basedir_realpath.phpt

diff --git a/ext/standard/tests/file/open_basedir_rename.phpt b/tests/security/open_basedir_rename.phpt
similarity index 100%
rename from ext/standard/tests/file/open_basedir_rename.phpt
rename to tests/security/open_basedir_rename.phpt

diff --git a/ext/standard/tests/file/open_basedir_rmdir.phpt b/tests/security/open_basedir_rmdir.phpt
similarity index 100%
rename from ext/standard/tests/file/open_basedir_rmdir.phpt
rename to tests/security/open_basedir_rmdir.phpt

diff --git a/ext/standard/tests/dir/open_basedir_scandir.phpt b/tests/security/open_basedir_scandir.phpt
similarity index 100%
rename from ext/standard/tests/dir/open_basedir_scandir.phpt
rename to tests/security/open_basedir_scandir.phpt

diff --git a/ext/standard/tests/file/open_basedir_stat.phpt b/tests/security/open_basedir_stat.phpt
similarity index 100%
rename from ext/standard/tests/file/open_basedir_stat.phpt
rename to tests/security/open_basedir_stat.phpt

diff --git a/ext/standard/tests/file/open_basedir_symlink.phpt b/tests/security/open_basedir_symlink.phpt
similarity index 100%
rename from ext/standard/tests/file/open_basedir_symlink.phpt
rename to tests/security/open_basedir_symlink.phpt

diff --git a/ext/standard/tests/file/open_basedir_tempnam.phpt b/tests/security/open_basedir_tempnam.phpt
similarity index 100%
rename from ext/standard/tests/file/open_basedir_tempnam.phpt
rename to tests/security/open_basedir_tempnam.phpt

diff --git a/ext/standard/tests/file/open_basedir_touch.phpt b/tests/security/open_basedir_touch.phpt
similarity index 100%
rename from ext/standard/tests/file/open_basedir_touch.phpt
rename to tests/security/open_basedir_touch.phpt

diff --git a/ext/standard/tests/file/open_basedir_unlink.phpt b/tests/security/open_basedir_unlink.phpt
similarity index 100%
rename from ext/standard/tests/file/open_basedir_unlink.phpt
rename to tests/security/open_basedir_unlink.phpt