Skip to content

[stable28] fix(settings): define a 'heartbeat' route, so SecurityHeaders can handle redirected root - #45955

Merged
AndyScherzinger merged 2 commits into
stable28from
backport/45228/stable28
Jul 10, 2024
Merged

[stable28] fix(settings): define a 'heartbeat' route, so SecurityHeaders can handle redirected root#45955
AndyScherzinger merged 2 commits into
stable28from
backport/45228/stable28

Conversation

@backportbot

Copy link
Copy Markdown

Backport of PR #45228

@skjnldsvskjnldsv mentioned this pull request Jun 20, 2024
6 tasks
@blizzzblizzz mentioned this pull request Jun 21, 2024
@blizzzblizzz mentioned this pull request Jun 25, 2024
@MichaIng

Copy link
Copy Markdown
Member

Is this route actually used in NC28?

The security headers check was migrated in NC29. Previously OC.generateUrl('heartbeat') was used.

@come-nc

Copy link
Copy Markdown
Contributor

Is this route actually used in NC28?

The security headers check was migrated in NC29. Previously OC.generateUrl('heartbeat') was used.

It’s cleaner to have the route in the system since it exists. And if the migration of the check is ever backported we won’t get a bug from it.

@come-nccome-nc added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Jul 8, 2024
@AltahrimAltahrim mentioned this pull request Jul 10, 2024
smokrisand others added 2 commits July 10, 2024 14:38
…dle redirected root
Signed-off-by: Steve Mokris <steve@kosada.com>
Co-authored-by: Kate <26026535+provokateurin@users.noreply.github.com>
Signed-off-by: Côme Chilliet <91878298+come-nc@users.noreply.github.com>
@kesselb
kesselbforce-pushed the backport/45228/stable28 branch from 03d7960 to 82f9c66CompareJuly 10, 2024 12:38
@kesselb

kesselb commented Jul 10, 2024

Copy link
Copy Markdown
Contributor

Pushed b5cf099 to fix the failing test.

The router uses include_once to load route definitions from the apps.

First include_once for apps/files/appinfo/routes.php returns the expected array.

Second include_once returns true, because the file was already included.

To workaround the tests must run in a separate process.

I have no idea why the test is not failing on master.

@kesselb

Copy link
Copy Markdown
Contributor

To workaround the tests must run in a separate process.

That does not seem to work

I have no idea why the test is not failing on master.

The test is not failing on master because the app manager instance is mocked, the app path is null and the routing file not even included: #46416

@kesselb
kesselbforce-pushed the backport/45228/stable28 branch from b5cf099 to 82f9c66CompareJuly 10, 2024 15:45
@AndyScherzinger
AndyScherzinger merged commit e319057 into stable28Jul 10, 2024
@AndyScherzinger
AndyScherzinger deleted the backport/45228/stable28 branch July 10, 2024 20:29
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4. to releaseReady to be released and/or waiting for tests to finishbugfeature: settingsfeedback-requested

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants

@MichaIng@come-nc@kesselb@provokateurin@AndyScherzinger@blizzz@smokris