Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • perun/perun-proxyidp/v1/simplesamlphp-module-perun
1 result
Show changes
Commits on Source (3)
# [10.18.0](https://gitlab.ics.muni.cz/perun/perun-proxyidp/v1/simplesamlphp-module-perun/compare/v10.17.3...v10.18.0) (2025-05-19)
### Features
* allow to select attr for user_identifiers in ldap ([700e1e4](https://gitlab.ics.muni.cz/perun/perun-proxyidp/v1/simplesamlphp-module-perun/commit/700e1e4d1486f659af9f0517bae7294006db46a7))
## [10.17.3](https://gitlab.ics.muni.cz/perun/perun-proxyidp/v1/simplesamlphp-module-perun/compare/v10.17.2...v10.17.3) (2025-04-09)
......
......@@ -38,6 +38,10 @@ class AdapterLdap extends Adapter
public const PERUN_FACILITY_ID = 'perunFacilityId';
public const LDAP_USER_IDENTIFIERS_ATTR = 'userIdentifiersAttr';
public const LDAP_USER_IDENTIFIERS_DEFAULT_ATTR = 'eduPersonPrincipalNames';
public const CN = 'cn';
public const DESCRIPTION = 'description';
......@@ -64,6 +68,8 @@ class AdapterLdap extends Adapter
private $fallbackAdapter;
private $ldapUserIdentitiesAttr;
public function __construct($configFileName = null)
{
if ($configFileName === null) {
......@@ -80,6 +86,11 @@ class AdapterLdap extends Adapter
$this->connector = new LdapConnector($ldapHostname, $ldapUser, $ldapPassword, $ldapEnableTLS);
$this->fallbackAdapter = new AdapterRpc();
$this->ldapUserIdentitiesAttr = $conf->getString(
self::LDAP_USER_IDENTIFIERS_ATTR,
self::LDAP_USER_IDENTIFIERS_DEFAULT_ATTR
);
}
public function getPerunUser($idpEntityId, $uids)
......@@ -87,7 +98,7 @@ class AdapterLdap extends Adapter
// Build a LDAP query, we are searching for the user who has at least one of the uid
$query = '';
foreach ($uids as $uid) {
$query .= '(eduPersonPrincipalNames=' . $uid . ')';
$query .= '(' . $this->ldapUserIdentitiesAttr . '=' . $uid . ')';
}
if (empty($query)) {
......