summaryrefslogtreecommitdiffstats
path: root/settings/Controller
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2018-01-09 11:41:08 +0100
committerMorris Jobke <hey@morrisjobke.de>2018-01-24 13:56:12 +0100
commitabd33bb619113968f442998b2dc1572456c215f9 (patch)
treec6207de1c0e45adfc3e4467ba482ceb166dee4b6 /settings/Controller
parent5520ba3d15b088e9151ffef89f7cd389c470563b (diff)
downloadnextcloud-server-abd33bb619113968f442998b2dc1572456c215f9.tar.gz
nextcloud-server-abd33bb619113968f442998b2dc1572456c215f9.zip
Properly catch InvalidTokenException for better error response
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Diffstat (limited to 'settings/Controller')
-rw-r--r--settings/Controller/AuthSettingsController.php12
1 files changed, 10 insertions, 2 deletions
diff --git a/settings/Controller/AuthSettingsController.php b/settings/Controller/AuthSettingsController.php
index 2f3d78b4d83..6eaa64cfac2 100644
--- a/settings/Controller/AuthSettingsController.php
+++ b/settings/Controller/AuthSettingsController.php
@@ -197,10 +197,18 @@ class AuthSettingsController extends Controller {
*
* @param int $id
* @param array $scope
- * @return array
+ * @return array|JSONResponse
*/
public function update($id, array $scope) {
- $token = $this->tokenProvider->getTokenById((string)$id);
+ try {
+ $token = $this->tokenProvider->getTokenById((string)$id);
+ if ($token->getUID() !== $this->uid) {
+ throw new InvalidTokenException('User mismatch');
+ }
+ } catch (InvalidTokenException $e) {
+ return new JSONResponse([], Http::STATUS_NOT_FOUND);
+ }
+
$token->setScope([
'filesystem' => $scope['filesystem']
]);