wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove OAuthRequest as storage from userauthorization.

Browse Source 
Since we are not really handling a fullblown OAuth request (No signature, nonce, consumer) we should not use this class, rather store the plain param array in the session.
This commit is contained in:
Adrian Lang 2009-03-08 09:28:34 +01:00
parent df7565ddcc
commit 6367def2d8
1 changed files with 74 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

159
actions/userauthorization.php
View File

@ -25,7 +25,7 @@ define('TIMESTAMP_THRESHOLD', 300);
class UserauthorizationAction extends Action class UserauthorizationAction extends Action
{ {
var $error; var $error;
var $req; var $params;
function handle($args) function handle($args)
{ {
@ -35,8 +35,8 @@ class UserauthorizationAction extends Action
# CSRF protection # CSRF protection
$token = $this->trimmed('token'); $token = $this->trimmed('token');
if (!$token || $token != common_session_token()) { if (!$token || $token != common_session_token()) {
$req = $this->getStoredRequest(); $params = $this->getStoredParams();
$this->showForm($req, _('There was a problem with your session token. '. $this->showForm($params, _('There was a problem with your session token. '.
'Try again, please.')); 'Try again, please.'));
return; return;
} }
@ -50,17 +50,13 @@ class UserauthorizationAction extends Action
common_redirect(common_local_url('login')); common_redirect(common_local_url('login'));
return; return;
} }
try { try {
# this must be a new request $this->validateRequest();
$req = $this->getNewRequest(); $this->storeParams($_GET);
if (!$req) { $this->showForm($_GET);
$this->clientError(_('No request found!'));
}
$this->validateRequest($req);
$this->storeRequest($req);
$this->showForm($req);
} catch (OAuthException $e) { } catch (OAuthException $e) {
$this->clearRequest(); $this->clearParams();
$this->clientError($e->getMessage()); $this->clientError($e->getMessage());
return; return;
} }
@ -68,9 +64,9 @@ class UserauthorizationAction extends Action
} }
} }
function showForm($req, $error=null) function showForm($params, $error=null)
{ {
$this->req = $req; $this->params = $params;
$this->error = $error; $this->error = $error;
$this->showPage(); $this->showPage();
} }
@ -90,16 +86,16 @@ class UserauthorizationAction extends Action
function showContent() function showContent()
{ {
$req = $this->req; $params = $this->params;
$nickname = $req->get_parameter('omb_listenee_nickname'); $nickname = $params['omb_listenee_nickname'];
$profile = $req->get_parameter('omb_listenee_profile'); $profile = $params['omb_listenee_profile'];
$license = $req->get_parameter('omb_listenee_license'); $license = $params['omb_listenee_license'];
$fullname = $req->get_parameter('omb_listenee_fullname'); $fullname = $params['omb_listenee_fullname'];
$homepage = $req->get_parameter('omb_listenee_homepage'); $homepage = $params['omb_listenee_homepage'];
$bio = $req->get_parameter('omb_listenee_bio'); $bio = $params['omb_listenee_bio'];
$location = $req->get_parameter('omb_listenee_location'); $location = $params['omb_listenee_location'];
$avatar = $req->get_parameter('omb_listenee_avatar'); $avatar = $params['omb_listenee_avatar'];
$this->elementStart('div', 'profile'); $this->elementStart('div', 'profile');
if ($avatar) { if ($avatar) {
@ -146,56 +142,56 @@ class UserauthorizationAction extends Action
function sendAuthorization() function sendAuthorization()
{ {
$req = $this->getStoredRequest(); $params = $this->getStoredParams();
if (!$req) { if (!$params) {
$this->clientError(_('No authorization request!')); $this->clientError(_('No authorization request!'));
return; return;
} }
$callback = $req->get_parameter('oauth_callback'); $callback = $params['oauth_callback'];
if ($this->arg('accept')) { if ($this->arg('accept')) {
if (!$this->authorizeToken($req)) { if (!$this->authorizeToken($params)) {
$this->clientError(_('Error authorizing token')); $this->clientError(_('Error authorizing token'));
} }
if (!$this->saveRemoteProfile($req)) { if (!$this->saveRemoteProfile($params)) {
$this->clientError(_('Error saving remote profile')); $this->clientError(_('Error saving remote profile'));
} }
if (!$callback) { if (!$callback) {
$this->showAcceptMessage($req->get_parameter('oauth_token')); $this->showAcceptMessage($params['oauth_token']);
} else { } else {
$params = array(); $newparams = array();
$params['oauth_token'] = $req->get_parameter('oauth_token'); $newparams['oauth_token'] = $params['oauth_token'];
$params['omb_version'] = OMB_VERSION_01; $newparams['omb_version'] = OMB_VERSION_01;
$user = User::staticGet('uri', $req->get_parameter('omb_listener')); $user = User::staticGet('uri', $params['omb_listener']);
$profile = $user->getProfile(); $profile = $user->getProfile();
if (!$profile) { if (!$profile) {
common_log_db_error($user, 'SELECT', __FILE__); common_log_db_error($user, 'SELECT', __FILE__);
$this->serverError(_('User without matching profile')); $this->serverError(_('User without matching profile'));
return; return;
} }
$params['omb_listener_nickname'] = $user->nickname; $newparams['omb_listener_nickname'] = $user->nickname;
$params['omb_listener_profile'] = common_local_url('showstream', $newparams['omb_listener_profile'] = common_local_url('showstream',
array('nickname' => $user->nickname)); array('nickname' => $user->nickname));
if (!is_null($profile->fullname)) { if (!is_null($profile->fullname)) {
$params['omb_listener_fullname'] = $profile->fullname; $newparams['omb_listener_fullname'] = $profile->fullname;
} }
if (!is_null($profile->homepage)) { if (!is_null($profile->homepage)) {
$params['omb_listener_homepage'] = $profile->homepage; $newparams['omb_listener_homepage'] = $profile->homepage;
} }
if (!is_null($profile->bio)) { if (!is_null($profile->bio)) {
$params['omb_listener_bio'] = $profile->bio; $newparams['omb_listener_bio'] = $profile->bio;
} }
if (!is_null($profile->location)) { if (!is_null($profile->location)) {
$params['omb_listener_location'] = $profile->location; $newparams['omb_listener_location'] = $profile->location;
} }
$avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE); $avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
if ($avatar) { if ($avatar) {
$params['omb_listener_avatar'] = $avatar->url; $newparams['omb_listener_avatar'] = $avatar->url;
} }
$parts = array(); $parts = array();
foreach ($params as $k => $v) { foreach ($newparams as $k => $v) {
$parts[] = $k . '=' . OAuthUtil::urlencode_rfc3986($v); $parts[] = $k . '=' . OAuthUtil::urlencode_rfc3986($v);
} }
$query_string = implode('&', $parts); $query_string = implode('&', $parts);
@ -213,9 +209,9 @@ class UserauthorizationAction extends Action
} }
} }
function authorizeToken(&$req) function authorizeToken(&$params)
{ {
$token_field = $req->get_parameter('oauth_token'); $token_field = $params['oauth_token'];
$rt = new Token(); $rt = new Token();
$rt->tok = $token_field; $rt->tok = $token_field;
$rt->type = 0; $rt->type = 0;
@ -232,21 +228,21 @@ class UserauthorizationAction extends Action
# XXX: refactor with similar code in finishremotesubscribe.php # XXX: refactor with similar code in finishremotesubscribe.php
function saveRemoteProfile(&$req) function saveRemoteProfile(&$params)
{ {
# FIXME: we should really do this when the consumer comes # FIXME: we should really do this when the consumer comes
# back for an access token. If they never do, we've got stuff in a # back for an access token. If they never do, we've got stuff in a
# weird state. # weird state.
$nickname = $req->get_parameter('omb_listenee_nickname'); $nickname = $params['omb_listenee_nickname'];
$fullname = $req->get_parameter('omb_listenee_fullname'); $fullname = $params['omb_listenee_fullname'];
$profile_url = $req->get_parameter('omb_listenee_profile'); $profile_url = $params['omb_listenee_profile'];
$homepage = $req->get_parameter('omb_listenee_homepage'); $homepage = $params['omb_listenee_homepage'];
$bio = $req->get_parameter('omb_listenee_bio'); $bio = $params['omb_listenee_bio'];
$location = $req->get_parameter('omb_listenee_location'); $location = $params['omb_listenee_location'];
$avatar_url = $req->get_parameter('omb_listenee_avatar'); $avatar_url = $params['omb_listenee_avatar'];
$listenee = $req->get_parameter('omb_listenee'); $listenee = $params['omb_listenee'];
$remote = Remote_profile::staticGet('uri', $listenee); $remote = Remote_profile::staticGet('uri', $listenee);
if ($remote) { if ($remote) {
@ -310,7 +306,7 @@ class UserauthorizationAction extends Action
$sub = new Subscription(); $sub = new Subscription();
$sub->subscriber = $user->id; $sub->subscriber = $user->id;
$sub->subscribed = $remote->id; $sub->subscribed = $remote->id;
$sub->token = $req->get_parameter('oauth_token'); # NOTE: request token, not valid for use! $sub->token = $params['oauth_token']; # NOTE: request token, not valid for use!
$sub->created = DB_DataObject_Cast::dateTime(); # current time $sub->created = DB_DataObject_Cast::dateTime(); # current time
if (!$sub->insert()) { if (!$sub->insert()) {
@ -354,66 +350,59 @@ class UserauthorizationAction extends Action
common_show_footer(); common_show_footer();
} }
function storeRequest($req) function storeParams($params)
{ {
common_ensure_session(); common_ensure_session();
$_SESSION['userauthorizationrequest'] = $req; $_SESSION['userauthorizationparams'] = $params;
} }
function clearRequest() function clearParams()
{ {
common_ensure_session(); common_ensure_session();
unset($_SESSION['userauthorizationrequest']); unset($_SESSION['userauthorizationparams']);
} }
function getStoredRequest() function getStoredParams()
{ {
common_ensure_session(); common_ensure_session();
$req = $_SESSION['userauthorizationrequest']; $params = $_SESSION['userauthorizationparams'];
return $req; return $params;
}
function getNewRequest()
{
common_remove_magic_from_request();
$req = OAuthRequest::from_request();
return $req;
} }
# Throws an OAuthException if anything goes wrong # Throws an OAuthException if anything goes wrong
function validateRequest(&$req) function validateRequest()
{ {
/* Find token. /* Find token.
TODO: If no token is passed the user should get a prompt to enter it TODO: If no token is passed the user should get a prompt to enter it
according to OAuth Core 1.0 */ according to OAuth Core 1.0 */
$t = new Token(); $t = new Token();
$t->tok = $req->get_parameter('oauth_token'); $t->tok = $_GET['oauth_token'];
$t->type = 0; $t->type = 0;
if (!$t->find(true)) { if (!$t->find(true)) {
throw new OAuthException("Invalid request token: " . $req->get_parameter('oauth_token')); throw new OAuthException("Invalid request token: " . $_GET['oauth_token']);
} }
$this->validateOmb($req); $this->validateOmb();
return true; return true;
} }
function validateOmb(&$req) function validateOmb()
{ {
foreach (array('omb_version', 'omb_listener', 'omb_listenee', foreach (array('omb_version', 'omb_listener', 'omb_listenee',
'omb_listenee_profile', 'omb_listenee_nickname', 'omb_listenee_profile', 'omb_listenee_nickname',
'omb_listenee_license') as $param) 'omb_listenee_license') as $param)
{ {
if (is_null($req->get_parameter($param))) { if (!isset($_GET[$param]) || is_null($_GET[$param])) {
throw new OAuthException("Required parameter '$param' not found"); throw new OAuthException("Required parameter '$param' not found");
} }
} }
# Now, OMB stuff # Now, OMB stuff
$version = $req->get_parameter('omb_version'); $version = $_GET['omb_version'];
if ($version != OMB_VERSION_01) { if ($version != OMB_VERSION_01) {
throw new OAuthException("OpenMicroBlogging version '$version' not supported"); throw new OAuthException("OpenMicroBlogging version '$version' not supported");
} }
$listener = $req->get_parameter('omb_listener'); $listener = $_GET['omb_listener'];
$user = User::staticGet('uri', $listener); $user = User::staticGet('uri', $listener);
if (!$user) { if (!$user) {
throw new OAuthException("Listener URI '$listener' not found here"); throw new OAuthException("Listener URI '$listener' not found here");
@ -422,7 +411,7 @@ class UserauthorizationAction extends Action
if ($cur->id != $user->id) { if ($cur->id != $user->id) {
throw new OAuthException("Can't add for another user!"); throw new OAuthException("Can't add for another user!");
} }
$listenee = $req->get_parameter('omb_listenee'); $listenee = $_GET['omb_listenee'];
if (!Validate::uri($listenee) && if (!Validate::uri($listenee) &&
!common_valid_tag($listenee)) { !common_valid_tag($listenee)) {
throw new OAuthException("Listenee URI '$listenee' not a recognizable URI"); throw new OAuthException("Listenee URI '$listenee' not a recognizable URI");
@ -445,13 +434,13 @@ class UserauthorizationAction extends Action
throw new OAuthException("Already subscribed to user!"); throw new OAuthException("Already subscribed to user!");
} }
} }
$nickname = $req->get_parameter('omb_listenee_nickname'); $nickname = $_GET['omb_listenee_nickname'];
if (!Validate::string($nickname, array('min_length' => 1, if (!Validate::string($nickname, array('min_length' => 1,
'max_length' => 64, 'max_length' => 64,
'format' => VALIDATE_NUM . VALIDATE_ALPHA_LOWER))) { 'format' => VALIDATE_NUM . VALIDATE_ALPHA_LOWER))) {
throw new OAuthException('Nickname must have only letters and numbers and no spaces.'); throw new OAuthException('Nickname must have only letters and numbers and no spaces.');
} }
$profile = $req->get_parameter('omb_listenee_profile'); $profile = $_GET['omb_listenee_profile'];
if (!common_valid_http_url($profile)) { if (!common_valid_http_url($profile)) {
throw new OAuthException("Invalid profile URL '$profile'."); throw new OAuthException("Invalid profile URL '$profile'.");
} }
@ -460,7 +449,7 @@ class UserauthorizationAction extends Action
throw new OAuthException("Profile URL '$profile' is for a local user."); throw new OAuthException("Profile URL '$profile' is for a local user.");
} }
$license = $req->get_parameter('omb_listenee_license'); $license = $_GET['omb_listenee_license'];
if (!common_valid_http_url($license)) { if (!common_valid_http_url($license)) {
throw new OAuthException("Invalid license URL '$license'."); throw new OAuthException("Invalid license URL '$license'.");
} }
@ -469,23 +458,23 @@ class UserauthorizationAction extends Action
throw new OAuthException("Listenee stream license '$license' not compatible with site license '$site_license'."); throw new OAuthException("Listenee stream license '$license' not compatible with site license '$site_license'.");
} }
# optional stuff # optional stuff
$fullname = $req->get_parameter('omb_listenee_fullname'); $fullname = $_GET['omb_listenee_fullname'];
if ($fullname && mb_strlen($fullname) > 255) { if ($fullname && mb_strlen($fullname) > 255) {
throw new OAuthException("Full name '$fullname' too long."); throw new OAuthException("Full name '$fullname' too long.");
} }
$homepage = $req->get_parameter('omb_listenee_homepage'); $homepage = $_GET['omb_listenee_homepage'];
if ($homepage && (!common_valid_http_url($homepage) || mb_strlen($homepage) > 255)) { if ($homepage && (!common_valid_http_url($homepage) || mb_strlen($homepage) > 255)) {
throw new OAuthException("Invalid homepage '$homepage'"); throw new OAuthException("Invalid homepage '$homepage'");
} }
$bio = $req->get_parameter('omb_listenee_bio'); $bio = $_GET['omb_listenee_bio'];
if ($bio && mb_strlen($bio) > 140) { if ($bio && mb_strlen($bio) > 140) {
throw new OAuthException("Bio too long '$bio'"); throw new OAuthException("Bio too long '$bio'");
} }
$location = $req->get_parameter('omb_listenee_location'); $location = $_GET['omb_listenee_location'];
if ($location && mb_strlen($location) > 255) { if ($location && mb_strlen($location) > 255) {
throw new OAuthException("Location too long '$location'"); throw new OAuthException("Location too long '$location'");
} }
$avatar = $req->get_parameter('omb_listenee_avatar'); $avatar = $_GET['omb_listenee_avatar'];
if ($avatar) { if ($avatar) {
if (!common_valid_http_url($avatar) || strlen($avatar) > 255) { if (!common_valid_http_url($avatar) || strlen($avatar) > 255) {
throw new OAuthException("Invalid avatar URL '$avatar'"); throw new OAuthException("Invalid avatar URL '$avatar'");
@ -502,7 +491,7 @@ class UserauthorizationAction extends Action
throw new OAuthException("Wrong image type for '$avatar'"); throw new OAuthException("Wrong image type for '$avatar'");
} }
} }
$callback = $req->get_parameter('oauth_callback'); $callback = $_GET['oauth_callback'];
if ($callback && !common_valid_http_url($callback)) { if ($callback && !common_valid_http_url($callback)) {
throw new OAuthException("Invalid callback URL '$callback'"); throw new OAuthException("Invalid callback URL '$callback'");
} }