Skip to content

Fix issue #571: adhere to authsource referrals-setting #587

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thijskh merged 4 commits into from
Aug 3, 2017
Merged

Fix issue #571: adhere to authsource referrals-setting #587

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9b57e55
Adhere to authsource referals-setting
tvdijen Mar 30, 2017
ac2fb66
referals=referrals
tvdijen Mar 30, 2017
a5144f6
Merge branch 'master' into patch-4
tvdijen Jul 28, 2017
24f3dc7
Fix bc-incompatible default value
tvdijen Aug 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion modules/ldap/lib/Auth/Process/BaseFilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,9 @@ public function __construct(&$config, $reserved)
if (isset($authsource['debug'])) {
$authconfig['ldap.debug'] = $authsource['debug'];
}
if (isset($authsource['referrals'])) {
$authconfig['ldap.referrals'] = $authsource['referrals'];
}
// only set when search.enabled = true
if (isset($authsource['search.enable']) && $authsource['search.enable']) {
if (isset($authsource['search.base'])) {
Expand Down Expand Up @@ -262,6 +265,7 @@ protected function getLdap()
$port = $this->config->getInteger('ldap.port', 389);
$enable_tls = $this->config->getBoolean('ldap.enable_tls', false);
$debug = $this->config->getBoolean('ldap.debug', false);
$referrals = $this->config->getBoolean('ldap.referrals', true);
$timeout = $this->config->getInteger('ldap.timeout', 0);
$username = $this->config->getString('ldap.username', null);
$password = $this->config->getString('ldap.password', null);
Expand All @@ -273,13 +277,14 @@ protected function getLdap()
' Port: ' . $port .
' Enable TLS: ' . ($enable_tls ? 'Yes' : 'No') .
' Debug: ' . ($debug ? 'Yes' : 'No') .
' Referrals: ' . ($referrals ? 'Yes' : 'No') .
' Timeout: ' . $timeout .
' Username: ' . $username .
' Password: ' . str_repeat('*', strlen($password))
);

// Connect to the LDAP server to be queried during processing
$this->ldap = new SimpleSAML_Auth_LDAP($hostname, $enable_tls, $debug, $timeout, $port);
$this->ldap = new SimpleSAML_Auth_LDAP($hostname, $enable_tls, $debug, $timeout, $port, $referrals);
$this->ldap->bind($username, $password);

// All done
Expand Down