886bda5f81
This changeset removes the static class `OC_Request` and moves the functions either into `IRequest` which is accessible via `\OC::$server::->getRequest()` or into a separated `TrustedDomainHelper` class for some helper methods which should not be publicly exposed. This changes only internal methods and nothing on the public API. Some public functions in `util.php` have been deprecated though in favour of the new non-static functions. Unfortunately some part of this code uses things like `__DIR__` and thus is not completely unit-testable. Where tests where possible they ahve been added though. Fixes https://github.com/owncloud/core/issues/13976 which was requested in https://github.com/owncloud/core/pull/13973#issuecomment-73492969
95 lines
2.4 KiB
PHP
95 lines
2.4 KiB
PHP
<?php
|
|
/**
|
|
* ownCloud - App Framework
|
|
*
|
|
* This file is licensed under the Affero General Public License version 3 or
|
|
* later. See the COPYING file.
|
|
*
|
|
* @author Thomas Müller <deepdiver@owncloud.com>
|
|
* @copyright Thomas Müller 2014
|
|
*/
|
|
|
|
|
|
namespace OC\AppFramework\Middleware\Security;
|
|
|
|
use OC\AppFramework\Http\Request;
|
|
use OC\AppFramework\Middleware\SessionMiddleware;
|
|
use OC\AppFramework\Utility\ControllerMethodReflector;
|
|
use OCP\AppFramework\Http\Response;
|
|
|
|
|
|
class SessionMiddlewareTest extends \Test\TestCase {
|
|
|
|
/**
|
|
* @var ControllerMethodReflector
|
|
*/
|
|
private $reflector;
|
|
|
|
/**
|
|
* @var Request
|
|
*/
|
|
private $request;
|
|
|
|
protected function setUp() {
|
|
parent::setUp();
|
|
|
|
$this->request = new Request(
|
|
[],
|
|
$this->getMockBuilder('\OCP\Security\ISecureRandom')->getMock(),
|
|
$this->getMock('\OCP\IConfig')
|
|
);
|
|
$this->reflector = new ControllerMethodReflector();
|
|
}
|
|
|
|
/**
|
|
* @UseSession
|
|
*/
|
|
public function testSessionNotClosedOnBeforeController() {
|
|
$session = $this->getSessionMock(0);
|
|
|
|
$this->reflector->reflect($this, __FUNCTION__);
|
|
$middleware = new SessionMiddleware($this->request, $this->reflector, $session);
|
|
$middleware->beforeController($this, __FUNCTION__);
|
|
}
|
|
|
|
/**
|
|
* @UseSession
|
|
*/
|
|
public function testSessionClosedOnAfterController() {
|
|
$session = $this->getSessionMock(1);
|
|
|
|
$this->reflector->reflect($this, __FUNCTION__);
|
|
$middleware = new SessionMiddleware($this->request, $this->reflector, $session);
|
|
$middleware->afterController($this, __FUNCTION__, new Response());
|
|
}
|
|
|
|
public function testSessionClosedOnBeforeController() {
|
|
$session = $this->getSessionMock(1);
|
|
|
|
$this->reflector->reflect($this, __FUNCTION__);
|
|
$middleware = new SessionMiddleware($this->request, $this->reflector, $session);
|
|
$middleware->beforeController($this, __FUNCTION__);
|
|
}
|
|
|
|
public function testSessionNotClosedOnAfterController() {
|
|
$session = $this->getSessionMock(0);
|
|
|
|
$this->reflector->reflect($this, __FUNCTION__);
|
|
$middleware = new SessionMiddleware($this->request, $this->reflector, $session);
|
|
$middleware->afterController($this, __FUNCTION__, new Response());
|
|
}
|
|
|
|
/**
|
|
* @return mixed
|
|
*/
|
|
private function getSessionMock($expectedCloseCount) {
|
|
$session = $this->getMockBuilder('\OC\Session\Memory')
|
|
->disableOriginalConstructor()
|
|
->getMock();
|
|
|
|
$session->expects($this->exactly($expectedCloseCount))
|
|
->method('close');
|
|
return $session;
|
|
}
|
|
|
|
}
|