blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-28 09:29:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Renamed libraries/LDAPLib.php to libraries/AuthLDAPLib.php

Browse Source 
- Removed constants LDAP_NO_USER_DN and LDAP_TOO_MANY_USER_DN from config/constants.php
- Added config entry timeout to config/ldap.php
- Changed private method libraries/AuthLib->_checkLDAPAuthentication
to use libraries/AuthLDAPLib->checkUsernamePassword
- Changed AuthLDAPLib to have only one public method called checkUsernamePassword that makes use of the other private methods to check if a username and password are valid on many LDAP servers
This commit is contained in:
Paolo
2021-06-21 17:03:40 +02:00
parent a3adce8776
commit e1a6a899f6
5 changed files with 323 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/libraries/AuthLib.php
+5 -30
View File
@@ -385,7 +385,7 @@ class AuthLib
// 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
|| getCode($hta) == LDAP_NO_USER_DN || getCode($hta) == LDAP_TOO_MANY_USER_DN)
|| getCode($hta) == AuthLDAPLib::LDAP_NO_USER_DN || getCode($hta) == AuthLDAPLib::LDAP_TOO_MANY_USER_DN)
{
$this->_showInvalidAuthentication(); // this also stop the execution
}
@@ -404,37 +404,12 @@ class AuthLib
{
$ldap = error('Not authenticated', AUTH_NOT_AUTHENTICATED); // by default is NOT authenticated
$this->_ci->load->library('LDAPLib'); // Loads the LDAP library
$this->_ci->load->library('AuthLDAPLib'); // Loads the LDAP library
$ldapConnection = $this->_ci->ldaplib->anonymousConnect(); // connect anonymously!
if (isSuccess($ldapConnection)) // connected!!
// If it is possible to authenticate on LDAP with the given username and password
if ($this->_ci->authldaplib->checkUsernamePassword($username, $password) === true)
{
// Get the user DN from LDAP
$userDN = $this->_ci->ldaplib->getUserDN($username);
if (isSuccess($userDN)) // got it!
{
$this->_ci->ldaplib->close(); // close the previous LDAP anonymous connection
// Connects to LDAP using the last working configuration + the retrieved user DN + the provided password
$ldapConnection = $this->_ci->ldaplib->connectUsernamePassword(getData($userDN), $password);
if (isSuccess($ldapConnection)) // connected!
{
$this->_ci->ldaplib->close(); // close the previous connection
$ldap = success('Authenticated', AUTH_SUCCESS); // authenticated!
}
else // blocking error
{
$ldap = $ldapConnection;
}
}
else // blocking error
{
$ldap = $userDN;
}
}
else // blocking error
{
$ldap = $ldapConnection;
$ldap = success('Authenticated', AUTH_SUCCESS); // authenticated!
}
return $ldap;