mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-25 02:51:35 +02:00
Merge pull request #3376 from marc1706/ticket/13568-asc
[ticket/13568] Validate imagick path as readable absolute path closes #3376
This commit is contained in:
78
tests/functional/acp_attachments_test.php
Normal file
78
tests/functional/acp_attachments_test.php
Normal file
@@ -0,0 +1,78 @@
|
||||
<?php
|
||||
/**
|
||||
*
|
||||
* This file is part of the phpBB Forum Software package.
|
||||
*
|
||||
* @copyright (c) phpBB Limited <https://www.phpbb.com>
|
||||
* @license GNU General Public License, version 2 (GPL-2.0)
|
||||
*
|
||||
* For full copyright and license information, please see
|
||||
* the docs/CREDITS.txt file.
|
||||
*
|
||||
*/
|
||||
|
||||
/**
|
||||
* @group functional
|
||||
*/
|
||||
class phpbb_functional_acp_attachments_test extends phpbb_functional_test_case
|
||||
{
|
||||
public function data_imagick_path_linux()
|
||||
{
|
||||
return array(
|
||||
array('/usr/bin', 'Configuration updated successfully'),
|
||||
array('/usr/foobar', 'The entered path “/usr/foobar” does not exist.'),
|
||||
array('/usr/bin/which', 'The entered path “/usr/bin/which” is not a directory.'),
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider data_imagick_path_linux
|
||||
*/
|
||||
public function test_imagick_path_linux($imagick_path, $expected)
|
||||
{
|
||||
if (strtolower(substr(PHP_OS, 0, 5)) !== 'linux')
|
||||
{
|
||||
$this->markTestSkipped('Unable to test linux specific paths on other OS.');
|
||||
}
|
||||
|
||||
$this->login();
|
||||
$this->admin_login();
|
||||
|
||||
$crawler = self::request('GET', 'adm/index.php?i=attachments&mode=attach&sid=' . $this->sid);
|
||||
|
||||
$form = $crawler->selectButton('Submit')->form(array('config[img_imagick]' => $imagick_path));
|
||||
|
||||
$crawler = self::submit($form);
|
||||
$this->assertContains($expected, $crawler->filter('#main')->text());
|
||||
}
|
||||
|
||||
public function data_imagick_path_windows()
|
||||
{
|
||||
return array(
|
||||
array('C:\Windows', 'Configuration updated successfully'),
|
||||
array('C:\Windows\foobar1', 'The entered path “C:\Windows\foobar1” does not exist.'),
|
||||
array('C:\Windows\explorer.exe', 'The entered path “C:\Windows\explorer.exe” is not a directory.'),
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider data_imagick_path_windows
|
||||
*/
|
||||
public function test_imagick_path_windows($imagick_path, $expected)
|
||||
{
|
||||
if (strtolower(substr(PHP_OS, 0, 3)) !== 'win')
|
||||
{
|
||||
$this->markTestSkipped('Unable to test windows specific paths on other OS.');
|
||||
}
|
||||
|
||||
$this->login();
|
||||
$this->admin_login();
|
||||
|
||||
$crawler = self::request('GET', 'adm/index.php?i=attachments&mode=attach&sid=' . $this->sid);
|
||||
|
||||
$form = $crawler->selectButton('Submit')->form(array('config[img_imagick]' => $imagick_path));
|
||||
|
||||
$crawler = self::submit($form);
|
||||
$this->assertContains($expected, $crawler->filter('#main')->text());
|
||||
}
|
||||
}
|
@@ -162,4 +162,91 @@ class phpbb_functions_acp_validate_config_vars_test extends phpbb_test_case
|
||||
|
||||
$this->assertEquals($expected, $phpbb_error);
|
||||
}
|
||||
|
||||
public function data_validate_path_linux()
|
||||
{
|
||||
return array(
|
||||
array('/usr/bin', 'absolute_path', true),
|
||||
array('/usr/bin/', 'absolute_path:50:200', true),
|
||||
array('/usr/bin/which', 'absolute_path', 'DIRECTORY_NOT_DIR'),
|
||||
array('/foo/bar', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'),
|
||||
array('C:\Windows', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'),
|
||||
array('.', 'absolute_path', true),
|
||||
array('', 'absolute_path', true),
|
||||
array('mkdir /foo/bar', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'),
|
||||
// Make sure above command didn't do anything
|
||||
array('/foo/bar', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'),
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider data_validate_path_linux
|
||||
*/
|
||||
public function test_validate_path_linux($path, $validation_type, $expected)
|
||||
{
|
||||
if (strtolower(substr(PHP_OS, 0, 5)) !== 'linux')
|
||||
{
|
||||
$this->markTestSkipped('Unable to test linux specific paths on other OS.');
|
||||
}
|
||||
|
||||
$error = array();
|
||||
$config_ary = array(
|
||||
'path' => $path,
|
||||
);
|
||||
|
||||
validate_config_vars(array(
|
||||
'path' => array('lang' => 'FOOBAR', 'validate' => $validation_type),
|
||||
),
|
||||
$config_ary,
|
||||
$error
|
||||
);
|
||||
}
|
||||
|
||||
public function data_validate_path_windows()
|
||||
{
|
||||
return array(
|
||||
array('C:\Windows', 'absolute_path', true),
|
||||
array('C:\Windows\\', 'absolute_path:50:200', true),
|
||||
array('C:\Windows\explorer.exe', 'absolute_path', 'DIRECTORY_NOT_DIR'),
|
||||
array('C:\foobar', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'),
|
||||
array('/usr/bin', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'),
|
||||
array('.', 'absolute_path', true),
|
||||
array('', 'absolute_path', true),
|
||||
array('mkdir C:\Windows\foobar', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'),
|
||||
// Make sure above command didn't do anything
|
||||
array('C:\Windows\foobar', 'absolute_path', 'DIRECTORY_DOES_NOT_EXIST'),
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider data_validate_path_windows
|
||||
*/
|
||||
public function test_validate_path_windows($path, $validation_type, $expected)
|
||||
{
|
||||
if (strtolower(substr(PHP_OS, 0, 3)) !== 'win')
|
||||
{
|
||||
$this->markTestSkipped('Unable to test windows specific paths on other OS.');
|
||||
}
|
||||
|
||||
$error = array();
|
||||
$config_ary = array(
|
||||
'path' => $path,
|
||||
);
|
||||
|
||||
validate_config_vars(array(
|
||||
'path' => array('lang' => 'FOOBAR', 'validate' => $validation_type),
|
||||
),
|
||||
$config_ary,
|
||||
$error
|
||||
);
|
||||
|
||||
if ($expected === true)
|
||||
{
|
||||
$this->assertEmpty($error);
|
||||
}
|
||||
else
|
||||
{
|
||||
$this->assertEquals(array($expected), $error);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user