770fa761b8
When `mod_unique_id` is enabled the ID generated by it will be used for logging. This allows for correlation of the Apache logs and the ownCloud logs. Testplan: - [ ] When `mod_unique_id` is enabled the request ID equals the one generated by `mod_unique_id`. - [ ] When `mod_unique_id` is not available the request ID is a 20 character long random string - [ ] The generated Id is stable over the lifespan of one request Changeset looks a little bit larger since I had to adjust every unit test using the HTTP\Request class for proper DI. Fixes https://github.com/owncloud/core/issues/13366
94 lines
2.3 KiB
PHP
94 lines
2.3 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->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;
|
|
}
|
|
|
|
}
|