makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/oauth] Anonymous user does not depend on user_id in token

Browse source 
PHPBB3-11673
This commit is contained in:
Joseph Warner 2013-07-13 23:00:43 -04:00
parent 3c8187c277
commit 9619a9a16f
1 changed files with 48 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
phpBB/includes/auth/oauth/token_storage.php
View file

@ -86,17 +86,25 @@ class phpbb_auth_oauth_token_storage implements TokenStorageInterface
return $this->token; return $this->token;
} }
$sql = 'SELECT oauth_token FROM ' . $this->auth_provider_oauth_table . $data = array(
$this->db->sql_build_array('SELECT', array( 'user_id' => $this->user->data['user_id'],
'user_id' => $this->user->data['user_id'], 'oauth_provider' => $this->service_name,
'oauth_provider' => $this->service_name, );
));
if ($this->user->data['user_id'] == ANONYMOUS)
{
$data['session_id'] = $this->user->data['session_id'];
}
$sql = 'SELECT oauth_token FROM ' . $this->auth_provider_oauth_table . '
WHERE ' . $this->db->sql_build_array('SELECT', $data);
$result = $this->db->sql_query($sql); $result = $this->db->sql_query($sql);
$row = $this->db->sql_fetchrow($result); $row = $this->db->sql_fetchrow($result);
$this->db->sql_freeresult($result); $this->db->sql_freeresult($result);
if (!$row) if (!$row)
{ {
// TODO: translate
throw new TokenNotFoundException('Token not stored'); throw new TokenNotFoundException('Token not stored');
} }
@ -106,6 +114,7 @@ class phpbb_auth_oauth_token_storage implements TokenStorageInterface
if (!($token instanceof TokenInterface)) if (!($token instanceof TokenInterface))
{ {
$this->clearToken(); $this->clearToken();
// TODO: translate
throw new TokenNotFoundException('Token not stored correctly'); throw new TokenNotFoundException('Token not stored correctly');
} }
@ -120,12 +129,19 @@ class phpbb_auth_oauth_token_storage implements TokenStorageInterface
{ {
$this->cachedToken = $token; $this->cachedToken = $token;
$sql = 'INSERT INTO ' . $this->auth_provider_oauth_table . ' ' . $data = array(
$this->db->sql_build_array('INSERT', array( 'user_id' => $this->user->data['user_id'],
'user_id' => $this->user->data['user_id'], 'oauth_provider' => $this->service_name,
'oauth_provider' => $this->service_name, 'oauth_token' => serialize($token),
'oauth_token' => serialize($token), );
));
if ($this->user->data['user_id'] == ANONYMOUS)
{
$data['session_id'] = $this->user->data['session_id'];
}
$sql = 'INSERT INTO ' . $this->auth_provider_oauth_table . '
WHERE ' . $this->db->sql_build_array('INSERT', $data);
$this->db->sql_query($sql); $this->db->sql_query($sql);
} }
@ -138,11 +154,18 @@ class phpbb_auth_oauth_token_storage implements TokenStorageInterface
return true; return true;
} }
$sql = 'SELECT oauth_token FROM ' . $this->auth_provider_oauth_table . $data = array(
$this->db->sql_build_array('SELECT', array( 'user_id' => $this->user->data['user_id'],
'user_id' => $this->user->data['user_id'], 'oauth_provider' => $this->service_name,
'oauth_provider' => $this->service_name, );
));
if ($this->user->data['user_id'] == ANONYMOUS)
{
$data['session_id'] = $this->user->data['session_id'];
}
$sql = 'SELECT oauth_token FROM ' . $this->auth_provider_oauth_table . '
WHERE ' . $this->db->sql_build_array('SELECT', $data);
$result = $this->db->sql_query($sql); $result = $this->db->sql_query($sql);
$row = $this->db->sql_fetchrow($result); $row = $this->db->sql_fetchrow($result);
$this->db->sql_freeresult($result); $this->db->sql_freeresult($result);
@ -162,8 +185,15 @@ class phpbb_auth_oauth_token_storage implements TokenStorageInterface
{ {
$this->cachedToken = null; $this->cachedToken = null;
$sql = 'DELETE FROM ' . $this->auth_provider_oauth_table . 'WHERE user_id = ' . $this->user->data['user_id'] . $sql = 'DELETE FROM ' . $this->auth_provider_oauth_table . '
' AND oauth_provider = ' . $this->db->sql_escape($this->oauth_provider); WHERE user_id = ' . $this->user->data['user_id'] . '
AND oauth_provider = ' . $this->db->sql_escape($this->oauth_provider);
if ($this->user->data['user_id'] == ANONYMOUS)
{
$sql .= ' AND session_id = ' . $this->user->data['session_id'];
}
$this->db->sql_query($sql); $this->db->sql_query($sql);
} }
} }