From 77dff311c9d18df884ab0f195179291ffce484b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=85kre=20Solberg?= <andreas.solberg@uninett.no>
Date: Mon, 19 Jan 2009 14:28:41 +0000
Subject: [PATCH] Allow ldapsearch for dn with zero entries for some use cases
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@1161 44740490-163a-0410-bde0-09ae8108e29a
---
lib/SimpleSAML/Auth/LDAP.php | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/lib/SimpleSAML/Auth/LDAP.php b/lib/SimpleSAML/Auth/LDAP.php
index fcb9b9c25..4cb0cd38f 100644
--- a/lib/SimpleSAML/Auth/LDAP.php
+++ b/lib/SimpleSAML/Auth/LDAP.php
@@ -24,6 +24,9 @@ class SimpleSAML_Auth_LDAP {
SimpleSAML_Logger::debug('Library - LDAP __construct(): Setup LDAP with host [' . $hostname . '] and tls [' . var_export($enable_tls, true) . ']');
$this->ldap = @ldap_connect($hostname);
+# ldap_set_option($this->ldap, LDAP_OPT_NETWORK_TIMEOUT, 2);
+ ldap_set_option($this->ldap, LDAP_OPT_TIMELIMIT, 2);
+
if (empty($this->ldap))
throw new Exception('Error initializing LDAP connection with PHP LDAP library.');
@@ -49,8 +52,11 @@ class SimpleSAML_Auth_LDAP {
/**
* Search for a DN. You specify an attribute name and an attribute value
* and the function will return the DN of the result of the search.
+ *
+ * @param $allowZeroHits Default is false. If set to true it will return NULL instead
+ * of throwing an exception if no results was found.
*/
- public function searchfordn($searchbase, $searchattr, $searchvalue) {
+ public function searchfordn($searchbase, $searchattr, $searchvalue, $allowZeroHits = FALSE) {
// Search for ePPN
$search = $this->generateSearchFilter($searchattr, $searchvalue);
@@ -88,9 +94,15 @@ class SimpleSAML_Auth_LDAP {
if (@ldap_count_entries($this->ldap, $search_result) > 1 )
throw new Exception("Found multiple entries in LDAP search: " . $search . ' base(s): ' . $searchbase);
- if (@ldap_count_entries($this->ldap, $search_result) == 0)
- throw new Exception('LDAP search returned zero entries: ' . $search . ' base(s): ' . $searchbase);
-
+
+ if (@ldap_count_entries($this->ldap, $search_result) == 0) {
+ if ($allowZeroHits) {
+ return NULL;
+ } else {
+ throw new Exception('LDAP search returned zero entries: ' . $search . ' base: ' . $searchbase);
+ }
+ }
+
// Authenticate user and fetch attributes
$entry = ldap_first_entry($this->ldap, $search_result);
--
GitLab