From: Ant Phillips Date: Fri, 9 May 2008 08:44:44 +0000 (+0000) Subject: Collect all the open_basedir security tests into one place X-Git-Tag: RELEASE_2_0_0b1~46 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b6c0148fc0ce5ba5461c9c99158ccdbeeb4db371;p=php 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 index 7fd0afc8bb..0000000000 --- a/ext/standard/tests/file/open_basedir.inc +++ /dev/null @@ -1,133 +0,0 @@ - - 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 index 0000000000..bb899c8adb --- /dev/null +++ b/tests/security/open_basedir_error_log.phpt @@ -0,0 +1,62 @@ +--TEST-- +Test open_basedir configuration +--INI-- +open_basedir=. +--FILE-- + +--CLEAN-- + +--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] *** +--UEXPECTF-- +*** 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) +unicode(0) "" +unicode(%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 index 0000000000..c0295f6506 --- /dev/null +++ b/tests/security/open_basedir_error_log_variation.phpt @@ -0,0 +1,48 @@ +--TEST-- +Test open_basedir configuration +--INI-- +open_basedir=. +--FILE-- + +--CLEAN-- + +--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