diff options
author | Morris Jobke <hey@morrisjobke.de> | 2019-05-06 17:06:25 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-06 17:06:25 +0300 |
commit | ea7e93ec0f8dc48c5ac5edee0e9405d268abdc9d (patch) | |
tree | 77fd9188444d90a4f11a1064e3b3ac79f3c8db04 /appinfo | |
parent | 8b5733828e5e1c7edfcd841eaafbbb579ddcec4f (diff) | |
parent | 485602586374130ed9d227cf6917536dc9a476e8 (diff) |
Merge pull request #331 from nextcloud/bugfix/283
Catch exception during parameter fetching
Diffstat (limited to 'appinfo')
-rw-r--r-- | appinfo/app.php | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/appinfo/app.php b/appinfo/app.php index 57baa188..e329d9f7 100644 --- a/appinfo/app.php +++ b/appinfo/app.php @@ -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 !== '') { - $params = $request->getParams(); + 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) { - $params = $request->getParams(); + 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) { - $params = $request->getParams(); + 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']); |