GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

HTTP auth provided is evaluated even if it's not required

This commit is contained in:
Michele 2010-01-17 11:21:07 +01:00 committed by Zach Copley
parent c63832f7bf
commit 05156b708a
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/apiauth.php
View File

@ -79,10 +79,13 @@ class ApiAuthAction extends ApiAction
$this->checkOAuthRequest(); $this->checkOAuthRequest();
} else { } else {
$this->checkBasicAuthUser(); $this->checkBasicAuthUser();
// By default, all basic auth users have read and write access
$this->access = self::READ_WRITE;
} }
} else {
// Check to see if a basic auth user is there even
// if one's not required
$this->checkBasicAuthUser(false);
} }
return true; return true;
@ -198,13 +201,13 @@ class ApiAuthAction extends ApiAction
* @return boolean true or false * @return boolean true or false
*/ */
function checkBasicAuthUser() function checkBasicAuthUser($required = true)
{ {
$this->basicAuthProcessHeader(); $this->basicAuthProcessHeader();
$realm = common_config('site', 'name') . ' API'; $realm = common_config('site', 'name') . ' API';
if (!isset($this->auth_user)) { if (!isset($this->auth_user) && $required) {
header('WWW-Authenticate: Basic realm="' . $realm . '"'); header('WWW-Authenticate: Basic realm="' . $realm . '"');
// show error if the user clicks 'cancel' // show error if the user clicks 'cancel'
@ -212,12 +215,16 @@ class ApiAuthAction extends ApiAction
$this->showBasicAuthError(); $this->showBasicAuthError();
exit; exit;
} else { } else if (isset($this->auth_user)) {
$nickname = $this->auth_user; $nickname = $this->auth_user;
$password = $this->auth_pw; $password = $this->auth_pw;
$user = common_check_user($nickname, $password); $user = common_check_user($nickname, $password);
if (Event::handle('StartSetApiUser', array(&$user))) { if (Event::handle('StartSetApiUser', array(&$user))) {
$this->auth_user = $user; $this->auth_user = $user;
// By default, all basic auth users have read and write access
$this->access = self::READ_WRITE;
Event::handle('EndSetApiUser', array($user)); Event::handle('EndSetApiUser', array($user));
} }