Fix personal setting for apps which are not whitelisted

sharidas · sharidas · commit fe9ab199930b · 2019-10-09T15:39:22.000+05:30
When apps are not whitelisted for guest user
they should not be visible in the personal settings.

Signed-off-by: Sujith H &lt;sharidasan@owncloud.com&gt;
diff --git a/lib/private/App/AppManager.php b/lib/private/App/AppManager.php
@@ -160,9 +160,20 @@ public function getInstalledApps() {
 	 */
 	public function getEnabledAppsForUser(IUser $user = null) {
 		$apps = $this->getInstalledAppsValues();
-		$appsForUser = \array_filter($apps, function ($enabled) use ($user) {
-			return $this->checkAppForUser($enabled, $user);
-		});
+		$whiteListedAppsForGuest = [];
+		if ($user === null && $this->userSession !== null) {
+			$user = $this->userSession->getUser();
+		}
+		$userAppAttributes = $user->getExtendedAttributes();
+		/**
+		 * Check if the user is guest user, if so get the apps which it is allowed for.
+		 */
+		if (\array_key_exists('guests', $userAppAttributes)) {
+			$whiteListedAppsForGuest = $userAppAttributes['guests']['whiteListedApps'];
+		}
+		$appsForUser = \array_filter($apps, function ($enabled, $appName) use ($user, $whiteListedAppsForGuest) {
+			return $this->checkAppForUser($enabled, $user, $appName, $whiteListedAppsForGuest);
+		}, ARRAY_FILTER_USE_BOTH);
 		return \array_keys($appsForUser);
 	}
 
@@ -182,7 +193,15 @@ public function isEnabledForUser($appId, $user = null) {
 		}
 		$installedApps = $this->getInstalledAppsValues();
 		if (isset($installedApps[$appId])) {
-			return $this->checkAppForUser($installedApps[$appId], $user);
+			$whiteListedApps = [];
+			/**
+			 * Check if the user is guest user, if so get the apps which it is allowed for.
+			 */
+			$userAppAttributes = $user->getExtendedAttributes();
+			if (\array_key_exists('guests', $userAppAttributes)) {
+				$whiteListedApps = $userAppAttributes['guests']['whiteListedApps'];
+			}
+			return $this->checkAppForUser($installedApps[$appId], $user, $appId, $whiteListedApps);
 		} else {
 			return false;
 		}
@@ -191,9 +210,14 @@ public function isEnabledForUser($appId, $user = null) {
 	/**
 	 * @param string $enabled
 	 * @param IUser $user
+	 * @param string|null $appName
+	 * @param array $whiteListedAppsForGuest
 	 * @return bool
 	 */
-	private function checkAppForUser($enabled, $user) {
+	private function checkAppForUser($enabled, $user, $appName = null, $whiteListedAppsForGuest = []) {
+		if (\count($whiteListedAppsForGuest) > 0 && !\in_array($appName, $whiteListedAppsForGuest)) {
+			return false;
+		}
 		if ($enabled === 'yes') {
 			return true;
 		} elseif ($user === null) {
diff --git a/lib/private/User/User.php b/lib/private/User/User.php
@@ -555,4 +555,21 @@ public function setSearchTerms(array $terms) {
 	public function getAccountId() {
 		return $this->account->getId();
 	}
+
+	/**
+	 * get the attributes of user for apps
+	 *
+	 * @return array
+	 * @since 10.3.1
+	 */
+	public function getExtendedAttributes() {
+		if ($this->eventDispatcher === null) {
+			$this->eventDispatcher = \OC::$server->getEventDispatcher();
+		}
+
+		$event = new GenericEvent('appAttributesForUser', []);
+		$this->eventDispatcher->dispatch('getAppAttributesForUser', $event);
+
+		return $event->getArguments();
+	}
 }
diff --git a/lib/public/IUser.php b/lib/public/IUser.php
@@ -238,4 +238,13 @@ public function setSearchTerms(array $terms);
 	 * @since 10.0.1
 	 */
 	public function getSearchTerms();
+
+	/**
+	 * Get attributes of user for apps
+	 * The attributes are of the form key => value map
+	 *
+	 * @return array
+	 * @since 10.3.1
+	 */
+	public function getExtendedAttributes();
 }
