From: Gunnar Wrobel Date: Thu, 23 Sep 2010 19:49:43 +0000 (+0200) Subject: Largely revert 549a1a57841717f032d1d95e86d10679297356e1 - "Added the Interfaces package." X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=fc2d8ef0b26a4eef81bee2bbb406fd179496fc54;p=horde.git Largely revert 549a1a57841717f032d1d95e86d10679297356e1 - "Added the Interfaces package." This now follows Jan suggestion to simply provide the user name as a string. Much simpler :) --- diff --git a/framework/Core/lib/Horde/Core/Factory/KolabSession.php b/framework/Core/lib/Horde/Core/Factory/KolabSession.php index d0ed899ba..a8306e9a2 100644 --- a/framework/Core/lib/Horde/Core/Factory/KolabSession.php +++ b/framework/Core/lib/Horde/Core/Factory/KolabSession.php @@ -117,15 +117,16 @@ class Horde_Core_Factory_KolabSession /** * Return the session validation driver. * - * @param Horde_Kolab_Session $session The session to validate. - * @param Horde_Kolab_Session_Auth_Interface $auth The auth handler. + * @param Horde_Kolab_Session $session The session to validate. + * @param mixed $auth The user ID or false if no user is + * logged in. * * @return Horde_Kolab_Session_Valid_Interface The driver for validating * sessions. */ public function getSessionValidator( Horde_Kolab_Session $session, - Horde_Kolab_Session_Auth_Interface $auth + $auth ) { $configuration = $this->_injector->getInstance('Horde_Kolab_Session_Configuration'); @@ -154,7 +155,7 @@ class Horde_Core_Factory_KolabSession ) { return $this->getSessionValidator( $session, - $this->_injector->getInstance('Horde_Kolab_Session_Auth_Interface') + $this->_injector->getInstance('Horde_Registry')->getAuth() )->isValid(); } diff --git a/framework/Core/lib/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php index 2cb25e5eb..c41ef868a 100644 --- a/framework/Core/lib/Horde/Registry.php +++ b/framework/Core/lib/Horde/Registry.php @@ -17,7 +17,6 @@ * @package Core */ class Horde_Registry -implements Horde_Interfaces_Registry_Auth { /* Session flags. */ const SESSION_NONE = 1; diff --git a/framework/Core/package.xml b/framework/Core/package.xml index 20ba995a1..b757f2598 100644 --- a/framework/Core/package.xml +++ b/framework/Core/package.xml @@ -307,10 +307,6 @@ Application Framework. pear.horde.org - Interfaces - pear.horde.org - - Injector pear.horde.org diff --git a/framework/Interfaces/lib/Horde/Interfaces/Registry/Auth.php b/framework/Interfaces/lib/Horde/Interfaces/Registry/Auth.php deleted file mode 100644 index 7ff0b6289..000000000 --- a/framework/Interfaces/lib/Horde/Interfaces/Registry/Auth.php +++ /dev/null @@ -1,47 +0,0 @@ - - * @license http://www.fsf.org/copyleft/lgpl.html LGPL - * @link http://pear.horde.org/index.php?package=Interfaces - */ - -/** - * Defines a provider of authentication information. - * - * Copyright 2009-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 Interfaces - * @author Gunnar Wrobel - * @license http://www.fsf.org/copyleft/lgpl.html LGPL - * @link http://pear.horde.org/index.php?package=Interfaces - */ -interface Horde_Interfaces_Registry_Auth -{ - /** - * Returns the currently logged in user, if there is one. - * - * @param string $format The return format, defaults to the unique Horde - * ID. Alternative formats: - * - bare: Horde ID without any domain information - * (e.g., foo@example.com would be returned as - * 'foo'). - * - domain: Domain of the Horde ID (e.g., - * foo@example.com would be returned as - * 'example.com'). - * - original: The username used to originally login - * to Horde. - * - * @return mixed The user ID or false if no user is logged in. - */ - public function getAuth($format = null); -} diff --git a/framework/Interfaces/package.xml b/framework/Interfaces/package.xml deleted file mode 100644 index 7e639ad97..000000000 --- a/framework/Interfaces/package.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - Interfaces - pear.horde.org - A collection of Horde specific interfaces. - This package provides the interfaces that are required for the communication between framework packages and the core application infrastructure of Horde. The main provider of implementations found in this package will be the Horde Core framework package. - - - Gunnar Wrobel - wrobel - p@rdus.de - yes - - - Chuck Hagenbuch - chuck - chuck@horde.org - yes - - - Jan Schneider - jan - jan@horde.org - yes - - 2009-03-02 - - 0.0.1 - 0.0.1 - - - alpha - alpha - - LGPL - - * Initial package. - - - - - - - - - - - - - - - - - - 4.3.0 - - - 1.4.0b1 - - - - - - - - - - - diff --git a/framework/Kolab_Session/lib/Horde/Kolab/Session.php b/framework/Kolab_Session/lib/Horde/Kolab/Session.php index c5b9952af..70c3f9c64 100644 --- a/framework/Kolab_Session/lib/Horde/Kolab/Session.php +++ b/framework/Kolab_Session/lib/Horde/Kolab/Session.php @@ -18,9 +18,9 @@ * information in the Kolab session handler as reading this data is expensive * and it is sufficient to read it once per session. * - * The users account id needs to be provided from the outside via an instance of - * Horde_Interfaces_Registry_Auth::. Any additional Kolab user data relevant for - * the user session should be accessed via the Horde_Kolab_Session class. + * The users account id needs to be provided from the outside. Any + * additional Kolab user data relevant for the user session should be + * accessed via the Horde_Kolab_Session class. * * Copyright 2008-2010 The Horde Project (http://www.horde.org/) * diff --git a/framework/Kolab_Session/lib/Horde/Kolab/Session/Auth/Mock.php b/framework/Kolab_Session/lib/Horde/Kolab/Session/Auth/Mock.php deleted file mode 100644 index 861731171..000000000 --- a/framework/Kolab_Session/lib/Horde/Kolab/Session/Auth/Mock.php +++ /dev/null @@ -1,87 +0,0 @@ - - * @license http://www.fsf.org/copyleft/lgpl.html LGPL - * @link http://pear.horde.org/index.php?package=Kolab_Session - */ - -/** - * Mock authentication for the Kolab session information. - * - * Copyright 2009-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 Kolab - * @package Kolab_Session - * @author Gunnar Wrobel - * @license http://www.fsf.org/copyleft/lgpl.html LGPL - * @link http://pear.horde.org/index.php?package=Kolab_Session - */ -class Horde_Kolab_Session_Auth_Mock -implements Horde_Interfaces_Registry_Auth -{ - /** - * The user this instance will report. - * - * @var string - */ - private $_user; - - /** - * Constructor - * - * @param string $user The user this instance should report. - */ - public function __construct($user) - { - $this->_user = $user; - } - - /** - * Returns the currently logged in user, if there is one. - * - * @param string $format The return format, defaults to the unique Horde - * ID. Alternative formats: - * - bare: Horde ID without any domain information - * (e.g., foo@example.com would be returned as - * 'foo'). - * - domain: Domain of the Horde ID (e.g., - * foo@example.com would be returned as - * 'example.com'). - * - original: The username used to originally login - * to Horde. - * - * @return mixed The user ID or false if no user is logged in. - */ - public function getAuth($format = null) - { - if (empty($this->_user)) { - return false; - } - - $user = $this->_user; - - switch ($format) { - case 'bare': - return (($pos = strpos($user, '@')) === false) - ? $user - : substr($user, 0, $pos); - - case 'domain': - return (($pos = strpos($user, '@')) === false) - ? false - : substr($user, $pos + 1); - - default: - return $user; - } - } -} diff --git a/framework/Kolab_Session/lib/Horde/Kolab/Session/Valid/Base.php b/framework/Kolab_Session/lib/Horde/Kolab/Session/Valid/Base.php index c251dca03..10feaa048 100644 --- a/framework/Kolab_Session/lib/Horde/Kolab/Session/Valid/Base.php +++ b/framework/Kolab_Session/lib/Horde/Kolab/Session/Valid/Base.php @@ -38,20 +38,20 @@ implements Horde_Kolab_Session_Valid_Interface /** * Provides authentication information for this object. * - * @var Horde_Interfaces_Registry_Auth + * @var mixed The user ID or false if no user is logged in. */ private $_auth; /** * Constructor. * - * @param Horde_Kolab_Session $session The session that should be - * validated. - * @param Horde_Interfaces_Registry_Auth $auth The authentication handler. + * @param Horde_Kolab_Session $session The session that should be validated. + * @param mixed $auth The user ID or false if no user is + * logged in. */ public function __construct( Horde_Kolab_Session $session, - Horde_Interfaces_Registry_Auth $auth + $auth ) { $this->_session = $session; $this->_auth = $auth; @@ -69,7 +69,7 @@ implements Horde_Kolab_Session_Valid_Interface public function isValid($user = null) { $mail = $this->_session->getMail(); - if ($this->_auth->getAuth() != $mail) { + if ($this->_auth != $mail) { return false; } if (empty($user)) { @@ -95,8 +95,7 @@ implements Horde_Kolab_Session_Valid_Interface /** * Return the auth driver of this validator. * - * @return Horde_Interfaces_Registry_Auth The auth driver set for this - * validator. + * @return mixed The user ID or false if no user is logged in. */ public function getAuth() { diff --git a/framework/Kolab_Session/lib/Horde/Kolab/Session/Valid/Decorator/Logged.php b/framework/Kolab_Session/lib/Horde/Kolab/Session/Valid/Decorator/Logged.php index 0b5e8f00a..08a1971af 100644 --- a/framework/Kolab_Session/lib/Horde/Kolab/Session/Valid/Decorator/Logged.php +++ b/framework/Kolab_Session/lib/Horde/Kolab/Session/Valid/Decorator/Logged.php @@ -76,7 +76,7 @@ implements Horde_Kolab_Session_Valid_Interface sprintf( "Invalid Kolab session for current user \"%s\", requested" . " user \"%s\" and stored user \"%s\".", - $this->_valid->getAuth()->getAuth(), + $this->_valid->getAuth(), $user, $this->_valid->getSession()->getMail() ) @@ -99,8 +99,7 @@ implements Horde_Kolab_Session_Valid_Interface /** * Return the auth driver of this validator. * - * @return Horde_Interfaces_Registry_Auth The auth driver set for this - * validator. + * @return mixed The user ID or false if no user is logged in. */ public function getAuth() { diff --git a/framework/Kolab_Session/lib/Horde/Kolab/Session/Valid/Interface.php b/framework/Kolab_Session/lib/Horde/Kolab/Session/Valid/Interface.php index 0bbd02b03..8c2d6d7fc 100644 --- a/framework/Kolab_Session/lib/Horde/Kolab/Session/Valid/Interface.php +++ b/framework/Kolab_Session/lib/Horde/Kolab/Session/Valid/Interface.php @@ -49,8 +49,7 @@ interface Horde_Kolab_Session_Valid_Interface /** * Return the auth driver of this validator. * - * @return Horde_Interfaces_Registry_Auth The auth driver set for this - * validator. + * @return mixed The user ID or false if no user is logged in. */ public function getAuth(); } \ No newline at end of file diff --git a/framework/Kolab_Session/package.xml b/framework/Kolab_Session/package.xml index 3c9c258d5..2af01663c 100644 --- a/framework/Kolab_Session/package.xml +++ b/framework/Kolab_Session/package.xml @@ -47,9 +47,6 @@ http://pear.php.net/dtd/package-2.0.xsd"> - - - @@ -84,9 +81,6 @@ http://pear.php.net/dtd/package-2.0.xsd"> - - - @@ -125,10 +119,6 @@ http://pear.php.net/dtd/package-2.0.xsd"> 1.4.0b1 - Interfaces - pear.horde.org - - Kolab_Server pear.horde.org @@ -151,7 +141,6 @@ http://pear.php.net/dtd/package-2.0.xsd"> - @@ -167,7 +156,6 @@ http://pear.php.net/dtd/package-2.0.xsd"> - diff --git a/framework/Kolab_Session/test/Horde/Kolab/Session/Class/Auth/MockTest.php b/framework/Kolab_Session/test/Horde/Kolab/Session/Class/Auth/MockTest.php deleted file mode 100644 index 31a4f4cb5..000000000 --- a/framework/Kolab_Session/test/Horde/Kolab/Session/Class/Auth/MockTest.php +++ /dev/null @@ -1,40 +0,0 @@ - - * @license http://www.fsf.org/copyleft/lgpl.html LGPL - * @link http://pear.horde.org/index.php?package=Kolab_Session - */ - -/** - * Prepare the test setup. - */ -require_once dirname(__FILE__) . '/../../Autoload.php'; - -/** - * Test the mock auth driver. - * - * Copyright 2009-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 Kolab - * @package Kolab_Session - * @author Gunnar Wrobel - * @license http://www.fsf.org/copyleft/lgpl.html LGPL - * @link http://pear.horde.org/index.php?package=Kolab_Session - */ -class Horde_Kolab_Session_Class_Auth_MockTest extends Horde_Kolab_Session_SessionTestCase -{ - public function testMethodGetcurrentuserHasResultStringTheCurrentUser() - { - $auth = new Horde_Kolab_Session_Auth_Mock('test'); - $this->assertEquals('test', $auth->getAuth()); - } -} \ No newline at end of file diff --git a/framework/Kolab_Session/test/Horde/Kolab/Session/Class/Valid/BaseTest.php b/framework/Kolab_Session/test/Horde/Kolab/Session/Class/Valid/BaseTest.php index 61443e765..33851f945 100644 --- a/framework/Kolab_Session/test/Horde/Kolab/Session/Class/Valid/BaseTest.php +++ b/framework/Kolab_Session/test/Horde/Kolab/Session/Class/Valid/BaseTest.php @@ -34,10 +34,7 @@ class Horde_Kolab_Session_Class_Valid_BaseTest extends Horde_Kolab_Session_Sessi { public function testMethodIsvalidHasResultBooleanTrueIfTheSessionIsNotConnectedAndTheCurrentUserIsAnonymous() { - $auth = $this->getMock('Horde_Interfaces_Registry_Auth'); - $auth->expects($this->once()) - ->method('getAuth') - ->will($this->returnValue('')); + $auth = false; $session = $this->getMock('Horde_Kolab_Session'); $session->expects($this->once()) ->method('getMail') @@ -48,10 +45,7 @@ class Horde_Kolab_Session_Class_Valid_BaseTest extends Horde_Kolab_Session_Sessi public function testMethodIsvalidHasResultBooleanFalseIfTheSessionIsNotConnected() { - $auth = $this->getMock('Horde_Interfaces_Registry_Auth'); - $auth->expects($this->once()) - ->method('getAuth') - ->will($this->returnValue('mail@example.org')); + $auth = 'mail@example.org'; $session = $this->getMock('Horde_Kolab_Session'); $session->expects($this->once()) ->method('getMail') @@ -62,10 +56,7 @@ class Horde_Kolab_Session_Class_Valid_BaseTest extends Horde_Kolab_Session_Sessi public function testMethodIsvalidHasResultBooleanFalseIfTheMailOfTheCurrentUserDoesNotMatchTheCurrentUserOfTheSession() { - $auth = $this->getMock('Horde_Interfaces_Registry_Auth'); - $auth->expects($this->once()) - ->method('getAuth') - ->will($this->returnValue('somebody@example.org')); + $auth = 'somebody@example.org'; $session = $this->getMock('Horde_Kolab_Session'); $session->expects($this->once()) ->method('getMail') @@ -76,10 +67,7 @@ class Horde_Kolab_Session_Class_Valid_BaseTest extends Horde_Kolab_Session_Sessi public function testMethodIsvalidHasResultBooleanTrueIfTheMailOfTheCurrentUserMatchesTheCurrentUserOfTheSessionAndNoNewUserWasSet() { - $auth = $this->getMock('Horde_Interfaces_Registry_Auth'); - $auth->expects($this->once()) - ->method('getAuth') - ->will($this->returnValue('mail@example.org')); + $auth = 'mail@example.org'; $session = $this->getMock('Horde_Kolab_Session'); $session->expects($this->once()) ->method('getMail') @@ -90,10 +78,7 @@ class Horde_Kolab_Session_Class_Valid_BaseTest extends Horde_Kolab_Session_Sessi public function testMethodIsvalidHasResultBooleanFalseIfTheMailOfTheCurrentUserMatchesTheCurrentUserOfTheSessionAndTheNewUserMatchesNeitherTheCurrentUserMailAndUid() { - $auth = $this->getMock('Horde_Interfaces_Registry_Auth'); - $auth->expects($this->once()) - ->method('getAuth') - ->will($this->returnValue('mail@example.org')); + $auth = 'mail@example.org'; $session = $this->getMock('Horde_Kolab_Session'); $session->expects($this->once()) ->method('getMail') @@ -104,10 +89,7 @@ class Horde_Kolab_Session_Class_Valid_BaseTest extends Horde_Kolab_Session_Sessi public function testMethodIsvalidHasResultBooleanTrueIfTheMailOfTheCurrentUserMatchesTheCurrentUserOfTheSessionAndTheNewUserMatchesEitherTheCurrentUserMailAndUid() { - $auth = $this->getMock('Horde_Interfaces_Registry_Auth'); - $auth->expects($this->once()) - ->method('getAuth') - ->will($this->returnValue('mail@example.org')); + $auth = 'mail@example.org'; $session = $this->getMock('Horde_Kolab_Session'); $session->expects($this->once()) ->method('getMail') diff --git a/framework/Kolab_Session/test/Horde/Kolab/Session/Class/Valid/Decorator/LoggedTest.php b/framework/Kolab_Session/test/Horde/Kolab/Session/Class/Valid/Decorator/LoggedTest.php index a7e49d1ea..931e79b86 100644 --- a/framework/Kolab_Session/test/Horde/Kolab/Session/Class/Valid/Decorator/LoggedTest.php +++ b/framework/Kolab_Session/test/Horde/Kolab/Session/Class/Valid/Decorator/LoggedTest.php @@ -42,10 +42,7 @@ extends Horde_Kolab_Session_SessionTestCase public function testMethodIsvalidHasPostconditionThatAnInvalidSessionGetsLogged() { - $auth = $this->getMock('Horde_Interfaces_Registry_Auth'); - $auth->expects($this->exactly(2)) - ->method('getAuth') - ->will($this->returnValue('auth@example.org')); + $auth = 'auth@example.org'; $session = $this->getMock('Horde_Kolab_Session'); $session->expects($this->exactly(2)) ->method('getMail') diff --git a/framework/Kolab_Session/test/Horde/Kolab/Session/Integration/ValidTest.php b/framework/Kolab_Session/test/Horde/Kolab/Session/Integration/ValidTest.php index 1cb7e97b0..0fcbedf8a 100644 --- a/framework/Kolab_Session/test/Horde/Kolab/Session/Integration/ValidTest.php +++ b/framework/Kolab_Session/test/Horde/Kolab/Session/Integration/ValidTest.php @@ -41,10 +41,7 @@ class Horde_Kolab_Session_Integration_ValidTest extends Horde_Kolab_Session_Sess public function testMethodIsvalidHasResultBooleanTrueIfTheSessionIsNotConnectedAndTheCurrentUserIsAnonymous() { - $auth = $this->getMock('Horde_Interfaces_Registry_Auth'); - $auth->expects($this->once()) - ->method('getAuth') - ->will($this->returnValue('')); + $auth = false; $composite = $this->_getMockedComposite(); $session = new Horde_Kolab_Session_Base( $composite, array() @@ -55,10 +52,7 @@ class Horde_Kolab_Session_Integration_ValidTest extends Horde_Kolab_Session_Sess public function testMethodIsvalidHasResultBooleanFalseIfTheSessionIsNotConnected() { - $auth = $this->getMock('Horde_Interfaces_Registry_Auth'); - $auth->expects($this->once()) - ->method('getAuth') - ->will($this->returnValue('mail@example.org')); + $auth = 'mail@example.org'; $composite = $this->_getMockedComposite(); $session = new Horde_Kolab_Session_Base( $composite, array() @@ -69,10 +63,7 @@ class Horde_Kolab_Session_Integration_ValidTest extends Horde_Kolab_Session_Sess public function testMethodIsvalidHasResultBooleanFalseIfTheMailOfTheCurrentUserDoesNotMatchTheCurrentUserOfTheSession() { - $auth = $this->getMock('Horde_Interfaces_Registry_Auth'); - $auth->expects($this->once()) - ->method('getAuth') - ->will($this->returnValue('somebody@example.org')); + $auth = 'somebody@example.org'; $this->user->expects($this->exactly(5)) ->method('getSingle') ->will($this->returnValue('mail@example.org')); @@ -90,10 +81,7 @@ class Horde_Kolab_Session_Integration_ValidTest extends Horde_Kolab_Session_Sess public function testMethodIsvalidHasResultBooleanTrueIfTheMailOfTheCurrentUserMatchesTheCurrentUserOfTheSessionAndNoNewUserWasSet() { - $auth = $this->getMock('Horde_Interfaces_Registry_Auth'); - $auth->expects($this->once()) - ->method('getAuth') - ->will($this->returnValue('mail@example.org')); + $auth = 'mail@example.org'; $this->user->expects($this->exactly(5)) ->method('getSingle') ->will($this->returnValue('mail@example.org')); @@ -111,10 +99,7 @@ class Horde_Kolab_Session_Integration_ValidTest extends Horde_Kolab_Session_Sess public function testMethodIsvalidHasResultBooleanFalseIfTheMailOfTheCurrentUserMatchesTheCurrentUserOfTheSessionAndTheNewUserMatchesNeitherTheCurrentUserMailAndUid() { - $auth = $this->getMock('Horde_Interfaces_Registry_Auth'); - $auth->expects($this->once()) - ->method('getAuth') - ->will($this->returnValue('mail@example.org')); + $auth = 'mail@example.org'; $this->user->expects($this->exactly(5)) ->method('getSingle') ->will($this->returnValue('mail@example.org')); @@ -132,10 +117,7 @@ class Horde_Kolab_Session_Integration_ValidTest extends Horde_Kolab_Session_Sess public function testMethodIsvalidHasResultBooleanTrueIfTheMailOfTheCurrentUserMatchesTheCurrentUserOfTheSessionAndTheNewUserMatchesEitherTheCurrentUserMailAndUid() { - $auth = $this->getMock('Horde_Interfaces_Registry_Auth'); - $auth->expects($this->once()) - ->method('getAuth') - ->will($this->returnValue('mail@example.org')); + $auth = 'mail@example.org'; $this->user->expects($this->exactly(5)) ->method('getSingle') ->will($this->returnValue('mail@example.org')); diff --git a/framework/Kolab_Session/test/Horde/Kolab/Session/SessionTestCase.php b/framework/Kolab_Session/test/Horde/Kolab/Session/SessionTestCase.php index 00ebb2c37..444980299 100644 --- a/framework/Kolab_Session/test/Horde/Kolab/Session/SessionTestCase.php +++ b/framework/Kolab_Session/test/Horde/Kolab/Session/SessionTestCase.php @@ -56,7 +56,7 @@ class Horde_Kolab_Session_SessionTestCase extends PHPUnit_Framework_TestCase protected function setupFactoryMocks() { $this->server = $this->_getMockedComposite(); - $this->session_auth = $this->getMock('Horde_Interfaces_Registry_Auth'); + $this->session_auth = $this->getMock('Horde_Kolab_Session_Auth_Interface'); $this->session_storage = $this->getMock('Horde_Kolab_Session_Storage_Interface'); } } \ No newline at end of file