mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-13 20:24:08 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'Hardolaf/feature/auth-refactor' into develop

Browse Source 
* Hardolaf/feature/auth-refactor: (44 commits)
  [feature/auth-refactor] Fix code style issue
  [feature/auth-refactor] Fix comment grammar
  [feature/auth-refactor] Fix the actual cause of test failures
  [feature/auth-refactor] A possible fix for the functional test failures
  [feature/auth-refactor] Forgot @inheritdoc on methods
  [feature/auth-refactor] Finish and clean up documentation
  [feature/auth-refactor] Change phpEx to php_ext in new classes
  [feature/auth-refactor] Fix two session tests broken by changes
  [feature/auth-refactor] Removed no longer used variable
  [feature/auth-refactor] Fix errors in acp_board
  [feature/auth-refactor] Fix indentation on acp_board
  [feature/auth-refactor] Refactor auth in acp_board
  [feature/auth-refactor] Don't truncate name then reattach same thing
  [feature/auth-refactor] Remove old auth plugins
  [feature/auth-refactor] Remove references to old auth plugins
  [feature/auth-refactor] Fix auth tests to use mock objects correctly
  [feature/auth-refactor] Test validate_session on provider_apache
  [feature/auth-refactor] Test autologin() on provider_apache
  [feature/auth-refactor] Test login() for provider_apache
  [feature/auth-refactor] Test for init on provider_apache
  ...
This commit is contained in:
David King
2013-07-03 12:46:18 -04:00
parent 8ce7d36f70 f9672e9b45
commit 73c289ae49
18 changed files with 1508 additions and 1006 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
tests/auth/fixtures/user.xml Normal file
View File

@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="UTF-8" ?>
<dataset>
<table name="phpbb_users">
<column>user_id</column>
<column>username</column>
<column>username_clean</column>
<column>user_password</column>
<column>user_passchg</column>
<column>user_pass_convert</column>
<column>user_email</column>
<column>user_type</column>
<column>user_login_attempts</column>
<column>user_permissions</column>
<column>user_sig</column>
<column>user_occ</column>
<column>user_interests</column>
<row>
<value>1</value>
<value>foobar</value>
<value>foobar</value>
<value>$H$9E45lK6J8nLTSm9oJE5aNCSTFK9wqa/</value>
<value>0</value>
<value>0</value>
<value>example@example.com</value>
<value>0</value>
<value>0</value>
<value></value>
<value></value>
<value></value>
<value></value>
</row>
</table>
</dataset>

206
tests/auth/provider_apache_test.php Normal file
View File

@@ -0,0 +1,206 @@
<?php
/**
*
* @package testing
* @copyright (c) 2013 phpBB Group
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
*
*/
require_once dirname(__FILE__).'/../../phpBB/includes/functions.php';
class phpbb_auth_provider_apache_test extends phpbb_database_test_case
{
protected $provider;
protected $user;
protected $request;
protected function setup()
{
parent::setUp();
global $phpbb_root_path, $phpEx;
$db = $this->new_dbal();
$config = new phpbb_config(array());
$this->request = $this->getMock('phpbb_request');
$this->user = $this->getMock('phpbb_user');
$this->provider = new phpbb_auth_provider_apache($db, $config, $this->request, $this->user, $phpbb_root_path, $phpEx);
}
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/user.xml');
}
/**
* Test to see if a user is identified to Apache. Expects false if they are.
*/
public function test_init()
{
$this->user->data['username'] = 'foobar';
$this->request->expects($this->once())
->method('is_set')
->with('PHP_AUTH_USER',
phpbb_request_interface::SERVER)
->will($this->returnValue(true));
$this->request->expects($this->once())
->method('server')
->with('PHP_AUTH_USER')
->will($this->returnValue('foobar'));
$this->assertFalse($this->provider->init());
}
public function test_login()
{
$username = 'foobar';
$password = 'example';
$this->request->expects($this->once())
->method('is_set')
->with('PHP_AUTH_USER',
phpbb_request_interface::SERVER)
->will($this->returnValue(true));
$this->request->expects($this->at(1))
->method('server')
->with('PHP_AUTH_USER')
->will($this->returnValue('foobar'));
$this->request->expects($this->at(2))
->method('server')
->with('PHP_AUTH_PW')
->will($this->returnValue('example'));
$expected = array(
'status' => LOGIN_SUCCESS,
'error_msg' => false,
'user_row' => array(
'user_id' => '1',
'username' => 'foobar',
'user_password' => '$H$9E45lK6J8nLTSm9oJE5aNCSTFK9wqa/',
'user_passchg' => '0',
'user_email' => 'example@example.com',
'user_type' => '0',
),
);
$this->assertEquals($expected, $this->provider->login($username, $password));
}
public function test_autologin()
{
$this->request->expects($this->once())
->method('is_set')
->with('PHP_AUTH_USER',
phpbb_request_interface::SERVER)
->will($this->returnValue(true));
$this->request->expects($this->at(1))
->method('server')
->with('PHP_AUTH_USER')
->will($this->returnValue('foobar'));
$this->request->expects($this->at(2))
->method('server')
->with('PHP_AUTH_PW')
->will($this->returnValue('example'));
$expected = array(
'user_id' => '1',
'user_type' => '0',
'group_id' => '3',
'user_permissions' => '',
'user_perm_from' => '0',
'user_ip' => '',
'user_regdate' => '0',
'username' => 'foobar',
'username_clean' => 'foobar',
'user_password' => '$H$9E45lK6J8nLTSm9oJE5aNCSTFK9wqa/',
'user_passchg' => '0',
'user_pass_convert' => '0',
'user_email' => 'example@example.com',
'user_email_hash' => '0',
'user_birthday' => '',
'user_lastvisit' => '0',
'user_lastmark' => '0',
'user_lastpost_time' => '0',
'user_lastpage' => '',
'user_last_confirm_key' => '',
'user_last_search' => '0',
'user_warnings' => '0',
'user_last_warning' => '0',
'user_login_attempts' => '0',
'user_inactive_reason' => '0',
'user_inactive_time' => '0',
'user_posts' => '0',
'user_lang' => '',
'user_timezone' => 'UTC',
'user_dateformat' => 'd M Y H:i',
'user_style' => '0',
'user_rank' => '0',
'user_colour' => '',
'user_new_privmsg' => '0',
'user_unread_privmsg' => '0',
'user_last_privmsg' => '0',
'user_message_rules' => '0',
'user_full_folder' => '-3',
'user_emailtime' => '0',
'user_topic_show_days' => '0',
'user_topic_sortby_type' => 't',
'user_topic_sortby_dir' => 'd',
'user_post_show_days' => '0',
'user_post_sortby_type' => 't',
'user_post_sortby_dir' => 'a',
'user_notify' => '0',
'user_notify_pm' => '1',
'user_notify_type' => '0',
'user_allow_pm' => '1',
'user_allow_viewonline' => '1',
'user_allow_viewemail' => '1',
'user_allow_massemail' => '1',
'user_options' => '230271',
'user_avatar' => '',
'user_avatar_type' => '',
'user_avatar_width' => '0',
'user_avatar_height' => '0',
'user_sig' => '',
'user_sig_bbcode_uid' => '',
'user_sig_bbcode_bitfield' => '',
'user_from' => '',
'user_icq' => '',
'user_aim' => '',
'user_yim' => '',
'user_msnm' => '',
'user_jabber' => '',
'user_website' => '',
'user_occ' => '',
'user_interests' => '',
'user_actkey' => '',
'user_newpasswd' => '',
'user_form_salt' => '',
'user_new' => '1',
'user_reminded' => '0',
'user_reminded_time' => '0',
);
$this->assertEquals($expected, $this->provider->autologin());
}
public function test_validate_session()
{
$user = array(
'username' => 'foobar',
'user_type'
);
$this->request->expects($this->once())
->method('is_set')
->with('PHP_AUTH_USER',
phpbb_request_interface::SERVER)
->will($this->returnValue(true));
$this->request->expects($this->once())
->method('server')
->with('PHP_AUTH_USER')
->will($this->returnValue('foobar'));
$this->assertTrue($this->provider->validate_session($user));
}
}

50
tests/auth/provider_db_test.php Normal file
View File

@@ -0,0 +1,50 @@
<?php
/**
*
* @package testing
* @copyright (c) 2013 phpBB Group
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
*
*/
require_once dirname(__FILE__).'/../../phpBB/includes/functions.php';
class phpbb_auth_provider_db_test extends phpbb_database_test_case
{
public function getDataSet()
{
return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/user.xml');
}
public function test_login()
{
global $phpbb_root_path, $phpEx;
$db = $this->new_dbal();
$config = new phpbb_config(array(
'ip_login_limit_max' => 0,
'ip_login_limit_use_forwarded' => 0,
'max_login_attempts' => 0,
));
$request = $this->getMock('phpbb_request');
$user = $this->getMock('phpbb_user');
$provider = new phpbb_auth_provider_db($db, $config, $request, $user, $phpbb_root_path, $phpEx);
$expected = array(
'status' => LOGIN_SUCCESS,
'error_msg' => false,
'user_row' => array(
'user_id' => '1',
'username' => 'foobar',
'user_password' => '$H$9E45lK6J8nLTSm9oJE5aNCSTFK9wqa/',
'user_passchg' => '0',
'user_pass_convert' => '0',
'user_email' => 'example@example.com',
'user_type' => '0',
'user_login_attempts' => '0',
),
);
$this->assertEquals($expected, $provider->login('foobar', 'example'));
}
}

13
tests/session/continue_test.php
View File

@@ -53,7 +53,20 @@ class phpbb_session_continue_test extends phpbb_database_test_case
*/
public function test_session_begin_valid_session($session_id, $user_id, $user_agent, $ip, $expected_sessions, $expected_cookies, $message)
{
global $phpbb_container, $phpbb_root_path, $phpEx;
$db = $this->new_dbal();
$config = new phpbb_config(array());
$request = $this->getMock('phpbb_request');
$user = $this->getMock('phpbb_user');
$auth_provider = new phpbb_auth_provider_db($db, $config, $request, $user, $phpbb_root_path, $phpEx);
$phpbb_container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
$phpbb_container->expects($this->any())
->method('get')
->with('auth.provider.db')
->will($this->returnValue($auth_provider));
$session_factory = new phpbb_session_testable_factory;
$session_factory->set_cookies(array(
'_sid' => $session_id,

13
tests/session/creation_test.php
View File

@@ -20,7 +20,20 @@ class phpbb_session_creation_test extends phpbb_database_test_case
public function test_login_session_create()
{
global $phpbb_container, $phpbb_root_path, $phpEx;
$db = $this->new_dbal();
$config = new phpbb_config(array());
$request = $this->getMock('phpbb_request');
$user = $this->getMock('phpbb_user');
$auth_provider = new phpbb_auth_provider_db($db, $config, $request, $user, $phpbb_root_path, $phpEx);
$phpbb_container = $this->getMock('Symfony\Component\DependencyInjection\ContainerInterface');
$phpbb_container->expects($this->any())
->method('get')
->with('auth.provider.db')
->will($this->returnValue($auth_provider));
$session_factory = new phpbb_session_testable_factory;
$session = $session_factory->get_session($db);