X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=ldapauth%2Fldapauth.php;h=38e2d6a1ec16c4423e4c75a3575ab3b90d608696;hb=410613d7a076de0fa699b66a4db17ae9267d13e7;hp=f99f6eeee88daab5b5d96e1a2716c85a4803e05c;hpb=2365a9ae02f15bab90349cad0721cb068c47eb02;p=friendica-addons.git diff --git a/ldapauth/ldapauth.php b/ldapauth/ldapauth.php index f99f6eee..38e2d6a1 100644 --- a/ldapauth/ldapauth.php +++ b/ldapauth/ldapauth.php @@ -26,39 +26,16 @@ * Note when using with Windows Active Directory: you may need to set TLS_CACERT in your site * ldap.conf file to the signing cert for your LDAP server. * - * The configuration options for this module may be set in the config/addon.config.php file - * e.g.: - * - * [ldapauth] - * ; ldap hostname server - required - * ldap_server = host.example.com - * ; dn to search users - required - * ldap_searchdn = ou=users,dc=example,dc=com - * ; attribute to find username - required - * ldap_userattr = uid - * - * ; admin dn - optional - only if ldap server dont have anonymous access - * ldap_binddn = cn=admin,dc=example,dc=com - * ; admin password - optional - only if ldap server dont have anonymous access - * ldap_bindpw = password - * - * ; for create Friendica account if user exist in ldap - * ; required an email and a simple (beautiful) nickname on user ldap object - * ; active account creation - optional - default none - * ldap_autocreateaccount = true - * ; attribute to get email - optional - default : 'mail' - * ldap_autocreateaccount_emailattribute = mail - * ; attribute to get nickname - optional - default : 'givenName' - * ldap_autocreateaccount_nameattribute = cn - * - * ...etc. + * The configuration options for this module are described in the config/ldapauth.config.php file */ +use Friendica\App; use Friendica\Core\Hook; use Friendica\Core\Logger; +use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\User; -use Friendica\Util\ConfigFileLoader; +use Friendica\Core\Config\Util\ConfigFileManager; function ldapauth_install() { @@ -66,21 +43,18 @@ function ldapauth_install() Hook::register('authenticate', 'addon/ldapauth/ldapauth.php', 'ldapauth_hook_authenticate'); } -function ldapauth_load_config(\Friendica\App $a, ConfigFileLoader $loader) +function ldapauth_load_config(ConfigFileManager $loader) { - $a->getConfigCache()->load($loader->loadAddonConfig('ldapauth')); + DI::app()->getConfigCache()->load($loader->loadAddonConfig('ldapauth'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC); } -function ldapauth_hook_authenticate($a, &$b) +function ldapauth_hook_authenticate(array &$b) { - if (ldapauth_authenticate($b['username'], $b['password'])) { - $results = get_existing_account($b['username']); - if (!empty($results)) { - $b['user_record'] = $results[0]; - $b['authenticated'] = 1; - } + $user = ldapauth_authenticate($b['username'], $b['password']); + if (!empty($user['uid'])) { + $b['user_record'] = User::getById($user['uid']); + $b['authenticated'] = 1; } - return; } function ldapauth_authenticate($username, $password) @@ -95,109 +69,103 @@ function ldapauth_authenticate($username, $password) $ldap_autocreateaccount_emailattribute = DI::config()->get('ldapauth', 'ldap_autocreateaccount_emailattribute'); $ldap_autocreateaccount_nameattribute = DI::config()->get('ldapauth', 'ldap_autocreateaccount_nameattribute'); - if (!(strlen($password) && function_exists('ldap_connect') && strlen($ldap_server))) { - Logger::log("ldapauth: not configured or missing php-ldap module"); + if (!extension_loaded('ldap') || !strlen($ldap_server)) { + Logger::error('Addon not configured or missing php-ldap extension', ['extension_loaded' => extension_loaded('ldap'), 'server' => $ldap_server]); return false; } - $connect = @ldap_connect($ldap_server); + if (!strlen($password)) { + Logger::error('Empty password disallowed', ['provided_password_length' => strlen($password)]); + return false; + } + $connect = @ldap_connect($ldap_server); if ($connect === false) { - Logger::log("ldapauth: could not connect to $ldap_server"); + Logger::warning('Could not connect to LDAP server', ['server' => $ldap_server]); return false; } @ldap_set_option($connect, LDAP_OPT_PROTOCOL_VERSION, 3); @ldap_set_option($connect, LDAP_OPT_REFERRALS, 0); if ((@ldap_bind($connect, $ldap_binddn, $ldap_bindpw)) === false) { - Logger::log("ldapauth: could not bind $ldap_server as $ldap_binddn"); + Logger::warning('Could not bind to LDAP server', ['server' => $ldap_server, 'binddn' => $ldap_binddn, 'errno' => ldap_errno($connect), 'error' => ldap_error($connect)]); return false; } $res = @ldap_search($connect, $ldap_searchdn, $ldap_userattr . '=' . $username); - if (!$res) { - Logger::log("ldapauth: $ldap_userattr=$username,$ldap_searchdn not found"); + Logger::notice('LDAP user not found.', ['searchdn' => $ldap_searchdn, 'userattr' => $ldap_userattr, 'username' => $username, 'errno' => ldap_errno($connect), 'error' => ldap_error($connect)]); return false; } $id = @ldap_first_entry($connect, $res); - if (!$id) { + Logger::notice('Could not retrieve first LDAP entry.', ['searchdn' => $ldap_searchdn, 'userattr' => $ldap_userattr, 'username' => $username, 'errno' => ldap_errno($connect), 'error' => ldap_error($connect)]); return false; } $dn = @ldap_get_dn($connect, $id); - if (!@ldap_bind($connect, $dn, $password)) { + Logger::notice('Could not authenticate LDAP user with provided password', ['errno' => ldap_errno($connect), 'error' => ldap_error($connect)]); + return false; + } + + if (strlen($ldap_group) && @ldap_compare($connect, $ldap_group, 'member', $dn) !== true) { + $errno = @ldap_errno($connect); + if ($errno === 32) { + Logger::notice('LDAP Access Control Group does not exist', ['errno' => $errno, 'error' => ldap_error($connect)]); + } elseif ($errno === 16) { + Logger::notice('LDAP membership attribute does not exist in access control group', ['errno' => $errno, 'error' => ldap_error($connect)]); + } else { + Logger::notice('LDAP user isn\'t part of the authorized group', ['dn' => $dn]); + } + + @ldap_close($connect); return false; } - $emailarray = []; - $namearray = []; - if ($ldap_autocreateaccount == "true") { + if ($ldap_autocreateaccount == 'true' && !DBA::exists('user', ['nickname' => $username])) { if (!strlen($ldap_autocreateaccount_emailattribute)) { - $ldap_autocreateaccount_emailattribute = "mail"; + $ldap_autocreateaccount_emailattribute = 'mail'; } if (!strlen($ldap_autocreateaccount_nameattribute)) { - $ldap_autocreateaccount_nameattribute = "givenName"; + $ldap_autocreateaccount_nameattribute = 'givenName'; } - $emailarray = @ldap_get_values($connect, $id, $ldap_autocreateaccount_emailattribute); - $namearray = @ldap_get_values($connect, $id, $ldap_autocreateaccount_nameattribute); - } + $email_values = @ldap_get_values($connect, $id, $ldap_autocreateaccount_emailattribute); + $name_values = @ldap_get_values($connect, $id, $ldap_autocreateaccount_nameattribute); - if (!strlen($ldap_group)) { - ldap_autocreateaccount($ldap_autocreateaccount, $username, $password, $emailarray[0], $namearray[0]); - return true; + return ldap_createaccount($username, $password, $email_values[0] ?? '', $name_values[0] ?? ''); } - $r = @ldap_compare($connect, $ldap_group, 'member', $dn); - if ($r === -1) { - $err = @ldap_error($connect); - $eno = @ldap_errno($connect); - @ldap_close($connect); - - if ($eno === 32) { - Logger::log("ldapauth: access control group Does Not Exist"); - return false; - } elseif ($eno === 16) { - Logger::log('ldapauth: membership attribute does not exist in access control group'); - return false; - } else { - Logger::log('ldapauth: error: ' . $err); - return false; - } - } elseif ($r === false) { - @ldap_close($connect); + try { + $authentication = User::getAuthenticationInfo($username); + return User::getById($authentication['uid']); + } catch (Exception $e) { + Logger::notice('LDAP authentication error: ' . $e->getMessage()); return false; } - - ldap_autocreateaccount($ldap_autocreateaccount, $username, $password, $emailarray[0], $namearray[0]); - return true; } -function ldap_autocreateaccount($ldap_autocreateaccount, $username, $password, $email, $name) +function ldap_createaccount($username, $password, $email, $name) { - if ($ldap_autocreateaccount == "true") { - $results = get_existing_account($username); - if (empty($results)) { - if (strlen($email) > 0 && strlen($name) > 0) { - $arr = ['username' => $name, 'nickname' => $username, 'email' => $email, 'password' => $password, 'verified' => 1]; - - try { - User::create($arr); - Logger::log("ldapauth: account " . $username . " created"); - } catch (Exception $ex) { - Logger::log("ldapauth: account " . $username . " was not created ! : " . $ex->getMessage()); - } - } else { - Logger::log("ldapauth: unable to create account, no email or nickname found"); - } - } + if (!strlen($email) || !strlen($name)) { + Logger::notice('Could not create local user from LDAP data, no email or nickname provided'); + return false; } -} -function get_existing_account($username) -{ - return q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 AND `verified` = 1 LIMIT 1", $username); + try { + $user = User::create([ + 'username' => $name, + 'nickname' => $username, + 'email' => $email, + 'password' => $password, + 'verified' => 1 + ]); + Logger::info('Local user created from LDAP data', ['username' => $username, 'name' => $name]); + return $user; + } catch (Exception $ex) { + Logger::error('Could not create local user from LDAP data', ['username' => $username, 'exception' => $ex->getMessage()]); + } + + return false; }