AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow use of the user's DN as the group filter substitution

Browse Source
This commit is contained in:
mildis
2020-05-22 05:57:30 +02:00
committed by GitHub
parent a0a7a1eb31
commit 9e1e4ea381
6 changed files with 45 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Core/Ldap/Group.php
View File

@@ -56,7 +56,7 @@ class Group
*/
public function find($query)
{
$this->query->execute($this->getBasDn(), $query, $this->getAttributes());
$this->query->execute($this->getBaseDn(), $query, $this->getAttributes());
$groups = array();
if ($this->query->hasResult()) {
@@ -119,7 +119,7 @@ class Group
* @access public
* @return string
*/
public function getBasDn()
public function getBaseDn()
{
if (! LDAP_GROUP_BASE_DN) {
throw new LogicException('LDAP group base DN empty, check the parameter LDAP_GROUP_BASE_DN');

33
app/Core/Ldap/User.php
View File

@@ -67,7 +67,7 @@ class User
*/
public function find($query)
{
$this->query->execute($this->getBasDn(), $query, $this->getAttributes());
$this->query->execute($this->getBaseDn(), $query, $this->getAttributes());
$user = null;
if ($this->query->hasResult()) {
@@ -85,15 +85,20 @@ class User
*
* @access protected
* @param Entry $entry
* @param string $username
* @return string[]
*/
protected function getGroups(Entry $entry, $username)
protected function getGroups(Entry $entry)
{
$userattr = '';
if ('username' == $this->getGroupUserAttribute()) {
$userattr = $entry->getFirstValue($this->getAttributeUsername());
} else if ('dn' == $this->getGroupUserAttribute()) {
$userattr = $entry->getDn();
}
$groupIds = array();
if (! empty($username) && $this->group !== null && $this->hasGroupUserFilter()) {
$groups = $this->group->find(sprintf($this->getGroupUserFilter(), $username));
if (! empty($userattr) && $this->group !== null && $this->hasGroupUserFilter()) {
$groups = $this->group->find(sprintf($this->getGroupUserFilter(), $userattr));
foreach ($groups as $group) {
$groupIds[] = $group->getExternalId();
@@ -150,12 +155,11 @@ class User
protected function build()
{
$entry = $this->query->getEntries()->getFirstEntry();
$username = $entry->getFirstValue($this->getAttributeUsername());
$groupIds = $this->getGroups($entry, $username);
$groupIds = $this->getGroups($entry);
return new LdapUserProvider(
$entry->getDn(),
$username,
$entry->getFirstValue($this->getAttributeUsername()),
$entry->getFirstValue($this->getAttributeName()),
$entry->getFirstValue($this->getAttributeEmail()),
$this->getRole($groupIds),
@@ -274,6 +278,17 @@ class User
return LDAP_GROUP_USER_FILTER;
}
/**
* Get LDAP Group User attribute
*
* @access public
* @return string
*/
public function getGroupUserAttribute()
{
return LDAP_GROUP_USER_ATTRIBUTE;
}
/**
* Return true if LDAP Group User filter is defined
*
@@ -324,7 +339,7 @@ class User
* @access public
* @return string
*/
public function getBasDn()
public function getBaseDn()
{
if (! LDAP_USER_BASE_DN) {
throw new LogicException('LDAP user base DN empty, check the parameter LDAP_USER_BASE_DN');