nextcloud / server

apps/systemtags/lib/Activity/Listener.php

Indentation +199 added lines, -199 removed lines

@@ -42,224 +42,224 @@
 use OCP\SystemTag\TagNotFoundException;
 
 class Listener {
-	/** @var IGroupManager */
-	protected $groupManager;
-	/** @var IManager */
-	protected $activityManager;
-	/** @var IUserSession */
-	protected $session;
-	/** @var IConfig */
-	protected $config;
-	/** @var \OCP\SystemTag\ISystemTagManager */
-	protected $tagManager;
-	/** @var \OCP\App\IAppManager */
-	protected $appManager;
-	/** @var \OCP\Files\Config\IMountProviderCollection */
-	protected $mountCollection;
-	/** @var \OCP\Files\IRootFolder */
-	protected $rootFolder;
-	/** @var IShareHelper */
-	protected $shareHelper;
+    /** @var IGroupManager */
+    protected $groupManager;
+    /** @var IManager */
+    protected $activityManager;
+    /** @var IUserSession */
+    protected $session;
+    /** @var IConfig */
+    protected $config;
+    /** @var \OCP\SystemTag\ISystemTagManager */
+    protected $tagManager;
+    /** @var \OCP\App\IAppManager */
+    protected $appManager;
+    /** @var \OCP\Files\Config\IMountProviderCollection */
+    protected $mountCollection;
+    /** @var \OCP\Files\IRootFolder */
+    protected $rootFolder;
+    /** @var IShareHelper */
+    protected $shareHelper;
 
-	/**
-	 * Listener constructor.
-	 *
-	 * @param IGroupManager $groupManager
-	 * @param IManager $activityManager
-	 * @param IUserSession $session
-	 * @param IConfig $config
-	 * @param ISystemTagManager $tagManager
-	 * @param IAppManager $appManager
-	 * @param IMountProviderCollection $mountCollection
-	 * @param IRootFolder $rootFolder
-	 * @param IShareHelper $shareHelper
-	 */
-	public function __construct(IGroupManager $groupManager,
-								IManager $activityManager,
-								IUserSession $session,
-								IConfig $config,
-								ISystemTagManager $tagManager,
-								IAppManager $appManager,
-								IMountProviderCollection $mountCollection,
-								IRootFolder $rootFolder,
-								IShareHelper $shareHelper) {
-		$this->groupManager = $groupManager;
-		$this->activityManager = $activityManager;
-		$this->session = $session;
-		$this->config = $config;
-		$this->tagManager = $tagManager;
-		$this->appManager = $appManager;
-		$this->mountCollection = $mountCollection;
-		$this->rootFolder = $rootFolder;
-		$this->shareHelper = $shareHelper;
-	}
+    /**
+     * Listener constructor.
+     *
+     * @param IGroupManager $groupManager
+     * @param IManager $activityManager
+     * @param IUserSession $session
+     * @param IConfig $config
+     * @param ISystemTagManager $tagManager
+     * @param IAppManager $appManager
+     * @param IMountProviderCollection $mountCollection
+     * @param IRootFolder $rootFolder
+     * @param IShareHelper $shareHelper
+     */
+    public function __construct(IGroupManager $groupManager,
+                                IManager $activityManager,
+                                IUserSession $session,
+                                IConfig $config,
+                                ISystemTagManager $tagManager,
+                                IAppManager $appManager,
+                                IMountProviderCollection $mountCollection,
+                                IRootFolder $rootFolder,
+                                IShareHelper $shareHelper) {
+        $this->groupManager = $groupManager;
+        $this->activityManager = $activityManager;
+        $this->session = $session;
+        $this->config = $config;
+        $this->tagManager = $tagManager;
+        $this->appManager = $appManager;
+        $this->mountCollection = $mountCollection;
+        $this->rootFolder = $rootFolder;
+        $this->shareHelper = $shareHelper;
+    }
 
-	/**
-	 * @param ManagerEvent $event
-	 */
-	public function event(ManagerEvent $event) {
-		$actor = $this->session->getUser();
-		if ($actor instanceof IUser) {
-			$actor = $actor->getUID();
-		} else {
-			$actor = '';
-		}
-		$tag = $event->getTag();
+    /**
+     * @param ManagerEvent $event
+     */
+    public function event(ManagerEvent $event) {
+        $actor = $this->session->getUser();
+        if ($actor instanceof IUser) {
+            $actor = $actor->getUID();
+        } else {
+            $actor = '';
+        }
+        $tag = $event->getTag();
 
-		$activity = $this->activityManager->generateEvent();
-		$activity->setApp('systemtags')
-			->setType('systemtags')
-			->setAuthor($actor)
-			->setObject('systemtag', (int)$tag->getId(), $tag->getName());
-		if ($event->getEvent() === ManagerEvent::EVENT_CREATE) {
-			$activity->setSubject(Provider::CREATE_TAG, [
-				$actor,
-				$this->prepareTagAsParameter($event->getTag()),
-			]);
-		} else if ($event->getEvent() === ManagerEvent::EVENT_UPDATE) {
-			$activity->setSubject(Provider::UPDATE_TAG, [
-				$actor,
-				$this->prepareTagAsParameter($event->getTag()),
-				$this->prepareTagAsParameter($event->getTagBefore()),
-			]);
-		} else if ($event->getEvent() === ManagerEvent::EVENT_DELETE) {
-			$activity->setSubject(Provider::DELETE_TAG, [
-				$actor,
-				$this->prepareTagAsParameter($event->getTag()),
-			]);
-		} else {
-			return;
-		}
+        $activity = $this->activityManager->generateEvent();
+        $activity->setApp('systemtags')
+            ->setType('systemtags')
+            ->setAuthor($actor)
+            ->setObject('systemtag', (int)$tag->getId(), $tag->getName());
+        if ($event->getEvent() === ManagerEvent::EVENT_CREATE) {
+            $activity->setSubject(Provider::CREATE_TAG, [
+                $actor,
+                $this->prepareTagAsParameter($event->getTag()),
+            ]);
+        } else if ($event->getEvent() === ManagerEvent::EVENT_UPDATE) {
+            $activity->setSubject(Provider::UPDATE_TAG, [
+                $actor,
+                $this->prepareTagAsParameter($event->getTag()),
+                $this->prepareTagAsParameter($event->getTagBefore()),
+            ]);
+        } else if ($event->getEvent() === ManagerEvent::EVENT_DELETE) {
+            $activity->setSubject(Provider::DELETE_TAG, [
+                $actor,
+                $this->prepareTagAsParameter($event->getTag()),
+            ]);
+        } else {
+            return;
+        }
 
-		$group = $this->groupManager->get('admin');
-		if ($group instanceof IGroup) {
-			foreach ($group->getUsers() as $user) {
-				$activity->setAffectedUser($user->getUID());
-				$this->activityManager->publish($activity);
-			}
-		}
+        $group = $this->groupManager->get('admin');
+        if ($group instanceof IGroup) {
+            foreach ($group->getUsers() as $user) {
+                $activity->setAffectedUser($user->getUID());
+                $this->activityManager->publish($activity);
+            }
+        }
 
 
-		if ($actor !== '' && ($event->getEvent() === ManagerEvent::EVENT_CREATE || $event->getEvent() === ManagerEvent::EVENT_UPDATE)) {
-			$this->updateLastUsedTags($actor, $event->getTag());
-		}
-	}
+        if ($actor !== '' && ($event->getEvent() === ManagerEvent::EVENT_CREATE || $event->getEvent() === ManagerEvent::EVENT_UPDATE)) {
+            $this->updateLastUsedTags($actor, $event->getTag());
+        }
+    }
 
-	/**
-	 * @param MapperEvent $event
-	 */
-	public function mapperEvent(MapperEvent $event) {
-		$tagIds = $event->getTags();
-		if ($event->getObjectType() !== 'files' ||empty($tagIds)
-			|| !in_array($event->getEvent(), [MapperEvent::EVENT_ASSIGN, MapperEvent::EVENT_UNASSIGN])
-			|| !$this->appManager->isInstalled('activity')) {
-			// System tags not for files, no tags, not (un-)assigning or no activity-app enabled (save the energy)
-			return;
-		}
+    /**
+     * @param MapperEvent $event
+     */
+    public function mapperEvent(MapperEvent $event) {
+        $tagIds = $event->getTags();
+        if ($event->getObjectType() !== 'files' ||empty($tagIds)
+            || !in_array($event->getEvent(), [MapperEvent::EVENT_ASSIGN, MapperEvent::EVENT_UNASSIGN])
+            || !$this->appManager->isInstalled('activity')) {
+            // System tags not for files, no tags, not (un-)assigning or no activity-app enabled (save the energy)
+            return;
+        }
 
-		try {
-			$tags = $this->tagManager->getTagsByIds($tagIds);
-		} catch (TagNotFoundException $e) {
-			// User assigned/unassigned a non-existing tag, ignore...
-			return;
-		}
+        try {
+            $tags = $this->tagManager->getTagsByIds($tagIds);
+        } catch (TagNotFoundException $e) {
+            // User assigned/unassigned a non-existing tag, ignore...
+            return;
+        }
 
-		if (empty($tags)) {
-			return;
-		}
+        if (empty($tags)) {
+            return;
+        }
 
-		// Get all mount point owners
-		$cache = $this->mountCollection->getMountCache();
-		$mounts = $cache->getMountsForFileId($event->getObjectId());
-		if (empty($mounts)) {
-			return;
-		}
+        // Get all mount point owners
+        $cache = $this->mountCollection->getMountCache();
+        $mounts = $cache->getMountsForFileId($event->getObjectId());
+        if (empty($mounts)) {
+            return;
+        }
 
-		$users = [];
-		foreach ($mounts as $mount) {
-			$owner = $mount->getUser()->getUID();
-			$ownerFolder = $this->rootFolder->getUserFolder($owner);
-			$nodes = $ownerFolder->getById($event->getObjectId());
-			if (!empty($nodes)) {
-				/** @var Node $node */
-				$node = array_shift($nodes);
-				$al = $this->shareHelper->getPathsForAccessList($node);
-				$users += $al['users'];
-			}
-		}
+        $users = [];
+        foreach ($mounts as $mount) {
+            $owner = $mount->getUser()->getUID();
+            $ownerFolder = $this->rootFolder->getUserFolder($owner);
+            $nodes = $ownerFolder->getById($event->getObjectId());
+            if (!empty($nodes)) {
+                /** @var Node $node */
+                $node = array_shift($nodes);
+                $al = $this->shareHelper->getPathsForAccessList($node);
+                $users += $al['users'];
+            }
+        }
 
-		$actor = $this->session->getUser();
-		if ($actor instanceof IUser) {
-			$actor = $actor->getUID();
-		} else {
-			$actor = '';
-		}
+        $actor = $this->session->getUser();
+        if ($actor instanceof IUser) {
+            $actor = $actor->getUID();
+        } else {
+            $actor = '';
+        }
 
-		$activity = $this->activityManager->generateEvent();
-		$activity->setApp('systemtags')
-			->setType('systemtags')
-			->setAuthor($actor)
-			->setObject($event->getObjectType(), (int) $event->getObjectId());
+        $activity = $this->activityManager->generateEvent();
+        $activity->setApp('systemtags')
+            ->setType('systemtags')
+            ->setAuthor($actor)
+            ->setObject($event->getObjectType(), (int) $event->getObjectId());
 
-		foreach ($users as $user => $path) {
-			$user = (string)$user; // numerical ids could be ints which are not accepted everywhere
-			$activity->setAffectedUser($user);
+        foreach ($users as $user => $path) {
+            $user = (string)$user; // numerical ids could be ints which are not accepted everywhere
+            $activity->setAffectedUser($user);
 
-			foreach ($tags as $tag) {
-				// don't publish activity for non-admins if tag is invisible
-				if (!$tag->isUserVisible() && !$this->groupManager->isAdmin($user)) {
-					continue;
-				}
-				if ($event->getEvent() === MapperEvent::EVENT_ASSIGN) {
-					$activity->setSubject(Provider::ASSIGN_TAG, [
-						$actor,
-						$path,
-						$this->prepareTagAsParameter($tag),
-					]);
-				} else if ($event->getEvent() === MapperEvent::EVENT_UNASSIGN) {
-					$activity->setSubject(Provider::UNASSIGN_TAG, [
-						$actor,
-						$path,
-						$this->prepareTagAsParameter($tag),
-					]);
-				}
+            foreach ($tags as $tag) {
+                // don't publish activity for non-admins if tag is invisible
+                if (!$tag->isUserVisible() && !$this->groupManager->isAdmin($user)) {
+                    continue;
+                }
+                if ($event->getEvent() === MapperEvent::EVENT_ASSIGN) {
+                    $activity->setSubject(Provider::ASSIGN_TAG, [
+                        $actor,
+                        $path,
+                        $this->prepareTagAsParameter($tag),
+                    ]);
+                } else if ($event->getEvent() === MapperEvent::EVENT_UNASSIGN) {
+                    $activity->setSubject(Provider::UNASSIGN_TAG, [
+                        $actor,
+                        $path,
+                        $this->prepareTagAsParameter($tag),
+                    ]);
+                }
 
-				$this->activityManager->publish($activity);
-			}
-		}
+                $this->activityManager->publish($activity);
+            }
+        }
 
-		if ($actor !== '' && $event->getEvent() === MapperEvent::EVENT_ASSIGN) {
-			foreach ($tags as $tag) {
-				$this->updateLastUsedTags($actor, $tag);
-			}
-		}
-	}
+        if ($actor !== '' && $event->getEvent() === MapperEvent::EVENT_ASSIGN) {
+            foreach ($tags as $tag) {
+                $this->updateLastUsedTags($actor, $tag);
+            }
+        }
+    }
 
-	/**
-	 * @param string $actor
-	 * @param ISystemTag $tag
-	 */
-	protected function updateLastUsedTags($actor, ISystemTag $tag) {
-		$lastUsedTags = $this->config->getUserValue($actor, 'systemtags', 'last_used', '[]');
-		$lastUsedTags = json_decode($lastUsedTags, true);
+    /**
+     * @param string $actor
+     * @param ISystemTag $tag
+     */
+    protected function updateLastUsedTags($actor, ISystemTag $tag) {
+        $lastUsedTags = $this->config->getUserValue($actor, 'systemtags', 'last_used', '[]');
+        $lastUsedTags = json_decode($lastUsedTags, true);
 
-		array_unshift($lastUsedTags, $tag->getId());
-		array_unique($lastUsedTags);
-		$lastUsedTags = array_slice($lastUsedTags, 0, 10);
+        array_unshift($lastUsedTags, $tag->getId());
+        array_unique($lastUsedTags);
+        $lastUsedTags = array_slice($lastUsedTags, 0, 10);
 
-		$this->config->setUserValue($actor, 'systemtags', 'last_used', json_encode($lastUsedTags));
-	}
+        $this->config->setUserValue($actor, 'systemtags', 'last_used', json_encode($lastUsedTags));
+    }
 
-	/**
-	 * @param ISystemTag $tag
-	 * @return string
-	 */
-	protected function prepareTagAsParameter(ISystemTag $tag) {
-		return json_encode([
-			'id' => $tag->getId(),
-			'name' => $tag->getName(),
-			'assignable' => $tag->isUserAssignable(),
-			'visible' => $tag->isUserVisible(),
-		]);
-	}
+    /**
+     * @param ISystemTag $tag
+     * @return string
+     */
+    protected function prepareTagAsParameter(ISystemTag $tag) {
+        return json_encode([
+            'id' => $tag->getId(),
+            'name' => $tag->getName(),
+            'assignable' => $tag->isUserAssignable(),
+            'visible' => $tag->isUserVisible(),
+        ]);
+    }
 }

lib/private/Session/Session.php

Indentation +43 added lines, -43 removed lines

@@ -29,53 +29,53 @@
 
 abstract class Session implements \ArrayAccess, ISession {
 
-	/**
-	 * @var bool
-	 */
-	protected $sessionClosed = false;
+    /**
+     * @var bool
+     */
+    protected $sessionClosed = false;
 
-	/**
-	 * $name serves as a namespace for the session keys
-	 *
-	 * @param string $name
-	 */
-	abstract public function __construct(string $name);
+    /**
+     * $name serves as a namespace for the session keys
+     *
+     * @param string $name
+     */
+    abstract public function __construct(string $name);
 
-	/**
-	 * @param mixed $offset
-	 * @return bool
-	 */
-	public function offsetExists($offset): bool {
-		return $this->exists($offset);
-	}
+    /**
+     * @param mixed $offset
+     * @return bool
+     */
+    public function offsetExists($offset): bool {
+        return $this->exists($offset);
+    }
 
-	/**
-	 * @param mixed $offset
-	 * @return mixed
-	 */
-	public function offsetGet($offset) {
-		return $this->get($offset);
-	}
+    /**
+     * @param mixed $offset
+     * @return mixed
+     */
+    public function offsetGet($offset) {
+        return $this->get($offset);
+    }
 
-	/**
-	 * @param mixed $offset
-	 * @param mixed $value
-	 */
-	public function offsetSet($offset, $value) {
-		$this->set($offset, $value);
-	}
+    /**
+     * @param mixed $offset
+     * @param mixed $value
+     */
+    public function offsetSet($offset, $value) {
+        $this->set($offset, $value);
+    }
 
-	/**
-	 * @param mixed $offset
-	 */
-	public function offsetUnset($offset) {
-		$this->remove($offset);
-	}
+    /**
+     * @param mixed $offset
+     */
+    public function offsetUnset($offset) {
+        $this->remove($offset);
+    }
 
-	/**
-	 * Close the session and release the lock
-	 */
-	public function close() {
-		$this->sessionClosed = true;
-	}
+    /**
+     * Close the session and release the lock
+     */
+    public function close() {
+        $this->sessionClosed = true;
+    }
 }

apps/files_external/lib/Command/ListCommand.php

Indentation +211 added lines, -211 removed lines

@@ -38,240 +38,240 @@
 use Symfony\Component\Console\Output\OutputInterface;
 
 class ListCommand extends Base {
-	/**
-	 * @var GlobalStoragesService
-	 */
-	protected $globalService;
+    /**
+     * @var GlobalStoragesService
+     */
+    protected $globalService;
 
-	/**
-	 * @var UserStoragesService
-	 */
-	protected $userService;
+    /**
+     * @var UserStoragesService
+     */
+    protected $userService;
 
-	/**
-	 * @var IUserSession
-	 */
-	protected $userSession;
+    /**
+     * @var IUserSession
+     */
+    protected $userSession;
 
-	/**
-	 * @var IUserManager
-	 */
-	protected $userManager;
+    /**
+     * @var IUserManager
+     */
+    protected $userManager;
 
-	const ALL = -1;
+    const ALL = -1;
 
-	function __construct(GlobalStoragesService $globalService, UserStoragesService $userService, IUserSession $userSession, IUserManager $userManager) {
-		parent::__construct();
-		$this->globalService = $globalService;
-		$this->userService = $userService;
-		$this->userSession = $userSession;
-		$this->userManager = $userManager;
-	}
+    function __construct(GlobalStoragesService $globalService, UserStoragesService $userService, IUserSession $userSession, IUserManager $userManager) {
+        parent::__construct();
+        $this->globalService = $globalService;
+        $this->userService = $userService;
+        $this->userSession = $userSession;
+        $this->userManager = $userManager;
+    }
 
-	protected function configure() {
-		$this
-			->setName('files_external:list')
-			->setDescription('List configured admin or personal mounts')
-			->addArgument(
-				'user_id',
-				InputArgument::OPTIONAL,
-				'user id to list the personal mounts for, if no user is provided admin mounts will be listed'
-			)->addOption(
-				'show-password',
-				'',
-				InputOption::VALUE_NONE,
-				'show passwords and secrets'
-			)->addOption(
-				'full',
-				null,
-				InputOption::VALUE_NONE,
-				'don\'t truncate long values in table output'
-			)->addOption(
-				'all',
-				'a',
-				InputOption::VALUE_NONE,
-				'show both system wide mounts and all personal mounts'
-			);
-		parent::configure();
-	}
+    protected function configure() {
+        $this
+            ->setName('files_external:list')
+            ->setDescription('List configured admin or personal mounts')
+            ->addArgument(
+                'user_id',
+                InputArgument::OPTIONAL,
+                'user id to list the personal mounts for, if no user is provided admin mounts will be listed'
+            )->addOption(
+                'show-password',
+                '',
+                InputOption::VALUE_NONE,
+                'show passwords and secrets'
+            )->addOption(
+                'full',
+                null,
+                InputOption::VALUE_NONE,
+                'don\'t truncate long values in table output'
+            )->addOption(
+                'all',
+                'a',
+                InputOption::VALUE_NONE,
+                'show both system wide mounts and all personal mounts'
+            );
+        parent::configure();
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		if ($input->getOption('all')) {
-			/** @var  $mounts StorageConfig[] */
-			$mounts = $this->globalService->getStorageForAllUsers();
-			$userId = self::ALL;
-		} else {
-			$userId = $input->getArgument('user_id');
-			$storageService = $this->getStorageService($userId);
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        if ($input->getOption('all')) {
+            /** @var  $mounts StorageConfig[] */
+            $mounts = $this->globalService->getStorageForAllUsers();
+            $userId = self::ALL;
+        } else {
+            $userId = $input->getArgument('user_id');
+            $storageService = $this->getStorageService($userId);
 
-			/** @var  $mounts StorageConfig[] */
-			$mounts = $storageService->getAllStorages();
-		}
+            /** @var  $mounts StorageConfig[] */
+            $mounts = $storageService->getAllStorages();
+        }
 
-		$this->listMounts($userId, $mounts, $input, $output);
-	}
+        $this->listMounts($userId, $mounts, $input, $output);
+    }
 
-	/**
-	 * @param $userId $userId
-	 * @param StorageConfig[] $mounts
-	 * @param InputInterface $input
-	 * @param OutputInterface $output
-	 */
-	public function listMounts($userId, array $mounts, InputInterface $input, OutputInterface $output) {
-		$outputType = $input->getOption('output');
-		if (count($mounts) === 0) {
-			if ($outputType === self::OUTPUT_FORMAT_JSON || $outputType === self::OUTPUT_FORMAT_JSON_PRETTY) {
-				$output->writeln('[]');
-			} else {
-				if ($userId === self::ALL) {
-					$output->writeln("<info>No mounts configured</info>");
-				} else if ($userId) {
-					$output->writeln("<info>No mounts configured by $userId</info>");
-				} else {
-					$output->writeln("<info>No admin mounts configured</info>");
-				}
-			}
-			return;
-		}
+    /**
+     * @param $userId $userId
+     * @param StorageConfig[] $mounts
+     * @param InputInterface $input
+     * @param OutputInterface $output
+     */
+    public function listMounts($userId, array $mounts, InputInterface $input, OutputInterface $output) {
+        $outputType = $input->getOption('output');
+        if (count($mounts) === 0) {
+            if ($outputType === self::OUTPUT_FORMAT_JSON || $outputType === self::OUTPUT_FORMAT_JSON_PRETTY) {
+                $output->writeln('[]');
+            } else {
+                if ($userId === self::ALL) {
+                    $output->writeln("<info>No mounts configured</info>");
+                } else if ($userId) {
+                    $output->writeln("<info>No mounts configured by $userId</info>");
+                } else {
+                    $output->writeln("<info>No admin mounts configured</info>");
+                }
+            }
+            return;
+        }
 
-		$headers = ['Mount ID', 'Mount Point', 'Storage', 'Authentication Type', 'Configuration', 'Options'];
+        $headers = ['Mount ID', 'Mount Point', 'Storage', 'Authentication Type', 'Configuration', 'Options'];
 
-		if (!$userId || $userId === self::ALL) {
-			$headers[] = 'Applicable Users';
-			$headers[] = 'Applicable Groups';
-		}
-		if ($userId === self::ALL) {
-			$headers[] = 'Type';
-		}
+        if (!$userId || $userId === self::ALL) {
+            $headers[] = 'Applicable Users';
+            $headers[] = 'Applicable Groups';
+        }
+        if ($userId === self::ALL) {
+            $headers[] = 'Type';
+        }
 
-		if (!$input->getOption('show-password')) {
-			$hideKeys = ['password', 'refresh_token', 'token', 'client_secret', 'public_key', 'private_key'];
-			foreach ($mounts as $mount) {
-				$config = $mount->getBackendOptions();
-				foreach ($config as $key => $value) {
-					if (in_array($key, $hideKeys)) {
-						$mount->setBackendOption($key, '***');
-					}
-				}
-			}
-		}
+        if (!$input->getOption('show-password')) {
+            $hideKeys = ['password', 'refresh_token', 'token', 'client_secret', 'public_key', 'private_key'];
+            foreach ($mounts as $mount) {
+                $config = $mount->getBackendOptions();
+                foreach ($config as $key => $value) {
+                    if (in_array($key, $hideKeys)) {
+                        $mount->setBackendOption($key, '***');
+                    }
+                }
+            }
+        }
 
-		if ($outputType === self::OUTPUT_FORMAT_JSON || $outputType === self::OUTPUT_FORMAT_JSON_PRETTY) {
-			$keys = array_map(function ($header) {
-				return strtolower(str_replace(' ', '_', $header));
-			}, $headers);
+        if ($outputType === self::OUTPUT_FORMAT_JSON || $outputType === self::OUTPUT_FORMAT_JSON_PRETTY) {
+            $keys = array_map(function ($header) {
+                return strtolower(str_replace(' ', '_', $header));
+            }, $headers);
 
-			$pairs = array_map(function (StorageConfig $config) use ($keys, $userId) {
-				$values = [
-					$config->getId(),
-					$config->getMountPoint(),
-					$config->getBackend()->getStorageClass(),
-					$config->getAuthMechanism()->getIdentifier(),
-					$config->getBackendOptions(),
-					$config->getMountOptions()
-				];
-				if (!$userId || $userId === self::ALL) {
-					$values[] = $config->getApplicableUsers();
-					$values[] = $config->getApplicableGroups();
-				}
-				if ($userId === self::ALL) {
-					$values[] = $config->getType() === StorageConfig::MOUNT_TYPE_ADMIN ? 'admin' : 'personal';
-				}
+            $pairs = array_map(function (StorageConfig $config) use ($keys, $userId) {
+                $values = [
+                    $config->getId(),
+                    $config->getMountPoint(),
+                    $config->getBackend()->getStorageClass(),
+                    $config->getAuthMechanism()->getIdentifier(),
+                    $config->getBackendOptions(),
+                    $config->getMountOptions()
+                ];
+                if (!$userId || $userId === self::ALL) {
+                    $values[] = $config->getApplicableUsers();
+                    $values[] = $config->getApplicableGroups();
+                }
+                if ($userId === self::ALL) {
+                    $values[] = $config->getType() === StorageConfig::MOUNT_TYPE_ADMIN ? 'admin' : 'personal';
+                }
 
-				return array_combine($keys, $values);
-			}, $mounts);
-			if ($outputType === self::OUTPUT_FORMAT_JSON) {
-				$output->writeln(json_encode(array_values($pairs)));
-			} else {
-				$output->writeln(json_encode(array_values($pairs), JSON_PRETTY_PRINT));
-			}
-		} else {
-			$full = $input->getOption('full');
-			$defaultMountOptions = [
-				'encrypt' => true,
-				'previews' => true,
-				'filesystem_check_changes' => 1,
-				'enable_sharing' => false,
-				'encoding_compatibility' => false,
-				'readonly' => false,
-			];
-			$rows = array_map(function (StorageConfig $config) use ($userId, $defaultMountOptions, $full) {
-				$storageConfig = $config->getBackendOptions();
-				$keys = array_keys($storageConfig);
-				$values = array_values($storageConfig);
+                return array_combine($keys, $values);
+            }, $mounts);
+            if ($outputType === self::OUTPUT_FORMAT_JSON) {
+                $output->writeln(json_encode(array_values($pairs)));
+            } else {
+                $output->writeln(json_encode(array_values($pairs), JSON_PRETTY_PRINT));
+            }
+        } else {
+            $full = $input->getOption('full');
+            $defaultMountOptions = [
+                'encrypt' => true,
+                'previews' => true,
+                'filesystem_check_changes' => 1,
+                'enable_sharing' => false,
+                'encoding_compatibility' => false,
+                'readonly' => false,
+            ];
+            $rows = array_map(function (StorageConfig $config) use ($userId, $defaultMountOptions, $full) {
+                $storageConfig = $config->getBackendOptions();
+                $keys = array_keys($storageConfig);
+                $values = array_values($storageConfig);
 
-				if (!$full) {
-					$values = array_map(function ($value) {
-						if (is_string($value) && strlen($value) > 32) {
-							return substr($value, 0, 6) . '...' . substr($value, -6, 6);
-						} else {
-							return $value;
-						}
-					}, $values);
-				}
+                if (!$full) {
+                    $values = array_map(function ($value) {
+                        if (is_string($value) && strlen($value) > 32) {
+                            return substr($value, 0, 6) . '...' . substr($value, -6, 6);
+                        } else {
+                            return $value;
+                        }
+                    }, $values);
+                }
 
-				$configStrings = array_map(function ($key, $value) {
-					return $key . ': ' . json_encode($value);
-				}, $keys, $values);
-				$configString = implode(', ', $configStrings);
+                $configStrings = array_map(function ($key, $value) {
+                    return $key . ': ' . json_encode($value);
+                }, $keys, $values);
+                $configString = implode(', ', $configStrings);
 
-				$mountOptions = $config->getMountOptions();
-				// hide defaults
-				foreach ($mountOptions as $key => $value) {
-					if ($value === $defaultMountOptions[$key]) {
-						unset($mountOptions[$key]);
-					}
-				}
-				$keys = array_keys($mountOptions);
-				$values = array_values($mountOptions);
+                $mountOptions = $config->getMountOptions();
+                // hide defaults
+                foreach ($mountOptions as $key => $value) {
+                    if ($value === $defaultMountOptions[$key]) {
+                        unset($mountOptions[$key]);
+                    }
+                }
+                $keys = array_keys($mountOptions);
+                $values = array_values($mountOptions);
 
-				$optionsStrings = array_map(function ($key, $value) {
-					return $key . ': ' . json_encode($value);
-				}, $keys, $values);
-				$optionsString = implode(', ', $optionsStrings);
+                $optionsStrings = array_map(function ($key, $value) {
+                    return $key . ': ' . json_encode($value);
+                }, $keys, $values);
+                $optionsString = implode(', ', $optionsStrings);
 
-				$values = [
-					$config->getId(),
-					$config->getMountPoint(),
-					$config->getBackend()->getText(),
-					$config->getAuthMechanism()->getText(),
-					$configString,
-					$optionsString
-				];
+                $values = [
+                    $config->getId(),
+                    $config->getMountPoint(),
+                    $config->getBackend()->getText(),
+                    $config->getAuthMechanism()->getText(),
+                    $configString,
+                    $optionsString
+                ];
 
-				if (!$userId || $userId === self::ALL) {
-					$applicableUsers = implode(', ', $config->getApplicableUsers());
-					$applicableGroups = implode(', ', $config->getApplicableGroups());
-					if ($applicableUsers === '' && $applicableGroups === '') {
-						$applicableUsers = 'All';
-					}
-					$values[] = $applicableUsers;
-					$values[] = $applicableGroups;
-				}
-				if ($userId === self::ALL) {
-					$values[] = $config->getType() === StorageConfig::MOUNT_TYPE_ADMIN ? 'Admin' : 'Personal';
-				}
+                if (!$userId || $userId === self::ALL) {
+                    $applicableUsers = implode(', ', $config->getApplicableUsers());
+                    $applicableGroups = implode(', ', $config->getApplicableGroups());
+                    if ($applicableUsers === '' && $applicableGroups === '') {
+                        $applicableUsers = 'All';
+                    }
+                    $values[] = $applicableUsers;
+                    $values[] = $applicableGroups;
+                }
+                if ($userId === self::ALL) {
+                    $values[] = $config->getType() === StorageConfig::MOUNT_TYPE_ADMIN ? 'Admin' : 'Personal';
+                }
 
-				return $values;
-			}, $mounts);
+                return $values;
+            }, $mounts);
 
-			$table = new Table($output);
-			$table->setHeaders($headers);
-			$table->setRows($rows);
-			$table->render();
-		}
-	}
+            $table = new Table($output);
+            $table->setHeaders($headers);
+            $table->setRows($rows);
+            $table->render();
+        }
+    }
 
-	protected function getStorageService($userId) {
-		if (!empty($userId)) {
-			$user = $this->userManager->get($userId);
-			if (is_null($user)) {
-				throw new NoUserException("user $userId not found");
-			}
-			$this->userSession->setUser($user);
-			return $this->userService;
-		} else {
-			return $this->globalService;
-		}
-	}
+    protected function getStorageService($userId) {
+        if (!empty($userId)) {
+            $user = $this->userManager->get($userId);
+            if (is_null($user)) {
+                throw new NoUserException("user $userId not found");
+            }
+            $this->userSession->setUser($user);
+            return $this->userService;
+        } else {
+            return $this->globalService;
+        }
+    }
 }

lib/public/IRequest.php

Indentation +233 added lines, -233 removed lines

@@ -65,237 +65,237 @@
  * @since 6.0.0
  */
 interface IRequest {
-	/**
-	 * @since 9.1.0
-	 */
-	const USER_AGENT_CLIENT_ANDROID = '/^Mozilla\/5\.0 \(Android\) (ownCloud|Nextcloud)\-android.*$/';
-
-	/**
-	 * @since 13.0.0
-	 */
-	const USER_AGENT_TALK_ANDROID = '/^Mozilla\/5\.0 \(Android\) Nextcloud\-Talk v.*$/';
-
-	/**
-	 * @since 9.1.0
-	 */
-	const USER_AGENT_CLIENT_DESKTOP = '/^Mozilla\/5\.0 \([A-Za-z ]+\) (mirall|csyncoC)\/.*$/';
-
-	/**
-	 * @since 9.1.0
-	 */
-	const USER_AGENT_CLIENT_IOS = '/^Mozilla\/5\.0 \(iOS\) (ownCloud|Nextcloud)\-iOS.*$/';
-
-	/**
-	 * @since 13.0.0
-	 */
-	const USER_AGENT_TALK_IOS = '/^Mozilla\/5\.0 \(iOS\) Nextcloud\-Talk v.*$/';
-
-	/**
-	 * @since 13.0.1
-	 */
-	const USER_AGENT_OUTLOOK_ADDON = '/^Mozilla\/5\.0 \([A-Za-z ]+\) Nextcloud\-Outlook v.*$/';
-
-	/**
-	 * @since 13.0.1
-	 */
-	const USER_AGENT_THUNDERBIRD_ADDON = '/^Mozilla\/5\.0 \([A-Za-z ]+\) Nextcloud\-Thunderbird v.*$/';
-
-	/**
-	 * @param string $name
-	 *
-	 * @return string
-	 * @since 6.0.0
-	 */
-	public function getHeader(string $name): string;
-
-	/**
-	 * Lets you access post and get parameters by the index
-	 * In case of json requests the encoded json body is accessed
-	 *
-	 * @param string $key the key which you want to access in the URL Parameter
-	 *                     placeholder, $_POST or $_GET array.
-	 *                     The priority how they're returned is the following:
-	 *                     1. URL parameters
-	 *                     2. POST parameters
-	 *                     3. GET parameters
-	 * @param mixed $default If the key is not found, this value will be returned
-	 * @return mixed the content of the array
-	 * @since 6.0.0
-	 */
-	public function getParam(string $key, $default = null);
-
-
-	/**
-	 * Returns all params that were received, be it from the request
-	 *
-	 * (as GET or POST) or through the URL by the route
-	 *
-	 * @return array the array with all parameters
-	 * @since 6.0.0
-	 */
-	public function getParams(): array;
-
-	/**
-	 * Returns the method of the request
-	 *
-	 * @return string the method of the request (POST, GET, etc)
-	 * @since 6.0.0
-	 */
-	public function getMethod(): string;
-
-	/**
-	 * Shortcut for accessing an uploaded file through the $_FILES array
-	 *
-	 * @param string $key the key that will be taken from the $_FILES array
-	 * @return array the file in the $_FILES element
-	 * @since 6.0.0
-	 */
-	public function getUploadedFile(string $key);
-
-
-	/**
-	 * Shortcut for getting env variables
-	 *
-	 * @param string $key the key that will be taken from the $_ENV array
-	 * @return array the value in the $_ENV element
-	 * @since 6.0.0
-	 */
-	public function getEnv(string $key);
-
-
-	/**
-	 * Shortcut for getting cookie variables
-	 *
-	 * @param string $key the key that will be taken from the $_COOKIE array
-	 * @return string|null the value in the $_COOKIE element
-	 * @since 6.0.0
-	 */
-	public function getCookie(string $key);
-
-
-	/**
-	 * Checks if the CSRF check was correct
-	 *
-	 * @return bool true if CSRF check passed
-	 * @since 6.0.0
-	 */
-	public function passesCSRFCheck(): bool;
-
-	/**
-	 * Checks if the strict cookie has been sent with the request if the request
-	 * is including any cookies.
-	 *
-	 * @return bool
-	 * @since 9.0.0
-	 */
-	public function passesStrictCookieCheck(): bool;
-
-	/**
-	 * Checks if the lax cookie has been sent with the request if the request
-	 * is including any cookies.
-	 *
-	 * @return bool
-	 * @since 9.0.0
-	 */
-	public function passesLaxCookieCheck(): bool;
-
-	/**
-	 * Returns an ID for the request, value is not guaranteed to be unique and is mostly meant for logging
-	 * If `mod_unique_id` is installed this value will be taken.
-	 *
-	 * @return string
-	 * @since 8.1.0
-	 */
-	public function getId(): string;
-
-	/**
-	 * Returns the remote address, if the connection came from a trusted proxy
-	 * and `forwarded_for_headers` has been configured then the IP address
-	 * specified in this header will be returned instead.
-	 * Do always use this instead of $_SERVER['REMOTE_ADDR']
-	 *
-	 * @return string IP address
-	 * @since 8.1.0
-	 */
-	public function getRemoteAddress(): string;
-
-	/**
-	 * Returns the server protocol. It respects reverse proxy servers and load
-	 * balancers.
-	 *
-	 * @return string Server protocol (http or https)
-	 * @since 8.1.0
-	 */
-	public function getServerProtocol(): string;
-
-	/**
-	 * Returns the used HTTP protocol.
-	 *
-	 * @return string HTTP protocol. HTTP/2, HTTP/1.1 or HTTP/1.0.
-	 * @since 8.2.0
-	 */
-	public function getHttpProtocol(): string;
-
-	/**
-	 * Returns the request uri, even if the website uses one or more
-	 * reverse proxies
-	 *
-	 * @return string
-	 * @since 8.1.0
-	 */
-	public function getRequestUri(): string;
-
-	/**
-	 * Get raw PathInfo from request (not urldecoded)
-	 *
-	 * @throws \Exception
-	 * @return string Path info
-	 * @since 8.1.0
-	 */
-	public function getRawPathInfo(): string;
-
-	/**
-	 * Get PathInfo from request
-	 *
-	 * @throws \Exception
-	 * @return string|false Path info or false when not found
-	 * @since 8.1.0
-	 */
-	public function getPathInfo();
-
-	/**
-	 * Returns the script name, even if the website uses one or more
-	 * reverse proxies
-	 *
-	 * @return string the script name
-	 * @since 8.1.0
-	 */
-	public function getScriptName(): string;
-
-	/**
-	 * Checks whether the user agent matches a given regex
-	 *
-	 * @param array $agent array of agent names
-	 * @return bool true if at least one of the given agent matches, false otherwise
-	 * @since 8.1.0
-	 */
-	public function isUserAgent(array $agent): bool;
-
-	/**
-	 * Returns the unverified server host from the headers without checking
-	 * whether it is a trusted domain
-	 *
-	 * @return string Server host
-	 * @since 8.1.0
-	 */
-	public function getInsecureServerHost(): string;
-
-	/**
-	 * Returns the server host from the headers, or the first configured
-	 * trusted domain if the host isn't in the trusted list
-	 *
-	 * @return string Server host
-	 * @since 8.1.0
-	 */
-	public function getServerHost(): string;
+    /**
+     * @since 9.1.0
+     */
+    const USER_AGENT_CLIENT_ANDROID = '/^Mozilla\/5\.0 \(Android\) (ownCloud|Nextcloud)\-android.*$/';
+
+    /**
+     * @since 13.0.0
+     */
+    const USER_AGENT_TALK_ANDROID = '/^Mozilla\/5\.0 \(Android\) Nextcloud\-Talk v.*$/';
+
+    /**
+     * @since 9.1.0
+     */
+    const USER_AGENT_CLIENT_DESKTOP = '/^Mozilla\/5\.0 \([A-Za-z ]+\) (mirall|csyncoC)\/.*$/';
+
+    /**
+     * @since 9.1.0
+     */
+    const USER_AGENT_CLIENT_IOS = '/^Mozilla\/5\.0 \(iOS\) (ownCloud|Nextcloud)\-iOS.*$/';
+
+    /**
+     * @since 13.0.0
+     */
+    const USER_AGENT_TALK_IOS = '/^Mozilla\/5\.0 \(iOS\) Nextcloud\-Talk v.*$/';
+
+    /**
+     * @since 13.0.1
+     */
+    const USER_AGENT_OUTLOOK_ADDON = '/^Mozilla\/5\.0 \([A-Za-z ]+\) Nextcloud\-Outlook v.*$/';
+
+    /**
+     * @since 13.0.1
+     */
+    const USER_AGENT_THUNDERBIRD_ADDON = '/^Mozilla\/5\.0 \([A-Za-z ]+\) Nextcloud\-Thunderbird v.*$/';
+
+    /**
+     * @param string $name
+     *
+     * @return string
+     * @since 6.0.0
+     */
+    public function getHeader(string $name): string;
+
+    /**
+     * Lets you access post and get parameters by the index
+     * In case of json requests the encoded json body is accessed
+     *
+     * @param string $key the key which you want to access in the URL Parameter
+     *                     placeholder, $_POST or $_GET array.
+     *                     The priority how they're returned is the following:
+     *                     1. URL parameters
+     *                     2. POST parameters
+     *                     3. GET parameters
+     * @param mixed $default If the key is not found, this value will be returned
+     * @return mixed the content of the array
+     * @since 6.0.0
+     */
+    public function getParam(string $key, $default = null);
+
+
+    /**
+     * Returns all params that were received, be it from the request
+     *
+     * (as GET or POST) or through the URL by the route
+     *
+     * @return array the array with all parameters
+     * @since 6.0.0
+     */
+    public function getParams(): array;
+
+    /**
+     * Returns the method of the request
+     *
+     * @return string the method of the request (POST, GET, etc)
+     * @since 6.0.0
+     */
+    public function getMethod(): string;
+
+    /**
+     * Shortcut for accessing an uploaded file through the $_FILES array
+     *
+     * @param string $key the key that will be taken from the $_FILES array
+     * @return array the file in the $_FILES element
+     * @since 6.0.0
+     */
+    public function getUploadedFile(string $key);
+
+
+    /**
+     * Shortcut for getting env variables
+     *
+     * @param string $key the key that will be taken from the $_ENV array
+     * @return array the value in the $_ENV element
+     * @since 6.0.0
+     */
+    public function getEnv(string $key);
+
+
+    /**
+     * Shortcut for getting cookie variables
+     *
+     * @param string $key the key that will be taken from the $_COOKIE array
+     * @return string|null the value in the $_COOKIE element
+     * @since 6.0.0
+     */
+    public function getCookie(string $key);
+
+
+    /**
+     * Checks if the CSRF check was correct
+     *
+     * @return bool true if CSRF check passed
+     * @since 6.0.0
+     */
+    public function passesCSRFCheck(): bool;
+
+    /**
+     * Checks if the strict cookie has been sent with the request if the request
+     * is including any cookies.
+     *
+     * @return bool
+     * @since 9.0.0
+     */
+    public function passesStrictCookieCheck(): bool;
+
+    /**
+     * Checks if the lax cookie has been sent with the request if the request
+     * is including any cookies.
+     *
+     * @return bool
+     * @since 9.0.0
+     */
+    public function passesLaxCookieCheck(): bool;
+
+    /**
+     * Returns an ID for the request, value is not guaranteed to be unique and is mostly meant for logging
+     * If `mod_unique_id` is installed this value will be taken.
+     *
+     * @return string
+     * @since 8.1.0
+     */
+    public function getId(): string;
+
+    /**
+     * Returns the remote address, if the connection came from a trusted proxy
+     * and `forwarded_for_headers` has been configured then the IP address
+     * specified in this header will be returned instead.
+     * Do always use this instead of $_SERVER['REMOTE_ADDR']
+     *
+     * @return string IP address
+     * @since 8.1.0
+     */
+    public function getRemoteAddress(): string;
+
+    /**
+     * Returns the server protocol. It respects reverse proxy servers and load
+     * balancers.
+     *
+     * @return string Server protocol (http or https)
+     * @since 8.1.0
+     */
+    public function getServerProtocol(): string;
+
+    /**
+     * Returns the used HTTP protocol.
+     *
+     * @return string HTTP protocol. HTTP/2, HTTP/1.1 or HTTP/1.0.
+     * @since 8.2.0
+     */
+    public function getHttpProtocol(): string;
+
+    /**
+     * Returns the request uri, even if the website uses one or more
+     * reverse proxies
+     *
+     * @return string
+     * @since 8.1.0
+     */
+    public function getRequestUri(): string;
+
+    /**
+     * Get raw PathInfo from request (not urldecoded)
+     *
+     * @throws \Exception
+     * @return string Path info
+     * @since 8.1.0
+     */
+    public function getRawPathInfo(): string;
+
+    /**
+     * Get PathInfo from request
+     *
+     * @throws \Exception
+     * @return string|false Path info or false when not found
+     * @since 8.1.0
+     */
+    public function getPathInfo();
+
+    /**
+     * Returns the script name, even if the website uses one or more
+     * reverse proxies
+     *
+     * @return string the script name
+     * @since 8.1.0
+     */
+    public function getScriptName(): string;
+
+    /**
+     * Checks whether the user agent matches a given regex
+     *
+     * @param array $agent array of agent names
+     * @return bool true if at least one of the given agent matches, false otherwise
+     * @since 8.1.0
+     */
+    public function isUserAgent(array $agent): bool;
+
+    /**
+     * Returns the unverified server host from the headers without checking
+     * whether it is a trusted domain
+     *
+     * @return string Server host
+     * @since 8.1.0
+     */
+    public function getInsecureServerHost(): string;
+
+    /**
+     * Returns the server host from the headers, or the first configured
+     * trusted domain if the host isn't in the trusted list
+     *
+     * @return string Server host
+     * @since 8.1.0
+     */
+    public function getServerHost(): string;
 }

apps/provisioning_api/lib/Middleware/ProvisioningApiMiddleware.php

Indentation +45 added lines, -45 removed lines

@@ -34,55 +34,55 @@
 
 class ProvisioningApiMiddleware extends Middleware {
 
-	/** @var IControllerMethodReflector */
-	private $reflector;
+    /** @var IControllerMethodReflector */
+    private $reflector;
 
-	/** @var bool */
-	private $isAdmin;
+    /** @var bool */
+    private $isAdmin;
 
-	/** @var bool */
-	private $isSubAdmin;
+    /** @var bool */
+    private $isSubAdmin;
 
-	/**
-	 * ProvisioningApiMiddleware constructor.
-	 *
-	 * @param IControllerMethodReflector $reflector
-	 * @param bool $isAdmin
-	 * @param bool $isSubAdmin
-	 */
-	public function __construct(
-		IControllerMethodReflector $reflector,
-		bool $isAdmin,
-		bool $isSubAdmin) {
-		$this->reflector = $reflector;
-		$this->isAdmin = $isAdmin;
-		$this->isSubAdmin = $isSubAdmin;
-	}
+    /**
+     * ProvisioningApiMiddleware constructor.
+     *
+     * @param IControllerMethodReflector $reflector
+     * @param bool $isAdmin
+     * @param bool $isSubAdmin
+     */
+    public function __construct(
+        IControllerMethodReflector $reflector,
+        bool $isAdmin,
+        bool $isSubAdmin) {
+        $this->reflector = $reflector;
+        $this->isAdmin = $isAdmin;
+        $this->isSubAdmin = $isSubAdmin;
+    }
 
-	/**
-	 * @param Controller $controller
-	 * @param string $methodName
-	 *
-	 * @throws NotSubAdminException
-	 */
-	public function beforeController($controller, $methodName) {
-		if (!$this->isAdmin && !$this->reflector->hasAnnotation('NoSubAdminRequired') && !$this->isSubAdmin) {
-			throw new NotSubAdminException();
-		}
-	}
+    /**
+     * @param Controller $controller
+     * @param string $methodName
+     *
+     * @throws NotSubAdminException
+     */
+    public function beforeController($controller, $methodName) {
+        if (!$this->isAdmin && !$this->reflector->hasAnnotation('NoSubAdminRequired') && !$this->isSubAdmin) {
+            throw new NotSubAdminException();
+        }
+    }
 
-	/**
-	 * @param Controller $controller
-	 * @param string $methodName
-	 * @param \Exception $exception
-	 * @throws \Exception
-	 * @return Response
-	 */
-	public function afterException($controller, $methodName, \Exception $exception) {
-		if ($exception instanceof NotSubAdminException) {
-			throw new OCSException($exception->getMessage(), \OCP\API::RESPOND_UNAUTHORISED);
-		}
+    /**
+     * @param Controller $controller
+     * @param string $methodName
+     * @param \Exception $exception
+     * @throws \Exception
+     * @return Response
+     */
+    public function afterException($controller, $methodName, \Exception $exception) {
+        if ($exception instanceof NotSubAdminException) {
+            throw new OCSException($exception->getMessage(), \OCP\API::RESPOND_UNAUTHORISED);
+        }
 
-		throw $exception;
-	}
+        throw $exception;
+    }
 }

apps/provisioning_api/lib/Controller/AppsController.php

Indentation +78 added lines, -78 removed lines

@@ -36,91 +36,91 @@
 use OCP\IRequest;
 
 class AppsController extends OCSController {
-	/** @var \OCP\App\IAppManager */
-	private $appManager;
+    /** @var \OCP\App\IAppManager */
+    private $appManager;
 
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IAppManager $appManager
-	 */
-	public function __construct(
-		string $appName,
-		IRequest $request,
-		IAppManager $appManager
-	) {
-		parent::__construct($appName, $request);
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IAppManager $appManager
+     */
+    public function __construct(
+        string $appName,
+        IRequest $request,
+        IAppManager $appManager
+    ) {
+        parent::__construct($appName, $request);
 
-		$this->appManager = $appManager;
-	}
+        $this->appManager = $appManager;
+    }
 
-	/**
-	 * @param string $filter
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function getApps(string $filter = null): DataResponse {
-		$apps = (new OC_App())->listAllApps();
-		$list = [];
-		foreach($apps as $app) {
-			$list[] = $app['id'];
-		}
-		if($filter){
-			switch($filter){
-				case 'enabled':
-					return new DataResponse(['apps' => \OC_App::getEnabledApps()]);
-					break;
-				case 'disabled':
-					$enabled = OC_App::getEnabledApps();
-					return new DataResponse(['apps' => array_diff($list, $enabled)]);
-					break;
-				default:
-					// Invalid filter variable
-					throw new OCSException('', 101);
-			}
+    /**
+     * @param string $filter
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function getApps(string $filter = null): DataResponse {
+        $apps = (new OC_App())->listAllApps();
+        $list = [];
+        foreach($apps as $app) {
+            $list[] = $app['id'];
+        }
+        if($filter){
+            switch($filter){
+                case 'enabled':
+                    return new DataResponse(['apps' => \OC_App::getEnabledApps()]);
+                    break;
+                case 'disabled':
+                    $enabled = OC_App::getEnabledApps();
+                    return new DataResponse(['apps' => array_diff($list, $enabled)]);
+                    break;
+                default:
+                    // Invalid filter variable
+                    throw new OCSException('', 101);
+            }
 
-		} else {
-			return new DataResponse(['apps' => $list]);
-		}
-	}
+        } else {
+            return new DataResponse(['apps' => $list]);
+        }
+    }
 
-	/**
-	 * @param string $app
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function getAppInfo(string $app): DataResponse {
-		$info = \OCP\App::getAppInfo($app);
-		if(!is_null($info)) {
-			return new DataResponse(OC_App::getAppInfo($app));
-		}
+    /**
+     * @param string $app
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function getAppInfo(string $app): DataResponse {
+        $info = \OCP\App::getAppInfo($app);
+        if(!is_null($info)) {
+            return new DataResponse(OC_App::getAppInfo($app));
+        }
 
-		throw new OCSException('The request app was not found', \OCP\API::RESPOND_NOT_FOUND);
-	}
+        throw new OCSException('The request app was not found', \OCP\API::RESPOND_NOT_FOUND);
+    }
 
-	/**
-	 * @PasswordConfirmationRequired
-	 * @param string $app
-	 * @return DataResponse
-	 * @throws OCSException
-	 */
-	public function enable(string $app): DataResponse {
-		try {
-			$this->appManager->enableApp($app);
-		} catch (AppPathNotFoundException $e) {
-			throw new OCSException('The request app was not found', \OCP\API::RESPOND_NOT_FOUND);
-		}
-		return new DataResponse();
-	}
+    /**
+     * @PasswordConfirmationRequired
+     * @param string $app
+     * @return DataResponse
+     * @throws OCSException
+     */
+    public function enable(string $app): DataResponse {
+        try {
+            $this->appManager->enableApp($app);
+        } catch (AppPathNotFoundException $e) {
+            throw new OCSException('The request app was not found', \OCP\API::RESPOND_NOT_FOUND);
+        }
+        return new DataResponse();
+    }
 
-	/**
-	 * @PasswordConfirmationRequired
-	 * @param string $app
-	 * @return DataResponse
-	 */
-	public function disable(string $app): DataResponse {
-		$this->appManager->disableApp($app);
-		return new DataResponse();
-	}
+    /**
+     * @PasswordConfirmationRequired
+     * @param string $app
+     * @return DataResponse
+     */
+    public function disable(string $app): DataResponse {
+        $this->appManager->disableApp($app);
+        return new DataResponse();
+    }
 
 }

apps/files_sharing/lib/Helper.php

Indentation +57 added lines, -57 removed lines

@@ -36,70 +36,70 @@
 
 class Helper {
 
-	public static function registerHooks() {
-		\OCP\Util::connectHook('OC_Filesystem', 'post_rename', '\OCA\Files_Sharing\Updater', 'renameHook');
-		\OCP\Util::connectHook('OC_Filesystem', 'post_delete', '\OCA\Files_Sharing\Hooks', 'unshareChildren');
+    public static function registerHooks() {
+        \OCP\Util::connectHook('OC_Filesystem', 'post_rename', '\OCA\Files_Sharing\Updater', 'renameHook');
+        \OCP\Util::connectHook('OC_Filesystem', 'post_delete', '\OCA\Files_Sharing\Hooks', 'unshareChildren');
 
-		\OCP\Util::connectHook('OC_User', 'post_deleteUser', '\OCA\Files_Sharing\Hooks', 'deleteUser');
-	}
+        \OCP\Util::connectHook('OC_User', 'post_deleteUser', '\OCA\Files_Sharing\Hooks', 'deleteUser');
+    }
 
-	/**
-	 * check if file name already exists and generate unique target
-	 *
-	 * @param string $path
-	 * @param array $excludeList
-	 * @param View $view
-	 * @return string $path
-	 */
-	public static function generateUniqueTarget($path, $excludeList, $view) {
-		$pathinfo = pathinfo($path);
-		$ext = isset($pathinfo['extension']) ? '.'.$pathinfo['extension'] : '';
-		$name = $pathinfo['filename'];
-		$dir = $pathinfo['dirname'];
-		$i = 2;
-		while ($view->file_exists($path) || in_array($path, $excludeList)) {
-			$path = Filesystem::normalizePath($dir . '/' . $name . ' ('.$i.')' . $ext);
-			$i++;
-		}
+    /**
+     * check if file name already exists and generate unique target
+     *
+     * @param string $path
+     * @param array $excludeList
+     * @param View $view
+     * @return string $path
+     */
+    public static function generateUniqueTarget($path, $excludeList, $view) {
+        $pathinfo = pathinfo($path);
+        $ext = isset($pathinfo['extension']) ? '.'.$pathinfo['extension'] : '';
+        $name = $pathinfo['filename'];
+        $dir = $pathinfo['dirname'];
+        $i = 2;
+        while ($view->file_exists($path) || in_array($path, $excludeList)) {
+            $path = Filesystem::normalizePath($dir . '/' . $name . ' ('.$i.')' . $ext);
+            $i++;
+        }
 
-		return $path;
-	}
+        return $path;
+    }
 
-	/**
-	 * get default share folder
-	 *
-	 * @param \OC\Files\View
-	 * @return string
-	 */
-	public static function getShareFolder($view = null) {
-		if ($view === null) {
-			$view = Filesystem::getView();
-		}
-		$shareFolder = \OC::$server->getConfig()->getSystemValue('share_folder', '/');
-		$shareFolder = Filesystem::normalizePath($shareFolder);
+    /**
+     * get default share folder
+     *
+     * @param \OC\Files\View
+     * @return string
+     */
+    public static function getShareFolder($view = null) {
+        if ($view === null) {
+            $view = Filesystem::getView();
+        }
+        $shareFolder = \OC::$server->getConfig()->getSystemValue('share_folder', '/');
+        $shareFolder = Filesystem::normalizePath($shareFolder);
 
-		if (!$view->file_exists($shareFolder)) {
-			$dir = '';
-			$subdirs = explode('/', $shareFolder);
-			foreach ($subdirs as $subdir) {
-				$dir = $dir . '/' . $subdir;
-				if (!$view->is_dir($dir)) {
-					$view->mkdir($dir);
-				}
-			}
-		}
+        if (!$view->file_exists($shareFolder)) {
+            $dir = '';
+            $subdirs = explode('/', $shareFolder);
+            foreach ($subdirs as $subdir) {
+                $dir = $dir . '/' . $subdir;
+                if (!$view->is_dir($dir)) {
+                    $view->mkdir($dir);
+                }
+            }
+        }
 
-		return $shareFolder;
+        return $shareFolder;
 
-	}
+    }
 
-	/**
-	 * set default share folder
-	 *
-	 * @param string $shareFolder
-	 */
-	public static function setShareFolder($shareFolder) {
-		\OC::$server->getConfig()->setSystemValue('share_folder', $shareFolder);
-	}
+    /**
+     * set default share folder
+     *
+     * @param string $shareFolder
+     */
+    public static function setShareFolder($shareFolder) {
+        \OC::$server->getConfig()->setSystemValue('share_folder', $shareFolder);
+    }
 
 }

apps/updatenotification/appinfo/routes.php

Indentation +7 added lines, -7 removed lines

@@ -22,11 +22,11 @@
  */
 
 return [
-	'routes' => [
-		['name' => 'Admin#createCredentials', 'url' => '/credentials', 'verb' => 'GET'],
-		['name' => 'Admin#setChannel', 'url' => '/channel', 'verb' => 'POST'],
-	],
-	'ocs' => [
-		['name' => 'API#getAppList', 'url' => '/api/{apiVersion}/applist/{newVersion}', 'verb' => 'GET', 'requirements' => ['apiVersion' => 'v1']],
-	],
+    'routes' => [
+        ['name' => 'Admin#createCredentials', 'url' => '/credentials', 'verb' => 'GET'],
+        ['name' => 'Admin#setChannel', 'url' => '/channel', 'verb' => 'POST'],
+    ],
+    'ocs' => [
+        ['name' => 'API#getAppList', 'url' => '/api/{apiVersion}/applist/{newVersion}', 'verb' => 'GET', 'requirements' => ['apiVersion' => 'v1']],
+    ],
 ];

apps/encryption/lib/Session.php

Indentation +153 added lines, -153 removed lines

@@ -30,158 +30,158 @@
 
 class Session {
 
-	/** @var ISession */
-	protected $session;
-
-	const NOT_INITIALIZED = '0';
-	const INIT_EXECUTED = '1';
-	const INIT_SUCCESSFUL = '2';
-
-	/**
-	 * @param ISession $session
-	 */
-	public function __construct(ISession $session) {
-		$this->session = $session;
-	}
-
-	/**
-	 * Sets status of encryption app
-	 *
-	 * @param string $status INIT_SUCCESSFUL, INIT_EXECUTED, NOT_INITIALIZED
-	 */
-	public function setStatus($status) {
-		$this->session->set('encryptionInitialized', $status);
-	}
-
-	/**
-	 * Gets status if we already tried to initialize the encryption app
-	 *
-	 * @return string init status INIT_SUCCESSFUL, INIT_EXECUTED, NOT_INITIALIZED
-	 */
-	public function getStatus() {
-		$status = $this->session->get('encryptionInitialized');
-		if (is_null($status)) {
-			$status = self::NOT_INITIALIZED;
-		}
-
-		return $status;
-	}
-
-	/**
-	 * check if encryption was initialized successfully
-	 *
-	 * @return bool
-	 */
-	public function isReady() {
-		$status = $this->getStatus();
-		return $status === self::INIT_SUCCESSFUL;
-	}
-
-	/**
-	 * Gets user or public share private key from session
-	 *
-	 * @return string $privateKey The user's plaintext private key
-	 * @throws Exceptions\PrivateKeyMissingException
-	 */
-	public function getPrivateKey() {
-		$key = $this->session->get('privateKey');
-		if (is_null($key)) {
-			throw new Exceptions\PrivateKeyMissingException('please try to log-out and log-in again', 0);
-		}
-		return $key;
-	}
-
-	/**
-	 * check if private key is set
-	 *
-	 * @return boolean
-	 */
-	public function isPrivateKeySet() {
-		$key = $this->session->get('privateKey');
-		if (is_null($key)) {
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * Sets user private key to session
-	 *
-	 * @param string $key users private key
-	 *
-	 * @note this should only be set on login
-	 */
-	public function setPrivateKey($key) {
-		$this->session->set('privateKey', $key);
-	}
-
-	/**
-	 * store data needed for the decrypt all operation in the session
-	 *
-	 * @param string $user
-	 * @param string $key
-	 */
-	public function prepareDecryptAll($user, $key) {
-		$this->session->set('decryptAll', true);
-		$this->session->set('decryptAllKey', $key);
-		$this->session->set('decryptAllUid', $user);
-	}
-
-	/**
-	 * check if we are in decrypt all mode
-	 *
-	 * @return bool
-	 */
-	public function decryptAllModeActivated() {
-		$decryptAll = $this->session->get('decryptAll');
-		return ($decryptAll === true);
-	}
-
-	/**
-	 * get uid used for decrypt all operation
-	 *
-	 * @return string
-	 * @throws \Exception
-	 */
-	public function getDecryptAllUid() {
-		$uid = $this->session->get('decryptAllUid');
-		if (is_null($uid) && $this->decryptAllModeActivated()) {
-			throw new \Exception('No uid found while in decrypt all mode');
-		} elseif (is_null($uid)) {
-			throw new \Exception('Please activate decrypt all mode first');
-		}
-
-		return $uid;
-	}
-
-	/**
-	 * get private key for decrypt all operation
-	 *
-	 * @return string
-	 * @throws PrivateKeyMissingException
-	 */
-	public function getDecryptAllKey() {
-		$privateKey = $this->session->get('decryptAllKey');
-		if (is_null($privateKey) && $this->decryptAllModeActivated()) {
-			throw new PrivateKeyMissingException('No private key found while in decrypt all mode');
-		} elseif (is_null($privateKey)) {
-			throw new PrivateKeyMissingException('Please activate decrypt all mode first');
-		}
-
-		return $privateKey;
-	}
-
-	/**
-	 * remove keys from session
-	 */
-	public function clear() {
-		$this->session->remove('publicSharePrivateKey');
-		$this->session->remove('privateKey');
-		$this->session->remove('encryptionInitialized');
-		$this->session->remove('decryptAll');
-		$this->session->remove('decryptAllKey');
-		$this->session->remove('decryptAllUid');
-	}
+    /** @var ISession */
+    protected $session;
+
+    const NOT_INITIALIZED = '0';
+    const INIT_EXECUTED = '1';
+    const INIT_SUCCESSFUL = '2';
+
+    /**
+     * @param ISession $session
+     */
+    public function __construct(ISession $session) {
+        $this->session = $session;
+    }
+
+    /**
+     * Sets status of encryption app
+     *
+     * @param string $status INIT_SUCCESSFUL, INIT_EXECUTED, NOT_INITIALIZED
+     */
+    public function setStatus($status) {
+        $this->session->set('encryptionInitialized', $status);
+    }
+
+    /**
+     * Gets status if we already tried to initialize the encryption app
+     *
+     * @return string init status INIT_SUCCESSFUL, INIT_EXECUTED, NOT_INITIALIZED
+     */
+    public function getStatus() {
+        $status = $this->session->get('encryptionInitialized');
+        if (is_null($status)) {
+            $status = self::NOT_INITIALIZED;
+        }
+
+        return $status;
+    }
+
+    /**
+     * check if encryption was initialized successfully
+     *
+     * @return bool
+     */
+    public function isReady() {
+        $status = $this->getStatus();
+        return $status === self::INIT_SUCCESSFUL;
+    }
+
+    /**
+     * Gets user or public share private key from session
+     *
+     * @return string $privateKey The user's plaintext private key
+     * @throws Exceptions\PrivateKeyMissingException
+     */
+    public function getPrivateKey() {
+        $key = $this->session->get('privateKey');
+        if (is_null($key)) {
+            throw new Exceptions\PrivateKeyMissingException('please try to log-out and log-in again', 0);
+        }
+        return $key;
+    }
+
+    /**
+     * check if private key is set
+     *
+     * @return boolean
+     */
+    public function isPrivateKeySet() {
+        $key = $this->session->get('privateKey');
+        if (is_null($key)) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Sets user private key to session
+     *
+     * @param string $key users private key
+     *
+     * @note this should only be set on login
+     */
+    public function setPrivateKey($key) {
+        $this->session->set('privateKey', $key);
+    }
+
+    /**
+     * store data needed for the decrypt all operation in the session
+     *
+     * @param string $user
+     * @param string $key
+     */
+    public function prepareDecryptAll($user, $key) {
+        $this->session->set('decryptAll', true);
+        $this->session->set('decryptAllKey', $key);
+        $this->session->set('decryptAllUid', $user);
+    }
+
+    /**
+     * check if we are in decrypt all mode
+     *
+     * @return bool
+     */
+    public function decryptAllModeActivated() {
+        $decryptAll = $this->session->get('decryptAll');
+        return ($decryptAll === true);
+    }
+
+    /**
+     * get uid used for decrypt all operation
+     *
+     * @return string
+     * @throws \Exception
+     */
+    public function getDecryptAllUid() {
+        $uid = $this->session->get('decryptAllUid');
+        if (is_null($uid) && $this->decryptAllModeActivated()) {
+            throw new \Exception('No uid found while in decrypt all mode');
+        } elseif (is_null($uid)) {
+            throw new \Exception('Please activate decrypt all mode first');
+        }
+
+        return $uid;
+    }
+
+    /**
+     * get private key for decrypt all operation
+     *
+     * @return string
+     * @throws PrivateKeyMissingException
+     */
+    public function getDecryptAllKey() {
+        $privateKey = $this->session->get('decryptAllKey');
+        if (is_null($privateKey) && $this->decryptAllModeActivated()) {
+            throw new PrivateKeyMissingException('No private key found while in decrypt all mode');
+        } elseif (is_null($privateKey)) {
+            throw new PrivateKeyMissingException('Please activate decrypt all mode first');
+        }
+
+        return $privateKey;
+    }
+
+    /**
+     * remove keys from session
+     */
+    public function clear() {
+        $this->session->remove('publicSharePrivateKey');
+        $this->session->remove('privateKey');
+        $this->session->remove('encryptionInitialized');
+        $this->session->remove('decryptAll');
+        $this->session->remove('decryptAllKey');
+        $this->session->remove('decryptAllUid');
+    }
 
 }