Skip to content

[stable-7] fix: Prevent error page to display arbitrary error messages #1127

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

Draft
backportbot wants to merge 1 commit into
base: stable-7
Choose a base branch
from
Draft

[stable-7] fix: Prevent error page to display arbitrary error messages #1127

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions lib/AppInfo/Application.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
namespace OCA\User_SAML\AppInfo;

use OC\Security\CSRF\CsrfTokenManager;
use OC\User\DisabledUserException;
use OC\User\LoginException;
use OC_User;
use OCA\DAV\Events\SabrePluginAddEvent;
Expand Down Expand Up @@ -128,12 +129,14 @@ public function boot(IBootContext $context): void {
if ($request->getPathInfo() === '/apps/user_saml/saml/error') {
return;
}
/** @psalm-suppress UndefinedClass */
$targetUrl = $urlGenerator->linkToRouteAbsolute(
'user_saml.SAML.genericError',
[
'message' => $e->getMessage()
'reason' => $e instanceof DisabledUserException ? 'userDisabled' : 'authFailed',
]
);
$logger->error('Login failure', ['exception' => $e]);
header('Location: ' . $targetUrl);
exit();
}
Expand All @@ -151,7 +154,7 @@ public function boot(IBootContext $context): void {
$targetUrl = $urlGenerator->linkToRouteAbsolute(
'user_saml.SAML.genericError',
[
'message' => $l10n->t('This user account is disabled, please contact your administrator.')
'reason' => 'userDisabled',
]
);
header('Location: ' . $targetUrl);
Expand Down