banananetwork
/
roundcubemail
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cache LDAP's user_specific search and use vlv for better performance (#1489186)

Browse Source
pull/82/head
Aleksander Machniak 11 years ago
parent 858af70656
commit 5a6c3a169b
2 changed files with 42 additions and 22 deletions
Show Stats Download Patch File Download Diff File

1
CHANGELOG
Unescape Escape View File

@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
- Cache LDAP's user_specific search and use vlv for better performance (#1489186)
- LDAP: auto-detect and use VLV indices for all search operations
- LDAP: additional group configuration options for address books
- LDAP: separated address book implementation from a generic LDAP wrapper class

63
program/lib/Roundcube/rcube_ldap.php
Unescape Escape View File

@ -265,31 +265,46 @@ class rcube_ldap extends rcube_addressbook
$replaces = array('%dn' => '', '%dc' => $dc, '%d' => $d, '%fu' => $fu, '%u' => $u);
// Search for the dn to use to authenticate
if ($this->prop['search_base_dn'] && $this->prop['search_filter']) {
if (!empty($this->prop['search_bind_dn']) && !empty($this->prop['search_bind_pw'])) {
if (!$this->ldap->bind($this->prop['search_bind_dn'], $this->prop['search_bind_pw']))
continue; // bind failed, try neyt host
}
$search_bind_dn = strtr($this->prop['search_bind_dn'], $replaces);
$search_base_dn = strtr($this->prop['search_base_dn'], $replaces);
$search_filter = strtr($this->prop['search_filter'], $replaces);
// Search for the dn to use to authenticate
$this->prop['search_base_dn'] = strtr($this->prop['search_base_dn'], $replaces);
$this->prop['search_filter'] = strtr($this->prop['search_filter'], $replaces);
$this->_debug("S: Search {$this->prop['search_base_dn']} for {$this->prop['search_filter']}");
// TODO: use $this->ldap->search() here
$res = @ldap_search($this->ldap->conn, $this->prop['search_base_dn'], $this->prop['search_filter'], array('uid'));
if ($res) {
if (($entry = ldap_first_entry($this->ldap->conn, $res))
&& ($bind_dn = ldap_get_dn($this->ldap->conn, $entry))
) {
$this->_debug("S: OK. Found $bind_dn");
$dn = ldap_explode_dn($bind_dn, 1);
$replaces['%dn'] = $dn[0];
}
$cache_key = 'DN.' . md5("$host:$search_bind_dn:$search_base_dn:$search_filter:"
.$this->prop['search_bind_pw']);
if ($dn = $this->cache->get($cache_key)) {
$replaces['%dn'] = $dn;
}
else {
$this->_debug("S: ".ldap_error($this->ldap->conn));
$ldap = $this->ldap;
if (!empty($search_bind_dn) && !empty($this->prop['search_bind_pw'])) {
// To protect from "Critical extension is unavailable" error
// we need to use a separate LDAP connection
if (!empty($this->prop['vlv'])) {
$ldap = new rcube_ldap_generic($this->prop);
$ldap->set_debug($this->debug);
$ldap->set_cache($this->cache);
if (!$ldap->connect($host)) {
continue;
}
}
if (!$ldap->bind($search_bind_dn, $this->prop['search_bind_pw'])) {
continue; // bind failed, try next host
}
}
$res = $ldap->search($search_base_dn, $search_filter, 'sub', array('uid'));
if ($res) {
$res->rewind();
$replaces['%dn'] = $res->get_dn();
}
if ($ldap != $this->ldap) {
$ldap->close();
}
}
// DN not found
@ -301,9 +316,13 @@ class rcube_ldap extends rcube_addressbook
'code' => 100, 'type' => 'ldap',
'file' => __FILE__, 'line' => __LINE__,
'message' => "DN not found using LDAP search."), true);
return false;
continue;
}
}
if (!empty($replaces['%dn'])) {
$this->cache->set($cache_key, $replaces['%dn']);
}
}
// Replace the bind_dn and base_dn variables.

Write Preview
Loading…
Cancel
Save