upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-07 07:43:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 33

Merge pull request #45955 from nextcloud/backport/45228/stable28

Browse source 
[stable28] fix(settings): define a 'heartbeat' route, so SecurityHeaders can handle redirected root
This commit is contained in:
Andy Scherzinger 2024-07-10 22:29:01 +02:00 committed by GitHub
commit e319057a93
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/routes.php
View file

@ -172,3 +172,5 @@ $application->registerRoutes($this, [
// Routing
$this->create('core_ajax_update', '/core/ajax/update.php')
->actionInclude('core/ajax/update.php');
$this->create('heartbeat', '/heartbeat')->get();

19
tests/lib/Route/RouterTest.php
View file

@ -39,7 +39,9 @@ use Test\TestCase;
* @package Test\Route
*/
class RouterTest extends TestCase {
public function testGenerateConsecutively(): void {
private Router $router;
protected function setUp(): void {
parent::setUp();
/** @var LoggerInterface $logger */
$logger = $this->createMock(LoggerInterface::class);
$logger->method('info')
@ -48,20 +50,27 @@ class RouterTest extends TestCase {
$this->fail('Unexpected info log: '.(string)($data['exception'] ?? $message));
}
);
$router = new Router(
$this->router = new Router(
$logger,
$this->createMock(IRequest::class),
$this->createMock(IConfig::class),
$this->createMock(IEventLogger::class),
$this->createMock(ContainerInterface::class),
);
}
$this->assertEquals('/index.php/apps/files/', $router->generate('files.view.index'));
public function testHeartbeat(): void {
$this->assertEquals('/index.php/heartbeat', $this->router->generate('heartbeat'));
}
public function testGenerateConsecutively(): void {
$this->assertEquals('/index.php/apps/files/', $this->router->generate('files.view.index'));
// the OCS route is the prefixed one for the AppFramework - see /ocs/v1.php for routing details
$this->assertEquals('/index.php/ocsapp/apps/dav/api/v1/direct', $router->generate('ocs.dav.direct.getUrl'));
$this->assertEquals('/index.php/ocsapp/apps/dav/api/v1/direct', $this->router->generate('ocs.dav.direct.getUrl'));
// test caching
$this->assertEquals('/index.php/apps/files/', $router->generate('files.view.index'));
$this->assertEquals('/index.php/apps/files/', $this->router->generate('files.view.index'));
}
}