Skip to content

fix: 404 page might display Exception message in production environment #6333

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
merged 2 commits into from
Aug 4, 2022
Merged

fix: 404 page might display Exception message in production environment #6333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d190434
fix: 404 page may display Exception message in production environment
kenjis Aug 2, 2022
8fb0e7e
refactor: remove unused '(null)'
kenjis Aug 2, 2022
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: 1 addition & 1 deletion app/Views/errors/html/error_404.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
<h1>404 - File Not Found</h1>

<p>
<?php if (! empty($message) && $message !== '(null)') : ?>
<?php if (ENVIRONMENT !== 'production') : ?>
<?= nl2br(esc($message)) ?>
<?php else : ?>
Sorry! Cannot seem to find the page you were looking for.
Expand Down
5 changes: 0 additions & 5 deletions phpstan-baseline.neon.dist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,11 +445,6 @@ parameters:
count: 1
path: system/Database/Seeder.php

-
message: "#^Expression on left side of \\?\\? is not nullable\\.$#"
count: 1
path: system/Debug/Exceptions.php

-
message: "#^Property Config\\\\Exceptions\\:\\:\\$sensitiveDataInTrace \\(array\\) in isset\\(\\) is not nullable\\.$#"
count: 1
Expand Down
2 changes: 1 addition & 1 deletion system/Debug/Exceptions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ protected function collectVars(Throwable $exception, int $statusCode): array
'title' => get_class($exception),
'type' => get_class($exception),
'code' => $statusCode,
'message' => $exception->getMessage() ?? '(null)',
'message' => $exception->getMessage(),
'file' => $exception->getFile(),
'line' => $exception->getLine(),
'trace' => $trace,
Expand Down