blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-20 00:12:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

revert erroneously merged pull request

Browse Source
This commit is contained in:
Harald Bamberger
2024-09-25 11:22:59 +02:00
parent 90931232d9
commit 2fc0827d49
9 changed files with 2114 additions and 499 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/libraries/AuthLib.php
+1 -39
View File
@@ -37,8 +37,7 @@ class AuthLib
// Gets CI instance
$this->_ci =& get_instance();
if ($authenticate === true)
$this->_authenticate(); // if required -> authenticate the current user
if ($authenticate === true) $this->_authenticate(); // if required -> authenticate the current user
}
//------------------------------------------------------------------------------------------------------------------
@@ -362,40 +361,6 @@ class AuthLib
return $bt;
}
/**
* Checks if the user is already authenticated with HTTP basic authentication
* NOTE: this method also display a login, not possible to be avoided due HTTP basic authentication limitations
*/
private function _checkHBAuthentication()
{
$hta = error('Not authenticated', AUTH_NOT_AUTHENTICATED); // by default is NOT authenticated
// Checks if an HTTP basic authentication is active and checks credentials using LDAP
if (!isset($_SERVER['PHP_AUTH_USER']))
{
// If NOT send the header to perform an HTTP basic authentication
header('WWW-Authenticate: Basic realm="'.AUTH_NAME.'"');
}
else // otherwise
{
// NOTE: Username needs to be trimmed and lowered because htaccess is allowing login
$hta = $this->_createAuthObjByPerson(array('uid' => mb_strtolower(trim($_SERVER['PHP_AUTH_USER']))));
}
// Invalid credentials
// NOTE: this is a corner case because of the HTTP basic authentication
if (getCode($hta) == AUTH_NOT_AUTHENTICATED || getCode($hta) == AUTH_INVALID_CREDENTIALS)
{
$this->_showInvalidAuthentication(); // this also stop the execution
}
elseif (isError($hta)) // display error and stop execution
{
$this->_showError(getError($hta));
}
return $hta; // if success then is returned!
}
/**
* Checks if the user is already authenticated with HTTP basic authentication + LDAP
* NOTE: this method also display a login, not possible to be avoided due HTTP basic authentication limitations
@@ -471,9 +436,6 @@ class AuthLib
case AUTH_BT: // Bewerbung tool
$auth = $this->_checkBTAuthentication();
break;
case AUTH_HBA: // HTTP basic authentication
$auth = $this->_checkHBAuthentication();
break;
case AUTH_HBALDAP: // HTTP basic authentication + LDAP
$auth = $this->_checkHBALDAPAuthentication();
break;