Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700

* github-phpbb/develop: (586 commits) [ticket/11735] Display disabled checkbox in subsilver for read notifications [ticket/11735] Display disabled checkbox when notification is already read [ticket/11844] update acp/authentication language var [ticket/11795] Remove PM popup [ticket/11795] Remove outdated comment from forum_fn.js [ticket/11795] Move find user JS to forum_fn [ticket/11795] Replace TWIG with phpBB syntax in ACP [ticket/11795] Move MSN scripts to forum_fn.js [ticket/11795] Use phpBB template syntax instead of TWIG [ticket/11795] Move PM popup JS to forum_fn.js [ticket/11795] Get rid of pagination JS variables [ticket/11795] Get rid of onload_functions [ticket/11795] Use data-reset-on-edit attr to reset elements [ticket/11795] Redo form elements auto-focus [ticket/11811] Remove outline on :focus [ticket/11836] Fix subsilver fatal error [ticket/11837] Replace escaped single quote with utf-8 single quote [ticket/11836] Fix fatal error on unsupported provider for auth link [ticket/11837] Translate UCP_AUTH_LINK_NOT_SUPPORTED [ticket/11809] Ensure code.js is first script included after jQuery ... Conflicts: phpBB/config/services.yml phpBB/develop/create_schema_files.php phpBB/develop/mysql_upgrader.php phpBB/download/file.php phpBB/includes/bbcode.php phpBB/includes/functions_container.php phpBB/install/database_update.php phpBB/install/index.php phpBB/phpbb/controller/helper.php phpBB/phpbb/controller/resolver.php phpBB/phpbb/request/request_interface.php phpBB/phpbb/session.php phpBB/phpbb/style/extension_path_provider.php phpBB/phpbb/style/path_provider.php phpBB/phpbb/style/path_provider_interface.php phpBB/phpbb/style/resource_locator.php phpBB/phpbb/style/style.php phpBB/phpbb/template/locator.php phpBB/phpbb/template/template.php phpBB/phpbb/template/twig/node/includeasset.php phpBB/phpbb/template/twig/node/includecss.php phpBB/phpbb/template/twig/node/includejs.php phpBB/phpbb/template/twig/twig.php tests/controller/helper_url_test.php tests/di/create_container_test.php tests/extension/style_path_provider_test.php tests/notification/notification_test.php tests/session/continue_test.php tests/session/creation_test.php tests/template/template_events_test.php tests/template/template_test_case.php tests/template/template_test_case_with_tree.php tests/test_framework/phpbb_functional_test_case.php
author: Nils Adermann <naderman@naderman.de> 2013-09-16 01:24:05 +0200
committer: Nils Adermann <naderman@naderman.de> 2013-09-16 01:24:05 +0200
commit: 21bbb5850349326464204bdb1bea7ecf5a88c10a (patch)
tree: c2e2ce66583cf94367301fab73e308c9dd8eddb9 /tests/auth
parent: bb395bbc50df53bf2e005d95d45f34c7c8934ff0 (diff)
parent: ae6f37d559a71fb115cdb954452ebab5fb8fc69f (diff)
download: forums-21bbb5850349326464204bdb1bea7ecf5a88c10a.tar
forums-21bbb5850349326464204bdb1bea7ecf5a88c10a.tar.gz
forums-21bbb5850349326464204bdb1bea7ecf5a88c10a.tar.bz2
forums-21bbb5850349326464204bdb1bea7ecf5a88c10a.tar.xz
forums-21bbb5850349326464204bdb1bea7ecf5a88c10a.zip
2 files changed, 217 insertions, 0 deletions
diff --git a/tests/auth/fixtures/oauth_tokens.xml b/tests/auth/fixtures/oauth_tokens.xml
new file mode 100644
index 0000000000..9bfb5a4422
--- /dev/null
+++ b/tests/auth/fixtures/oauth_tokens.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<dataset>
+	<table name="phpbb_oauth_tokens">
+		<column>user_id</column>
+		<column>session_id</column>
+		<column>provider</column>
+		<column>oauth_token</column>
+	</table>
+</dataset>
+
diff --git a/tests/auth/provider_oauth_token_storage_test.php b/tests/auth/provider_oauth_token_storage_test.php
new file mode 100644
index 0000000000..401f049405
--- /dev/null
+++ b/tests/auth/provider_oauth_token_storage_test.php
@@ -0,0 +1,207 @@
+<?php
+/**
+*
+* @package testing
+* @copyright (c) 2013 phpBB Group
+* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
+*
+*/
+
+use OAuth\OAuth2\Token\StdOAuth2Token;
+
+class phpbb_auth_provider_oauth_token_storage_test extends phpbb_database_test_case
+{
+	protected $db;
+	protected $service_name;
+	protected $session_id;
+	protected $token_storage;
+	protected $token_storage_table;
+	protected $user;
+
+	protected function setup()
+	{
+		parent::setUp();
+
+		global $phpbb_root_path, $phpEx;
+
+		$this->db = $this->new_dbal();
+		$this->user = $this->getMock('phpbb_user');
+		$this->service_name = 'auth.provider.oauth.service.testing';
+		$this->token_storage_table = 'phpbb_oauth_tokens';
+
+		// Give the user a session_id that we will remember
+		$this->session_id = '12345';
+		$this->user->data['session_id'] = $this->session_id;
+
+		// Set the user id to anonymous
+		$this->user->data['user_id'] = ANONYMOUS;
+
+		$this->token_storage = new phpbb_auth_provider_oauth_token_storage($this->db, $this->user, $this->token_storage_table);
+	}
+
+	public function getDataSet()
+	{
+		return $this->createXMLDataSet(dirname(__FILE__).'/fixtures/oauth_tokens.xml');
+	}
+
+	public static function retrieveAccessToken_data()
+	{
+		return array(
+			array(new StdOAuth2Token('access', 'refresh', StdOAuth2Token::EOL_NEVER_EXPIRES, array('extra' => 'param')), null),
+			array(null, 'OAuth\Common\Storage\Exception\TokenNotFoundException'),
+		);
+	}
+
+	/**
+	* @dataProvider retrieveAccessToken_data
+	*/
+	public function test_retrieveAccessToken($cache_token, $exception)
+	{
+		if ($cache_token)
+		{
+			$this->token_storage->storeAccessToken($this->service_name, $cache_token);
+			$token = $cache_token;
+		}
+
+		$this->setExpectedException($exception);
+
+		$stored_token = $this->token_storage->retrieveAccessToken($this->service_name);
+		$this->assertEquals($token, $stored_token);
+	}
+
+	public function test_retrieveAccessToken_from_db()
+	{
+		$expected_token = new StdOAuth2Token('access', 'refresh', StdOAuth2Token::EOL_NEVER_EXPIRES);
+
+		// Store a token in the database
+		$temp_storage = new phpbb_auth_provider_oauth_token_storage($this->db, $this->user, $this->token_storage_table);
+		$temp_storage->storeAccessToken($this->service_name, $expected_token);
+		unset($temp_storage);
+
+		// Test to see if the token can be retrieved
+		$stored_token = $this->token_storage->retrieveAccessToken($this->service_name);
+		$this->assertEquals($expected_token, $stored_token);
+	}
+
+	/**
+	* @dataProvider retrieveAccessToken_data
+	*/
+	public function test_retrieve_access_token_by_session($cache_token, $exception)
+	{
+		if ($cache_token)
+		{
+			$this->token_storage->storeAccessToken($this->service_name, $cache_token);
+			$token = $cache_token;
+		}
+
+		$this->setExpectedException($exception);
+
+		$stored_token = $this->token_storage->retrieve_access_token_by_session($this->service_name);
+		$this->assertEquals($token, $stored_token);
+	}
+
+	public function test_retrieve_access_token_by_session_from_db()
+	{
+		$expected_token = new StdOAuth2Token('access', 'refresh', StdOAuth2Token::EOL_NEVER_EXPIRES);
+
+		// Store a token in the database
+		$temp_storage = new phpbb_auth_provider_oauth_token_storage($this->db, $this->user,  $this->token_storage_table);
+		$temp_storage->storeAccessToken($this->service_name, $expected_token);
+		unset($temp_storage);
+
+		// Test to see if the token can be retrieved
+		$stored_token = $this->token_storage->retrieve_access_token_by_session($this->service_name);
+		$this->assertEquals($expected_token, $stored_token);
+	}
+
+	public function test_storeAccessToken()
+	{
+		$token = new StdOAuth2Token('access', 'refresh', StdOAuth2Token::EOL_NEVER_EXPIRES, array('extra' => 'param') );
+		$this->token_storage->storeAccessToken($this->service_name, $token);
+
+		// Confirm that the token is cached
+		$extraParams = $this->token_storage->retrieveAccessToken($this->service_name)->getExtraParams();
+		$this->assertEquals( 'param', $extraParams['extra'] );
+		$this->assertEquals( 'access', $this->token_storage->retrieveAccessToken($this->service_name)->getAccessToken() );
+
+		$row = $this->get_token_row_by_session_id($this->session_id);
+
+		// The token is serialized before stored in the database
+		$this->assertEquals($this->token_storage->json_encode_token($token), $row['oauth_token']);
+	}
+
+	public static function hasAccessToken_data()
+	{
+		return array(
+			array(null, false),
+			array(new StdOAuth2Token('access', 'refresh', StdOAuth2Token::EOL_NEVER_EXPIRES, array('extra' => 'param') ), true),
+		);
+	}
+
+	/**
+	* @dataProvider hasAccessToken_data
+	*/
+	public function test_hasAccessToken($token, $expected)
+	{
+		if ($token)
+		{
+			$this->token_storage->storeAccessToken($this->service_name, $token);
+		}
+
+		$has_access_token = $this->token_storage->hasAccessToken($this->service_name);
+		$this->assertEquals($expected, $has_access_token);
+	}
+
+	/**
+	* @dataProvider hasAccessToken_data
+	*/
+	public function test_has_access_token_by_session($token, $expected)
+	{
+		if ($token)
+		{
+			$this->token_storage->storeAccessToken($this->service_name, $token);
+		}
+
+		$has_access_token = $this->token_storage->has_access_token_by_session($this->service_name);
+		$this->assertEquals($expected, $has_access_token);
+	}
+
+	public function test_clearToken()
+	{
+		$token = new StdOAuth2Token('access', 'refresh', StdOAuth2Token::EOL_NEVER_EXPIRES, array('extra' => 'param') );
+		$this->token_storage->storeAccessToken($this->service_name, $token);
+
+		$this->token_storage->clearToken($this->service_name);
+
+		// Check that the database has been cleared
+		$row = $this->get_token_row_by_session_id($this->session_id);
+		$this->assertFalse($row);
+
+		// Check that the token is no longer in memory
+		$this->assertFalse($this->token_storage->hasAccessToken($this->service_name));
+	}
+
+	public function test_set_user_id()
+	{
+		$token = new StdOAuth2Token('access', 'refresh', StdOAuth2Token::EOL_NEVER_EXPIRES, array('extra' => 'param') );
+		$this->token_storage->storeAccessToken($this->service_name, $token);
+
+		$new_user_id = ANONYMOUS + 1;
+		$this->token_storage->set_user_id($new_user_id);
+
+		$row = $this->get_token_row_by_session_id($this->session_id);
+		$this->assertEquals($new_user_id, $row['user_id']);
+	}
+
+	protected function get_token_row_by_session_id($session_id)
+	{
+		// Test that the token is stored in the database
+		$sql = 'SELECT * FROM phpbb_oauth_tokens 
+			WHERE session_id = \'' . $this->db->sql_escape($session_id) . '\'';
+		$result = $this->db->sql_query($sql);
+		$row = $this->db->sql_fetchrow($result);
+		$this->db->sql_freeresult($result);
+
+		return $row;
+	}
+}
author	Nils Adermann <naderman@naderman.de>	2013-09-16 01:24:05 +0200
committer	Nils Adermann <naderman@naderman.de>	2013-09-16 01:24:05 +0200
commit	21bbb5850349326464204bdb1bea7ecf5a88c10a (patch)
tree	c2e2ce66583cf94367301fab73e308c9dd8eddb9 /tests/auth
parent	bb395bbc50df53bf2e005d95d45f34c7c8934ff0 (diff)
parent	ae6f37d559a71fb115cdb954452ebab5fb8fc69f (diff)
download	forums-21bbb5850349326464204bdb1bea7ecf5a88c10a.tar forums-21bbb5850349326464204bdb1bea7ecf5a88c10a.tar.gz forums-21bbb5850349326464204bdb1bea7ecf5a88c10a.tar.bz2 forums-21bbb5850349326464204bdb1bea7ecf5a88c10a.tar.xz forums-21bbb5850349326464204bdb1bea7ecf5a88c10a.zip