diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-12-10 16:44:40 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-12-10 16:44:40 +0100 |
| commit | ab1ea5ccc4fc1d31e98a9fe930be35673fc0a0b3 (patch) | |
| tree | c61a0803421e649184188f4825d3a12200fab311 | |
| parent | 7094ed05adfa435a53d7d6ce0c3b6d32760f5111 (diff) | |
| parent | f5e6c7580487ed853f67c0bee556a79a52ceb1ac (diff) | |
| download | nextcloud-server-ab1ea5ccc4fc1d31e98a9fe930be35673fc0a0b3.tar.gz nextcloud-server-ab1ea5ccc4fc1d31e98a9fe930be35673fc0a0b3.zip | |
Merge pull request #21119 from owncloud/make-appconfig-more-robust
Make AppManager->checkAppForUser more robust
| -rw-r--r-- | lib/private/app/appmanager.php | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/private/app/appmanager.php b/lib/private/app/appmanager.php index f826c8ba0c7..8ae93f98832 100644 --- a/lib/private/app/appmanager.php +++ b/lib/private/app/appmanager.php @@ -148,6 +148,13 @@ class AppManager implements IAppManager { return false; } else { $groupIds = json_decode($enabled); + + if (!is_array($groupIds)) { + $jsonError = json_last_error(); + \OC::$server->getLogger()->warning('AppManger::checkAppForUser - can\'t decode group IDs: ' . print_r($enabled, true) . ' - json error code: ' . $jsonError, ['app' => 'lib']); + return false; + } + $userGroups = $this->groupManager->getUserGroupIds($user); foreach ($userGroups as $groupId) { if (array_search($groupId, $groupIds) !== false) { |