NB-Public/user_saml
14
0
Fork 0
mirror of https://github.com/netzbegruenung/user_saml.git synced 2024-04-30 16:24:52 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #331 from nextcloud/bugfix/283

Browse source 
Catch exception during parameter fetching
This commit is contained in:
Morris Jobke 2019-05-06 16:06:25 +02:00 committed by GitHub
parent 8b5733828e 4856025863
commit ea7e93ec0f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
appinfo/app.php
View file

@ -54,6 +54,8 @@ $userBackend = new \OCA\User_SAML\UserBackend(
$userBackend->registerBackends(\OC::$server->getUserManager()->getBackends());
OC_User::useBackend($userBackend);
$params = [];
// Setting up the one login config may fail, if so, do not catch the requests later.
$returnScript = false;
$type = '';
@ -107,7 +109,11 @@ if(!$cli &&
!$userSession->isLoggedIn() &&
\OC::$server->getRequest()->getPathInfo() === '/login' &&
$type !== '') {
try {
$params = $request->getParams();
} catch (\LogicException $e) {
// ignore exception when PUT is called since getParams cannot parse parameters in that case
}
if (isset($params['direct'])) {
return;
}
@ -136,7 +142,11 @@ $configuredIdps = $samlSettings->getListOfIdps();
$showLoginOptions = $multipleUserBackEnds || count($configuredIdps) > 1;
if ($redirectSituation === true && $showLoginOptions) {
try {
$params = $request->getParams();
} catch (\LogicException $e) {
// ignore exception when PUT is called since getParams cannot parse parameters in that case
}
$redirectUrl = '';
if(isset($params['redirect_url'])) {
$redirectUrl = $params['redirect_url'];
@ -154,7 +164,11 @@ if ($redirectSituation === true && $showLoginOptions) {
}
if($redirectSituation === true) {
try {
$params = $request->getParams();
} catch (\LogicException $e) {
// ignore exception when PUT is called since getParams cannot parse parameters in that case
}
$originalUrl = '';
if(isset($params['redirect_url'])) {
$originalUrl = $urlGenerator->getAbsoluteURL($params['redirect_url']);