--- /dev/null
+<?php
+/**
+ * A Horde_Injector:: based factory for creating Horde_Ldap objects.
+ *
+ * PHP version 5
+ *
+ * @category Horde
+ * @package Core
+ * @author Michael Slusarz <slusarz@horde.org>
+ * @license http://www.fsf.org/copyleft/lgpl.html LGPL
+ * @link http://pear.horde.org/index.php?package=Core
+ */
+
+/**
+ * A Horde_Injector:: based factory for creating Horde_Ldap objects.
+ *
+ * Copyright 2010 The Horde Project (http://www.horde.org/)
+ *
+ * See the enclosed file COPYING for license information (LGPL). If you
+ * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html.
+ *
+ * @category Horde
+ * @package Core
+ * @author Michael Slusarz <slusarz@horde.org>
+ * @license http://www.fsf.org/copyleft/lgpl.html LGPL
+ * @link http://pear.horde.org/index.php?package=Core
+ */
+class Horde_Core_Factory_Ldap
+{
+ /**
+ * Instances.
+ *
+ * @var array
+ */
+ private $_instances = array();
+
+ /**
+ * The injector.
+ *
+ * @var Horde_Injector
+ */
+ private $_injector;
+
+ /**
+ * Constructor.
+ *
+ * @param Horde_Injector $injector The injector to use.
+ */
+ public function __construct(Horde_Injector $injector)
+ {
+ $this->_injector = $injector;
+ }
+
+ /**
+ * Return the LDAP instance.
+ *
+ * @param string $app The application.
+ * @param string $type The type.
+ *
+ * @return Horde_Ldap The singleton instance.
+ * @throws Horde_Exception
+ * @throws Horde_Ldap_Exception
+ */
+ public function getOb($app = 'horde', $type = null)
+ {
+ $sig = $app . '|' . $type;
+
+ if (isset($this->_instances[$sig])) {
+ return $this->_instances[$sig];
+ }
+
+ $pushed = ($app == 'horde')
+ ? false
+ : $GLOBALS['registry']->pushApp($app);
+
+ $config = $this->getConfig($type);
+
+ /* Determine if we are using the base LDAP config. */
+ if (isset($config['driverconfig']) &&
+ ($config['driverconfig'] == 'horde')) {
+ $this->_instances[$sig] = $this->getOb();
+ return $this->_instances[$sig];
+ }
+
+ try {
+ $this->_instances[$sig] = new Horde_Ldap($config);
+ } catch (Horde_Exception $e) {
+ if ($pushed) {
+ $GLOBALS['registry']->popApp();
+ }
+ throw $e;
+ }
+
+ if ($pushed) {
+ $GLOBALS['registry']->popApp();
+ }
+
+ return $this->_instances[$sig];
+ }
+
+ /**
+ */
+ public function getConfig($type)
+ {
+ return Horde::getDriverConfig($type, 'ldap');
+ }
+
+}
class Horde_SessionHandler_Ldap extends Horde_SessionHandler_Driver
{
/**
- * Handle for the current database connection.
+ * Horde_Ldap object.
*
- * @var resource
+ * @var Horde_Ldap
*/
- protected $_conn;
+ protected $_ldap;
/**
* Constructor.
*
* @param array $params Parameters:
* <pre>
- * 'dn' - (string) The bind DN.
- * 'hostspec' - (string) The hostname of the ldap server.
- * 'password' - (string) The bind password.
- * 'port' - (integer) The port number of the ldap server.
- * 'version' - (integer) [OPTIONAL] TODO
+ * 'dn' - (string) [REQUIRED] TODO
+ * 'ldap' - (Horde_Ldap) [REQUIRED] The Horde_Ldap object.
* </pre>
*
* @throws InvalidArgumentException
*/
public function __construct(array $params = array())
{
- foreach (array('dn', 'hostspec', 'password', 'port') as $val) {
+ foreach (array('dn', 'ldap') as $val) {
if (!isset($params[$val])) {
throw new InvalidArgumentException('Missing ' . $val . ' parameter.');
}
}
+ $this->_ldap = $params['ldap'];
+ unset($params['ldap']);
+
parent::__construct($params);
}
*/
protected function _open($save_path = null, $session_name = null)
{
- $this->_conn = @ldap_connect($this->_params['hostspec'], $this->_params['port']);
-
- // Set protocol version if necessary.
- if (isset($this->_params['version']) &&
- !@ldap_set_option($this->_ds, LDAP_OPT_PROTOCOL_VERSION, $this->_params['version'])) {
- throw new Horde_SessionHandler_Exception(sprintf('Set LDAP protocol version to %d failed: [%d] %s', $this->_params['version'], ldap_errno($conn), ldap_error($conn)));
- }
-
- if (!@ldap_bind($this->_conn, $this->_params['dn'], $this->_params['password'])) {
- throw new Horde_SessionHandler_Exception('Could not bind to LDAP server.');
+ try {
+ $this->_ldap->bind();
+ } catch (Horde_Ldap_Exception $e) {
+ throw new Horde_SessionHandler_Exception($e);
}
}
*/
protected function _close()
{
- if (!@ldap_close($this->_conn) && $this->_logger) {
- $this->_logger->log('Could not unbind from LDAP server.', 'INFO');
- }
+ $this->_ldap->done();
}
/**
*/
protected function _read($id)
{
- $sr = @ldap_search($this->_conn, $this->_params['dn'], "(cn=$id)");
- $info = @ldap_get_entries($this->_conn, $sr);
+ try {
+ $result = $this->_ldap->search(null, "(cn=$id)");
+ if ($result->count()) {
+ $entry = reset();
+ return $entry['session'][0];
+ }
+ } catch (Horde_Ldap_Exception $e) {
+ if ($this->_logger) {
+ $this->_logger->log($e, 'ERR');
+ }
+ }
- return ($info['count'] > 0)
- ? $info[0]['session'][0]
- : '';
+ return '';
}
/**
'session' => $session_data
);
$dn = "cn=$id," . $this->_params['dn'];
- @ldap_delete($this->_conn, $dn);
- return @ldap_add($this->_conn, $dn, $update);
+ $this->_ldap->delete($dn);
+
+ return $this->_ldap->add(Horde_Ldap_Entry::createFresh($dn, $update));
}
/**
{
$dn = "cn=$id," . $this->_params['dn'];
- return @ldap_delete($this->_conn, $dn);
+ return $this->_ldap->delete($dn);
}
/**
*/
public function gc($maxlifetime = 300)
{
- $sr = @ldap_search($this->_conn, $this->_params['dn'],
- '(objectClass=phpsession)', array('+', 'cn'));
- $info = @ldap_get_entries($this->_conn, $sr);
-
- if ($info['count'] > 0) {
- for ($i = 0; $i < $info['count']; ++$i) {
- $id = $info[$i]['cn'][0];
- $dn = "cn=$id," . $this->_params['dn'];
- $ldapstamp = $info[$i]['modifytimestamp'][0];
- $year = substr($ldapstamp, 0, 4);
- $month = substr($ldapstamp, 4, 2);
- $day = substr($ldapstamp, 6, 2);
- $hour = substr($ldapstamp, 8, 2);
- $minute = substr($ldapstamp, 10, 2);
- $modified = gmmktime($hour, $minute, 0, $month, $day, $year);
- if (time() - $modified >= $maxlifetime) {
- @ldap_delete($this->_conn, $dn);
- }
+ $info = $this->_ldap->search(null, '(objectClass=phpsession)', array('attributes' => array('+', 'cn')));
+
+ foreach ($info as $val) {
+ $id = $val['cn'][0];
+ $dn = "cn=$id," . $this->_params['dn'];
+ $ldapstamp = $val['modifytimestamp'][0];
+ $year = substr($ldapstamp, 0, 4);
+ $month = substr($ldapstamp, 4, 2);
+ $day = substr($ldapstamp, 6, 2);
+ $hour = substr($ldapstamp, 8, 2);
+ $minute = substr($ldapstamp, 10, 2);
+ $modified = gmmktime($hour, $minute, 0, $month, $day, $year);
+ if (time() - $modified >= $maxlifetime) {
+ $this->_ldap->delete($dn);
}
}
projects / horde.git / commitdiff