summaryrefslogtreecommitdiffstats
path: root/lib/private/App
diff options
context:
space:
mode:
authorDaniel Kesselberg <mail@danielkesselberg.de>2019-01-26 22:31:45 +0100
committerDaniel Kesselberg <mail@danielkesselberg.de>2019-01-26 22:31:45 +0100
commitc09ddf6c78cfd29de739d7b639700dab8b15707e (patch)
tree5195114f961f16144946d55d6e94f18f2797259f /lib/private/App
parent996bad61b78b07f241b3b26c0fc98134ea8ab9f7 (diff)
downloadnextcloud-server-c09ddf6c78cfd29de739d7b639700dab8b15707e.tar.gz
nextcloud-server-c09ddf6c78cfd29de739d7b639700dab8b15707e.zip
Check app path for enableAppForGroups
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
Diffstat (limited to 'lib/private/App')
-rw-r--r--lib/private/App/AppManager.php13
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/private/App/AppManager.php b/lib/private/App/AppManager.php
index 94addb2b785..7d4dbbbd34e 100644
--- a/lib/private/App/AppManager.php
+++ b/lib/private/App/AppManager.php
@@ -254,15 +254,16 @@ class AppManager implements IAppManager {
*
* @param string $appId
* @param \OCP\IGroup[] $groups
- * @throws \Exception if app can't be enabled for groups
+ * @throws \InvalidArgumentException if app can't be enabled for groups
+ * @throws AppPathNotFoundException
*/
public function enableAppForGroups($appId, $groups) {
+ // Check if app exists
+ $this->getAppPath($appId);
+
$info = $this->getAppInfo($appId);
- if (!empty($info['types'])) {
- $protectedTypes = array_intersect($this->protectedAppTypes, $info['types']);
- if (!empty($protectedTypes)) {
- throw new \Exception("$appId can't be enabled for groups.");
- }
+ if (!empty($info['types']) && $this->hasProtectedAppType($info['types'])) {
+ throw new \InvalidArgumentException("$appId can't be enabled for groups.");
}
$groupIds = array_map(function ($group) {