aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2013-05-30 16:05:19 +0200
committerMarc Alexander <admin@m-a-styles.de>2013-05-30 16:05:19 +0200
commit3f657bc63e6649da43d860be1848116c42214a65 (patch)
tree1daf983d852b6d926521aa39a0c7bb522d0e7630 /tests
parent3d625ab0cf9fe8d1869fbdd66a4602553bb744d4 (diff)
downloadforums-3f657bc63e6649da43d860be1848116c42214a65.tar
forums-3f657bc63e6649da43d860be1848116c42214a65.tar.gz
forums-3f657bc63e6649da43d860be1848116c42214a65.tar.bz2
forums-3f657bc63e6649da43d860be1848116c42214a65.tar.xz
forums-3f657bc63e6649da43d860be1848116c42214a65.zip
[ticket/11579] Add remaining unit tests for validate_data functions
This now includes tests for usernames, passwords, emails, and jabber addresses. A few small changes had to be applied to phpbb_mock_cache and phpbb_mock_user in order to incorporate needed methods. PHPBB3-11579
Diffstat (limited to 'tests')
-rw-r--r--tests/functions/fixtures/validate_data.xml59
-rw-r--r--tests/functions/validate_data_test.php350
-rw-r--r--tests/mock/cache.php15
-rw-r--r--tests/mock/user.php13
4 files changed, 375 insertions, 62 deletions
diff --git a/tests/functions/fixtures/validate_data.xml b/tests/functions/fixtures/validate_data.xml
new file mode 100644
index 0000000000..38ecae6ad2
--- /dev/null
+++ b/tests/functions/fixtures/validate_data.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<dataset>
+ <table name="phpbb_groups">
+ <column>group_name</column>
+ <column>group_desc</column>
+ <row>
+ <value>foobar_group</value>
+ <value>test123</value>
+ </row>
+ </table>
+ <table name="phpbb_lang">
+ <column>lang_id</column>
+ <column>lang_iso</column>
+ <column>lang_local_name</column>
+ <column>lang_english_name</column>
+ <row>
+ <value>1</value>
+ <value>en</value>
+ <value>English</value>
+ <value>English</value>
+ </row>
+ <row>
+ <value>2</value>
+ <value>cs</value>
+ <value>Čeština</value>
+ <value>Czech</value>
+ </row>
+ </table>
+ <table name="phpbb_users">
+ <column>user_id</column>
+ <column>username</column>
+ <column>username_clean</column>
+ <column>user_permissions</column>
+ <column>user_sig</column>
+ <column>user_occ</column>
+ <column>user_interests</column>
+ <column>user_email_hash</column>
+ <row>
+ <value>1</value>
+ <value>admin</value>
+ <value>admin</value>
+ <value></value>
+ <value></value>
+ <value></value>
+ <value></value>
+ <value>143317126117</value>
+ </row>
+ <row>
+ <value>2</value>
+ <value>moderator</value>
+ <value>moderator</value>
+ <value></value>
+ <value></value>
+ <value></value>
+ <value></value>
+ <value>0</value>
+ </row>
+ </table>
+</dataset>
diff --git a/tests/functions/validate_data_test.php b/tests/functions/validate_data_test.php
index 6a429a5529..ed91f782ba 100644
--- a/tests/functions/validate_data_test.php
+++ b/tests/functions/validate_data_test.php
@@ -7,23 +7,30 @@
*
*/
+require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
require_once dirname(__FILE__) . '/../../phpBB/includes/functions_user.php';
require_once dirname(__FILE__) . '/../../phpBB/includes/utf/utf_tools.php';
+require_once dirname(__FILE__) . '/../mock/cache.php';
+require_once dirname(__FILE__) . '/../mock/user.php';
class phpbb_functions_validate_data_test extends phpbb_database_test_case
{
- /*
- * Types to test
- * - username
- * .
- * - password
- * - email
- * - jabber
- */
+ protected $db;
+ protected $cache;
+ protected $user;
public function getDataSet()
{
- return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/language_select.xml');
+ return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/validate_data.xml');
+ }
+
+ protected function setUp()
+ {
+ parent::setUp();
+
+ $this->db = $this->new_dbal();
+ $this->cache = new phpbb_mock_cache;
+ $this->user = new phpbb_mock_user;
}
/**
@@ -42,22 +49,15 @@ class phpbb_functions_validate_data_test extends phpbb_database_test_case
{
foreach ($input as $key => $data)
{
- $this->assertEquals($expected[$key], validate_data(array($data), array($validate_check[$key])));
+ $test = validate_data(array($data), array($validate_check[$key]));
+ if ($test != $expected[$key])
+ {
+ var_dump($key, $data, $test, $expected[$key]);
+ }
+ $this->assertEquals($expected[$key], $test);
}
}
- /*
- * Types to test
- * - string:
- * empty + optional = true --> good
- * empty + optional = false --> good (min = 0)
- * 'foobar' --> good
- * 'foobar' + optional = false|true + min = 2 + max = 6 --> good
- * 'foobar' + " + min = 7 + max = 9 --> TOO_SHORT
- * 'foobar' + " + min = 2 + max = 5 --> TOO_LONG
- * '' + optional = false + min = 1 + max = 6 --> TOO_SHORT
- * '' + optional = true + min = 1 + max = 6 --> good
- */
public function test_validate_string()
{
$this->validate_data_check(array(
@@ -92,16 +92,6 @@ class phpbb_functions_validate_data_test extends phpbb_database_test_case
));
}
- /*
- * Types to test
- * - num
- * empty + optional = true|false --> good
- * 0 --> good
- * 5 + optional = false|true + min = 2 + max = 6 --> good
- * 5 + optional = false|true + min = 7 + max = 10 --> TOO_SMALL
- * 5 + optional = false|true + min = 2 + max = 3 --> TOO_LARGE
- * 'foobar' --> should fail with WRONG_DATA_NUMERIC !!!
- */
public function test_validate_num()
{
$this->validate_data_check(array(
@@ -130,19 +120,6 @@ class phpbb_functions_validate_data_test extends phpbb_database_test_case
));
}
- /*
- * Types to test
- * - date
- * . '' --> invalid
- * . '' + optional = true --> good
- * . 17-06-1990 --> good
- * . 05-05-1990 --> good
- * . 17-12-1990 --> good
- * . 01-01-0000 --> good!!!
- * . 17-17-1990 --> invalid
- * . 00-12-1990 --> invalid
- * . 01-00-1990 --> invalid
- */
public function test_validate_date()
{
$this->validate_data_check(array(
@@ -186,14 +163,6 @@ class phpbb_functions_validate_data_test extends phpbb_database_test_case
));
}
- /*
- * Types to test
- * - match
- * . empty + optional = true --> good
- * . empty + empty match --> good
- * . 'test' + optional = true|false + match = '/[a-z]/' --> good
- * . 'test123' + optional = true|false + match = '/[a-z]/' --> WRONG_DATA_MATCH
- */
public function test_validate_match()
{
$this->validate_data_check(array(
@@ -216,19 +185,11 @@ class phpbb_functions_validate_data_test extends phpbb_database_test_case
));
}
- /*
- * Types to test
- * - language_iso_name
- * . empty --> WRONG_DATA
- * . 'en' --> good
- * . 'cs' --> good
- * . 'de' --> WRONG_DATA (won't exist)
- */
public function test_validate_lang_iso()
{
global $db;
- $db = $this->new_dbal();
+ $db = $this->db;
$this->validate_data_check(array(
'empty' => '',
@@ -249,4 +210,269 @@ class phpbb_functions_validate_data_test extends phpbb_database_test_case
'de' => array('WRONG_DATA'),
));
}
+
+ public function validate_username_data()
+ {
+ return array(
+ array('USERNAME_CHARS_ANY', array(
+ 'foobar_allow' => array(),
+ 'foobar_ascii' => array(),
+ 'foobar_any' => array(),
+ 'foobar_alpha' => array(),
+ 'foobar_alpha_spacers' => array(),
+ 'foobar_letter_num' => array(),
+ 'foobar_letter_num_sp' => array(),
+ 'foobar_quot' => array('INVALID_CHARS'),
+ 'barfoo_disallow' => array('USERNAME_DISALLOWED'),
+ 'admin_taken' => array('USERNAME_TAKEN'),
+ 'group_taken' => array('USERNAME_TAKEN')
+ )),
+ array('USERNAME_ALPHA_ONLY', array(
+ 'foobar_allow' => array(),
+ 'foobar_ascii' => array(),
+ 'foobar_any' => array('INVALID_CHARS'),
+ 'foobar_alpha' => array(),
+ 'foobar_alpha_spacers' => array('INVALID_CHARS'),
+ 'foobar_letter_num' => array(),
+ 'foobar_letter_num_sp' => array('INVALID_CHARS'),
+ 'foobar_quot' => array('INVALID_CHARS'),
+ 'barfoo_disallow' => array('USERNAME_DISALLOWED'),
+ 'admin_taken' => array('USERNAME_TAKEN'),
+ 'group_taken' => array('INVALID_CHARS')
+ )),
+ array('USERNAME_ALPHA_SPACERS', array(
+ 'foobar_allow' => array(),
+ 'foobar_ascii' => array(),
+ 'foobar_any' => array('INVALID_CHARS'),
+ 'foobar_alpha' => array(),
+ 'foobar_alpha_spacers' => array(),
+ 'foobar_letter_num' => array(),
+ 'foobar_letter_num_sp' => array('INVALID_CHARS'),
+ 'foobar_quot' => array('INVALID_CHARS'),
+ 'barfoo_disallow' => array('USERNAME_DISALLOWED'),
+ 'admin_taken' => array('USERNAME_TAKEN'),
+ 'group_taken' => array('USERNAME_TAKEN')
+ )),
+ array('USERNAME_LETTER_NUM', array(
+ 'foobar_allow' => array(),
+ 'foobar_ascii' => array(),
+ 'foobar_any' => array('INVALID_CHARS'),
+ 'foobar_alpha' => array(),
+ 'foobar_alpha_spacers' => array('INVALID_CHARS'),
+ 'foobar_letter_num' => array(),
+ 'foobar_letter_num_sp' => array('INVALID_CHARS'),
+ 'foobar_quot' => array('INVALID_CHARS'),
+ 'barfoo_disallow' => array('USERNAME_DISALLOWED'),
+ 'admin_taken' => array('USERNAME_TAKEN'),
+ 'group_taken' => array('INVALID_CHARS')
+ )),
+ array('USERNAME_LETTER_NUM_SPACERS', array(
+ 'foobar_allow' => array(),
+ 'foobar_ascii' => array(),
+ 'foobar_any' => array('INVALID_CHARS'),
+ 'foobar_alpha' => array(),
+ 'foobar_alpha_spacers' => array(),
+ 'foobar_letter_num' => array(),
+ 'foobar_letter_num_sp' => array(),
+ 'foobar_quot' => array('INVALID_CHARS'),
+ 'barfoo_disallow' => array('USERNAME_DISALLOWED'),
+ 'admin_taken' => array('USERNAME_TAKEN'),
+ 'group_taken' => array('USERNAME_TAKEN')
+ )),
+ array('USERNAME_ASCII', array(
+ 'foobar_allow' => array(),
+ 'foobar_ascii' => array(),
+ 'foobar_any' => array(),
+ 'foobar_alpha' => array(),
+ 'foobar_alpha_spacers' => array(),
+ 'foobar_letter_num' => array(),
+ 'foobar_letter_num_sp' => array('INVALID_CHARS'),
+ 'foobar_quot' => array('INVALID_CHARS'),
+ 'barfoo_disallow' => array('USERNAME_DISALLOWED'),
+ 'admin_taken' => array('USERNAME_TAKEN'),
+ 'group_taken' => array('USERNAME_TAKEN')
+ )),
+ );
+ }
+
+ /**
+ * @dataProvider validate_username_data
+ */
+ public function test_validate_username($allow_name_chars, $expected)
+ {
+ global $cache, $config, $db;
+
+ $db = $this->db;
+ $cache = $this->cache;
+ $cache->put('_disallowed_usernames', array('barfoo'));
+
+ $config['allow_name_chars'] = $allow_name_chars;
+
+ $this->validate_data_check(array(
+ 'foobar_allow' => 'foobar',
+ 'foobar_ascii' => 'foobar',
+ 'foobar_any' => 'f*~*^=oo_bar1',
+ 'foobar_alpha' => 'fo0Bar',
+ 'foobar_alpha_spacers' => 'Fo0-[B]_a+ R',
+ 'foobar_letter_num' => 'fo0Bar0',
+ 'foobar_letter_num_sp' => 'Fö0-[B]_a+ R',
+ 'foobar_quot' => '"foobar"',
+ 'barfoo_disallow' => 'barfoo',
+ 'admin_taken' => 'admin',
+ 'group_taken' => 'foobar_group',
+ ),
+ array(
+ 'foobar_allow' => array('username', 'foobar'),
+ 'foobar_ascii' => array('username'),
+ 'foobar_any' => array('username'),
+ 'foobar_alpha' => array('username'),
+ 'foobar_alpha_spacers' => array('username'),
+ 'foobar_letter_num' => array('username'),
+ 'foobar_letter_num_sp' => array('username'),
+ 'foobar_quot' => array('username'),
+ 'barfoo_disallow' => array('username'),
+ 'admin_taken' => array('username'),
+ 'group_taken' => array('username'),
+ ),
+ $expected);
+ }
+
+ public function validate_password_data()
+ {
+ return array(
+ array('PASS_TYPE_ANY', array(
+ 'empty' => array(),
+ 'foobar_any' => array(),
+ 'foobar_mixed' => array(),
+ 'foobar_alpha' => array(),
+ 'foobar_symbol' => array(),
+ )),
+ array('PASS_TYPE_CASE', array(
+ 'empty' => array(),
+ 'foobar_any' => array('INVALID_CHARS'),
+ 'foobar_mixed' => array(),
+ 'foobar_alpha' => array(),
+ 'foobar_symbol' => array(),
+ )),
+ array('PASS_TYPE_ALPHA', array(
+ 'empty' => array(),
+ 'foobar_any' => array('INVALID_CHARS'),
+ 'foobar_mixed' => array('INVALID_CHARS'),
+ 'foobar_alpha' => array(),
+ 'foobar_symbol' => array(),
+ )),
+ array('PASS_TYPE_SYMBOL', array(
+ 'empty' => array(),
+ 'foobar_any' => array('INVALID_CHARS'),
+ 'foobar_mixed' => array('INVALID_CHARS'),
+ 'foobar_alpha' => array('INVALID_CHARS'),
+ 'foobar_symbol' => array(),
+ )),
+ );
+ }
+
+ /**
+ * @dataProvider validate_password_data
+ */
+ public function test_validate_password($pass_complexity, $expected)
+ {
+ global $config;
+
+ // Set complexity to mixed case letters, numbers and symbols
+ $config['pass_complex'] = $pass_complexity;
+
+ $this->validate_data_check(array(
+ 'empty' => '',
+ 'foobar_any' => 'foobar',
+ 'foobar_mixed' => 'FooBar',
+ 'foobar_alpha' => 'F00bar',
+ 'foobar_symbol' => 'fooBar123*',
+ ),
+ array(
+ 'empty' => array('password'),
+ 'foobar_any' => array('password'),
+ 'foobar_mixed' => array('password'),
+ 'foobar_alpha' => array('password'),
+ 'foobar_symbol' => array('password'),
+ ),
+ $expected);
+ }
+
+ public function test_validate_email()
+ {
+ global $config, $db, $user;
+
+ $config['email_check_mx'] = true;
+ $db = $this->db;
+ $user = $this->user;
+ $user->optionset('banned_users', array('banned@example.com'));
+
+ $this->validate_data_check(array(
+ 'empty' => '',
+ 'allowed' => 'foobar@example.com',
+ 'invalid' => 'fööbar@example.com',
+ 'valid_complex' => "'%$~test@example.com",
+ 'taken' => 'admin@example.com',
+ 'banned' => 'banned@example.com',
+ 'no_mx' => 'test@wwrrrhhghgghgh.ttv',
+ ),
+ array(
+ 'empty' => array('email'),
+ 'allowed' => array('email', 'foobar@example.com'),
+ 'invalid' => array('email'),
+ 'valid_complex' => array('email'),
+ 'taken' => array('email'),
+ 'banned' => array('email'),
+ 'no_mx' => array('email'),
+ ),
+ array(
+ 'empty' => array(),
+ 'allowed' => array(),
+ 'invalid' => array('EMAIL_INVALID'),
+ 'valid_complex' => array(),
+ 'taken' => array('EMAIL_TAKEN'),
+ 'banned' => array('EMAIL_BANNED'),
+ 'no_mx' => array('DOMAIN_NO_MX_RECORD'),
+ ));
+ }
+
+ public function test_validate_jabber()
+ {
+ $this->validate_data_check(array(
+ 'empty' => '',
+ 'no_seperator' => 'testjabber.ccc',
+ 'no_user' => '@jabber.ccc',
+ 'no_realm' => 'user@',
+ 'dot_realm' => 'user@.....',
+ '-realm' => 'user@-jabber.ccc',
+ 'realm-' => 'user@jabber.ccc-',
+ 'correct' => 'user@jabber.09A-z.org',
+ 'prohibited' => 'u@ser@jabber.ccc.org',
+ 'prohibited_char' => 'u<s>er@jabber.ccc.org',
+ ),
+ array(
+ 'empty' => array('jabber'),
+ 'no_seperator' => array('jabber'),
+ 'no_user' => array('jabber'),
+ 'no_realm' => array('jabber'),
+ 'dot_realm' => array('jabber'),
+ '-realm' => array('jabber'),
+ 'realm-' => array('jabber'),
+ 'correct' => array('jabber'),
+ 'prohibited' => array('jabber'),
+ 'prohibited_char' => array('jabber'),
+ ),
+ array(
+ 'empty' => array(),
+ 'no_seperator' => array('WRONG_DATA'),
+ 'no_user' => array('WRONG_DATA'),
+ 'no_realm' => array('WRONG_DATA'),
+ 'dot_realm' => array('WRONG_DATA'),
+ '-realm' => array('WRONG_DATA'),
+ 'realm-' => array('WRONG_DATA'),
+ 'correct' => array(),
+ 'prohibited' => array('WRONG_DATA'),
+ 'prohibited_char' => array('WRONG_DATA'),
+ ));
+ }
}
diff --git a/tests/mock/cache.php b/tests/mock/cache.php
index aa0db5ab20..acf4288319 100644
--- a/tests/mock/cache.php
+++ b/tests/mock/cache.php
@@ -74,6 +74,21 @@ class phpbb_mock_cache
);
}
+ /**
+ * Obtain disallowed usernames. Input data via standard put method.
+ */
+ public function obtain_disallowed_usernames()
+ {
+ if (($usernames = $this->get('_disallowed_usernames')) !== false)
+ {
+ return $usernames;
+ }
+ else
+ {
+ return array();
+ }
+ }
+
public function set_bots($bots)
{
$this->data['_bots'] = $bots;
diff --git a/tests/mock/user.php b/tests/mock/user.php
index ec14ce430e..bd547b3973 100644
--- a/tests/mock/user.php
+++ b/tests/mock/user.php
@@ -33,4 +33,17 @@ class phpbb_mock_user
{
$this->options[$item] = $value;
}
+
+ public function check_ban($user_id = false, $user_ips = false, $user_email = false, $return = false)
+ {
+ $banned_users = $this->optionget('banned_users');
+ foreach ($banned_users as $banned)
+ {
+ if ($banned == $user_id || $banned == $user_ips || $banned == $user_email)
+ {
+ return true;
+ }
+ }
+ return false;
+ }
}
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-11 13:28:33 +0000