deon/phpldapadmin
1
0
Fork 0
Code Issues 36 Pull Requests Packages Projects Releases Wiki Activity

Improve getLogin() for multiple method logins and fix anonymous logout

Browse Source
This commit is contained in:
Deon George 2009-07-25 20:14:36 +10:00
parent 869b9be7e9
commit dc3e477778
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/ds.php
View File

@ -144,9 +144,6 @@ abstract class DS {
* If this returns '', we are logged in with anonymous * If this returns '', we are logged in with anonymous
*/ */
public function getLogin($method=null) { public function getLogin($method=null) {
if ($method == 'anon')
return '';
$method = $this->getMethod($method); $method = $this->getMethod($method);
switch ($this->getAuthType()) { switch ($this->getAuthType()) {
@ -237,15 +234,15 @@ abstract class DS {
$method = $this->getMethod($method); $method = $this->getMethod($method);
if (isset($CACHE[$this->index]) && ! is_null($CACHE)) if (isset($CACHE[$this->index][$method]) && ! is_null($CACHE[$this->index][$method]))
return $CACHE[$this->index]; return $CACHE[$this->index][$method];
$CACHE[$this->index] = null; $CACHE[$this->index][$method] = null;
# For some authentication types, we need to do the login here # For some authentication types, we need to do the login here
switch ($this->getAuthType()) { switch ($this->getAuthType()) {
case 'config': case 'config':
if (! $CACHE[$this->index] = $this->login($this->getLogin($method),$this->getPassword($method),$method)) if (! $CACHE[$this->index][$method] = $this->login($this->getLogin($method),$this->getPassword($method),$method))
system_message(array( system_message(array(
'title'=>_('Unable to login.'), 'title'=>_('Unable to login.'),
'body'=>_('Your configuration file has authentication set to CONFIG based authentication, however, the userid/password failed to login'), 'body'=>_('Your configuration file has authentication set to CONFIG based authentication, however, the userid/password failed to login'),
@ -258,7 +255,7 @@ abstract class DS {
if (! isset($_SERVER['PHP_AUTH_USER'])) { if (! isset($_SERVER['PHP_AUTH_USER'])) {
# If this server is not in focus, skip the basic auth prompt. # If this server is not in focus, skip the basic auth prompt.
if (get_request('server_id','REQUEST') != $this->getIndex()) { if (get_request('server_id','REQUEST') != $this->getIndex()) {
$CACHE[$this->index] = false; $CACHE[$this->index][$method] = false;
break; break;
} }
@ -276,7 +273,7 @@ abstract class DS {
'body'=>_('Your configuration file has authentication set to HTTP based authentication, however, there was none presented'), 'body'=>_('Your configuration file has authentication set to HTTP based authentication, however, there was none presented'),
'type'=>'error')); 'type'=>'error'));
$CACHE[$this->index] = false; $CACHE[$this->index][$method] = false;
} }
# Check our auth vars are valid. # Check our auth vars are valid.
@ -287,24 +284,24 @@ abstract class DS {
'body'=>_('Your HTTP based authentication is not accepted by the LDAP server'), 'body'=>_('Your HTTP based authentication is not accepted by the LDAP server'),
'type'=>'error')); 'type'=>'error'));
$CACHE[$this->index] = false; $CACHE[$this->index][$method] = false;
} else } else
$CACHE[$this->index] = true; $CACHE[$this->index][$method] = true;
} }
break; break;
case 'proxy': case 'proxy':
$CACHE[$this->index] = $this->login($this->getValue('login','bind_id'),$this->getValue('login','bind_pass'),$method); $CACHE[$this->index][$method] = $this->login($this->getValue('login','bind_id'),$this->getValue('login','bind_pass'),$method);
break; break;
default: default:
$CACHE[$this->index] = is_null($this->getLogin($method)) ? false : true; $CACHE[$this->index][$method] = is_null($this->getLogin($method)) ? false : true;
} }
return $CACHE[$this->index]; return $CACHE[$this->index][$method];
} }
/** /**