diff options
| author | Lukas Reschke <lukas@owncloud.com> | 2015-12-11 14:01:27 +0100 |
|---|---|---|
| committer | Lukas Reschke <lukas@owncloud.com> | 2015-12-11 14:01:27 +0100 |
| commit | 411e4007056b11ec9aa20608dcd0f6f75d7ebf7f (patch) | |
| tree | 1d2a8e98e4d9b3999ab37aa79b8a1ec31624ae01 /lib | |
| parent | 19d15938e331e6a16bd615d5e2c615cb0bb09123 (diff) | |
| parent | 6cdf398a41e1dd7352582e97d85ce6eb8c9cafaf (diff) | |
| download | nextcloud-server-411e4007056b11ec9aa20608dcd0f6f75d7ebf7f.tar.gz nextcloud-server-411e4007056b11ec9aa20608dcd0f6f75d7ebf7f.zip | |
Merge pull request #21127 from owncloud/stable8.2-backport-21119
[stable8.2] Make AppManager->checkAppForUser more robust
Diffstat (limited to 'lib')
| -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 8fb197e73ff..a07b849ce29 100644 --- a/lib/private/app/appmanager.php +++ b/lib/private/app/appmanager.php @@ -140,6 +140,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) { |