Micke/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Workaround Horde shutdown function issue for Horde_Kolab_Session object

Browse source 
Keep authentication session to skip unwanted LDAP connection
This commit is contained in:
Aleksander Machniak (Kolab Systems) 2011-08-04 20:29:18 +02:00
parent 5ce8c1abb4
commit 766e08c2c4
1 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
plugins/kolab_core/rcube_kolab.php
View file

@ -83,13 +83,28 @@ class rcube_kolab
// pass the current IMAP authentication credentials to the Horde auth system // pass the current IMAP authentication credentials to the Horde auth system
self::$horde_auth = Auth::singleton('kolab'); self::$horde_auth = Auth::singleton('kolab');
if (self::$horde_auth->authenticate($_SESSION['username'], array('password' => $pwd), false)) {
if (self::$horde_auth->isAuthenticated() ||
self::$horde_auth->authenticate($_SESSION['username'], array('password' => $pwd), false)
) {
// we could use self::$horde_auth->setAuth() here, but it requires
// the whole bunch of includes and global objects, do it as simple as possible
if (empty($_SESSION['__auth']['credentials'])) {
require_once 'Horde/Secret.php';
$credentials = Secret::write(Secret::getKey('auth'), serialize(array('password' => $pwd)));
}
else {
$credentials = $_SESSION['__auth']['credentials'];
}
$_SESSION['__auth'] = array( $_SESSION['__auth'] = array(
'credentials' => $credentials,
'authenticated' => true, 'authenticated' => true,
'userId' => $_SESSION['username'], 'userId' => $_SESSION['username'],
'timestamp' => time(), 'timestamp' => time(),
'remote_addr' => $_SERVER['REMOTE_ADDR'], 'remote_addr' => $_SERVER['REMOTE_ADDR'],
); );
Auth::setCredential('password', $pwd); Auth::setCredential('password', $pwd);
self::$ready = true; self::$ready = true;
} }
@ -204,13 +219,18 @@ class rcube_kolab
} }
/** /**
* Cleanup session data when done * Handle session data when done
*/ */
public static function shutdown() public static function shutdown()
{ {
// unset auth data from session. no need to store it persistantly if (self::$ready) {
if (isset($_SESSION['__auth'])) // Horde's shutdown function doesn't work with Roundcube session
unset($_SESSION['__auth']); // save Horde_Kolab_Session object in session here
require_once 'Horde/SessionObjects.php';
$session = Horde_SessionObjects::singleton();
$kolab = Horde_Kolab_Session::singleton();
$session->overwrite('kolab_session', $kolab, false);
}
} }
/** /**