mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-03-14 20:19:47 +01:00
Code Issues Projects Releases Wiki Activity

Allow LDAP field mapping using application configuration file

Browse Source
This commit is contained in:
Lucas Bartholemy 2018-03-16 20:13:41 +01:00
parent d59b8c92c2
commit d557fe1f25
1 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
protected/humhub/modules/user/authclient/ZendLdapClient.php
View File

@ -1,20 +1,21 @@
<?php
/**
* @link http://www.yiiframework.com/
* @copyright Copyright (c) 2008 Yii Software LLC
* @license http://www.yiiframework.com/license/
* @link https://www.humhub.org/
* @copyright Copyright (c) 2018 HumHub GmbH & Co. KG
* @license https://www.humhub.com/licences
*/
namespace humhub\modules\user\authclient;
use humhub\modules\user\libs\LdapHelper;
use humhub\modules\user\models\ProfileField;
use humhub\modules\user\models\User;
use Yii;
use yii\helpers\ArrayHelper;
use Zend\Ldap\Exception\LdapException;
use Zend\Ldap\Ldap;
use Zend\Ldap\Node;
use Zend\Ldap\Exception\LdapException;
use humhub\modules\user\models\User;
use humhub\modules\user\models\ProfileField;
use humhub\modules\user\libs\LdapHelper;
/**
* LDAP Authentication
@ -60,7 +61,7 @@ class ZendLdapClient extends BaseFormAuth implements interfaces\AutoSyncUsers, i
/**
* Automatically refresh user profiles on cron run
*
*
* @var boolean|null
*/
public $autoRefreshUsers = null;
@ -71,7 +72,7 @@ class ZendLdapClient extends BaseFormAuth implements interfaces\AutoSyncUsers, i
public $byPassApproval = true;
/**
* @var array of attributes which are synced with the user table
* @var array of attributes which are synced with the user table
*/
public $syncUserTableAttributes = ['username', 'email'];
@ -118,7 +119,7 @@ class ZendLdapClient extends BaseFormAuth implements interfaces\AutoSyncUsers, i
}
if ($this->autoRefreshUsers === null) {
$this->autoRefreshUsers = (boolean) Yii::$app->getModule('user')->settings->get('auth.ldap.refreshUsers');
$this->autoRefreshUsers = (boolean)Yii::$app->getModule('user')->settings->get('auth.ldap.refreshUsers');
}
}
@ -156,7 +157,7 @@ class ZendLdapClient extends BaseFormAuth implements interfaces\AutoSyncUsers, i
/**
* Find user based on ldap attributes
*
*
* @inheritdoc
* @see interfaces\PrimaryClient
* @return User the user
@ -179,7 +180,7 @@ class ZendLdapClient extends BaseFormAuth implements interfaces\AutoSyncUsers, i
/**
* Try to find the user if authclient_id mapping is not set yet (legency)
* or idAttribute is not specified.
*
*
* @return type
*/
protected function getUserAuto()
@ -445,7 +446,7 @@ class ZendLdapClient extends BaseFormAuth implements interfaces\AutoSyncUsers, i
/**
* Checks if LDAP is supported
*
*
* @deprecated since version 1.2.3
* @return boolean is LDAP supported (drivers, modules)
*/
@ -454,4 +455,16 @@ class ZendLdapClient extends BaseFormAuth implements interfaces\AutoSyncUsers, i
return LdapHelper::isLdapAvailable();
}
/**
* @param array $normalizeUserAttributeMap normalize user attribute map.
*/
public function setNormalizeUserAttributeMap($normalizeUserAttributeMap)
{
// This method is called if an additional attribute mapping is specifed in the configuration file
// So automatically merge HumHub auto mapping with the given one
$this->init(); // defaultNormalizeAttributeMap is available after init
parent::setNormalizeUserAttributeMap(ArrayHelper::merge($this->defaultNormalizeUserAttributeMap(), $normalizeUserAttributeMap));
}
}