Skip to content

fix(settings): define a 'heartbeat' route, so SecurityHeaders can handle redirected root #45228

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AndyScherzinger merged 2 commits into from
Jun 18, 2024
Merged

fix(settings): define a 'heartbeat' route, so SecurityHeaders can handle redirected root #45228

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5ec9d6
fix(settings): define a 'heartbeat' route, so SecurityHeaders can han…
smokris May 7, 2024
5d74445
fix(tests): Strong type property $router in RouterTest
come-nc Jun 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions core/routes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,5 @@
// Routing
$this->create('core_ajax_update', '/core/ajax/update.php')
->actionInclude('core/ajax/update.php');

$this->create('heartbeat', '/heartbeat')->get();
20 changes: 15 additions & 5 deletions tests/lib/Route/RouterTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,10 @@
* @package Test\Route
*/
class RouterTest extends TestCase {
public function testGenerateConsecutively(): void {
/** @var Router */
private $router;
protected function setUp(): void {
parent::setUp();
/** @var LoggerInterface $logger */
$logger = $this->createMock(LoggerInterface::class);
$logger->method('info')
Expand All @@ -49,21 +52,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'));
}
}