Skip to content

Commit

Permalink
Merge pull request #45228 from smokris/heartbeat-route
Browse files Browse the repository at this point in the history
fix(settings): define a 'heartbeat' route, so SecurityHeaders can handle redirected root
  • Loading branch information
AndyScherzinger authored Jun 18, 2024
2 parents 4e840fb + 5d74445 commit c3354e9
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 5 deletions.
2 changes: 2 additions & 0 deletions core/routes.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@
// Routing
$this->create('core_ajax_update', '/core/ajax/update.php')
->actionInclude('core/ajax/update.php');

$this->create('heartbeat', '/heartbeat')->get();
19 changes: 14 additions & 5 deletions tests/lib/Route/RouterTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@
* @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')
Expand All @@ -34,21 +36,28 @@ function (string $message, array $data) {
$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->createMock(IAppManager::class),
);
}

public function testHeartbeat(): void {
$this->assertEquals('/index.php/heartbeat', $this->router->generate('heartbeat'));
}

public function testGenerateConsecutively(): void {

$this->assertEquals('/index.php/apps/files/', $router->generate('files.view.index'));
$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'));
}
}

0 comments on commit c3354e9

Please sign in to comment.