nik/davical
1
0
Fork 0
mirror of https://gitlab.com/davical-project/davical.git synced 2026-05-28 03:04:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix handling of active flag for general external authentication mechanisms.

Browse Source
This commit is contained in:
Andrew McMillan 2011-11-01 17:47:06 +13:00
parent a1f9288224
commit fc0db0e23b
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
inc/HTTPAuthSession.php
View File

@ -139,6 +139,11 @@ class HTTPAuthSession {
*/ */
if ( isset($_SERVER['PHP_AUTH_USER']) ) { if ( isset($_SERVER['PHP_AUTH_USER']) ) {
if ( $p = $this->CheckPassword( $_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW'] ) ) { if ( $p = $this->CheckPassword( $_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW'] ) ) {
if ( isset($p->active) && !isset($p->user_active) ) {
trace_bug('Some authentication failed to return a dav_principal record and needs fixing.');
$p->user_active = $p->active;
}
/** /**
* Maybe some external authentication didn't return false for an inactive * Maybe some external authentication didn't return false for an inactive
* user, so we'll be pedantic here. * user, so we'll be pedantic here.
@ -300,7 +305,11 @@ class HTTPAuthSession {
* It can expect that: * It can expect that:
* - Configuration data will be in $c->authenticate_hook['config'], which might be an array, or whatever is needed. * - Configuration data will be in $c->authenticate_hook['config'], which might be an array, or whatever is needed.
*/ */
return call_user_func( $c->authenticate_hook['call'], $username, $password ); $principal = call_user_func( $c->authenticate_hook['call'], $username, $password );
if ( $principal !== false && !($principal instanceof Principal) ) {
$principal = new Principal('username', $username);
}
return $principal;
} }
return false; return false;