@@ -31,34 +31,34 @@ |
||
| 31 | 31 | |
| 32 | 32 | class EMailProvider implements IProvider { |
| 33 | 33 | |
| 34 | - /** @var IActionFactory */ |
|
| 35 | - private $actionFactory; |
|
| 34 | + /** @var IActionFactory */ |
|
| 35 | + private $actionFactory; |
|
| 36 | 36 | |
| 37 | - /** @var IURLGenerator */ |
|
| 38 | - private $urlGenerator; |
|
| 37 | + /** @var IURLGenerator */ |
|
| 38 | + private $urlGenerator; |
|
| 39 | 39 | |
| 40 | - /** |
|
| 41 | - * @param IActionFactory $actionFactory |
|
| 42 | - * @param IURLGenerator $urlGenerator |
|
| 43 | - */ |
|
| 44 | - public function __construct(IActionFactory $actionFactory, IURLGenerator $urlGenerator) { |
|
| 45 | - $this->actionFactory = $actionFactory; |
|
| 46 | - $this->urlGenerator = $urlGenerator; |
|
| 47 | - } |
|
| 40 | + /** |
|
| 41 | + * @param IActionFactory $actionFactory |
|
| 42 | + * @param IURLGenerator $urlGenerator |
|
| 43 | + */ |
|
| 44 | + public function __construct(IActionFactory $actionFactory, IURLGenerator $urlGenerator) { |
|
| 45 | + $this->actionFactory = $actionFactory; |
|
| 46 | + $this->urlGenerator = $urlGenerator; |
|
| 47 | + } |
|
| 48 | 48 | |
| 49 | - /** |
|
| 50 | - * @param IEntry $entry |
|
| 51 | - */ |
|
| 52 | - public function process(IEntry $entry) { |
|
| 53 | - $iconUrl = $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/mail.svg')); |
|
| 54 | - foreach ($entry->getEMailAddresses() as $address) { |
|
| 55 | - if (empty($address)) { |
|
| 56 | - // Skip |
|
| 57 | - continue; |
|
| 58 | - } |
|
| 59 | - $action = $this->actionFactory->newEMailAction($iconUrl, $address, $address); |
|
| 60 | - $entry->addAction($action); |
|
| 61 | - } |
|
| 62 | - } |
|
| 49 | + /** |
|
| 50 | + * @param IEntry $entry |
|
| 51 | + */ |
|
| 52 | + public function process(IEntry $entry) { |
|
| 53 | + $iconUrl = $this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath('core', 'actions/mail.svg')); |
|
| 54 | + foreach ($entry->getEMailAddresses() as $address) { |
|
| 55 | + if (empty($address)) { |
|
| 56 | + // Skip |
|
| 57 | + continue; |
|
| 58 | + } |
|
| 59 | + $action = $this->actionFactory->newEMailAction($iconUrl, $address, $address); |
|
| 60 | + $entry->addAction($action); |
|
| 61 | + } |
|
| 62 | + } |
|
| 63 | 63 | |
| 64 | 64 | } |
@@ -112,7 +112,7 @@ discard block |
||
| 112 | 112 | $json = file_get_contents('php://stdin'); |
| 113 | 113 | } else { |
| 114 | 114 | if (!file_exists($path)) { |
| 115 | - $output->writeln('<error>File not found: ' . $path . '</error>'); |
|
| 115 | + $output->writeln('<error>File not found: '.$path.'</error>'); |
|
| 116 | 116 | return 1; |
| 117 | 117 | } |
| 118 | 118 | $json = file_get_contents($path); |
@@ -164,7 +164,7 @@ discard block |
||
| 164 | 164 | $existingMount->getApplicableUsers() === $mount->getApplicableUsers() && |
| 165 | 165 | $existingMount->getBackendOptions() === $mount->getBackendOptions() |
| 166 | 166 | ) { |
| 167 | - $output->writeln("<error>Duplicate mount (" . $mount->getMountPoint() . ")</error>"); |
|
| 167 | + $output->writeln("<error>Duplicate mount (".$mount->getMountPoint().")</error>"); |
|
| 168 | 168 | return 1; |
| 169 | 169 | } |
| 170 | 170 | } |
@@ -41,187 +41,187 @@ |
||
| 41 | 41 | use Symfony\Component\Console\Output\OutputInterface; |
| 42 | 42 | |
| 43 | 43 | class Import extends Base { |
| 44 | - /** |
|
| 45 | - * @var GlobalStoragesService |
|
| 46 | - */ |
|
| 47 | - private $globalService; |
|
| 48 | - |
|
| 49 | - /** |
|
| 50 | - * @var UserStoragesService |
|
| 51 | - */ |
|
| 52 | - private $userService; |
|
| 53 | - |
|
| 54 | - /** |
|
| 55 | - * @var IUserSession |
|
| 56 | - */ |
|
| 57 | - private $userSession; |
|
| 58 | - |
|
| 59 | - /** |
|
| 60 | - * @var IUserManager |
|
| 61 | - */ |
|
| 62 | - private $userManager; |
|
| 63 | - |
|
| 64 | - /** @var ImportLegacyStoragesService */ |
|
| 65 | - private $importLegacyStorageService; |
|
| 66 | - |
|
| 67 | - /** @var BackendService */ |
|
| 68 | - private $backendService; |
|
| 69 | - |
|
| 70 | - public function __construct(GlobalStoragesService $globalService, |
|
| 71 | - UserStoragesService $userService, |
|
| 72 | - IUserSession $userSession, |
|
| 73 | - IUserManager $userManager, |
|
| 74 | - ImportLegacyStoragesService $importLegacyStorageService, |
|
| 75 | - BackendService $backendService |
|
| 76 | - ) { |
|
| 77 | - parent::__construct(); |
|
| 78 | - $this->globalService = $globalService; |
|
| 79 | - $this->userService = $userService; |
|
| 80 | - $this->userSession = $userSession; |
|
| 81 | - $this->userManager = $userManager; |
|
| 82 | - $this->importLegacyStorageService = $importLegacyStorageService; |
|
| 83 | - $this->backendService = $backendService; |
|
| 84 | - } |
|
| 85 | - |
|
| 86 | - protected function configure() { |
|
| 87 | - $this |
|
| 88 | - ->setName('files_external:import') |
|
| 89 | - ->setDescription('Import mount configurations') |
|
| 90 | - ->addOption( |
|
| 91 | - 'user', |
|
| 92 | - '', |
|
| 93 | - InputOption::VALUE_OPTIONAL, |
|
| 94 | - 'user to add the mount configurations for, if not set the mount will be added as system mount' |
|
| 95 | - ) |
|
| 96 | - ->addArgument( |
|
| 97 | - 'path', |
|
| 98 | - InputArgument::REQUIRED, |
|
| 99 | - 'path to a json file containing the mounts to import, use "-" to read from stdin' |
|
| 100 | - ) |
|
| 101 | - ->addOption( |
|
| 102 | - 'dry', |
|
| 103 | - '', |
|
| 104 | - InputOption::VALUE_NONE, |
|
| 105 | - 'Don\'t save the imported mounts, only list the new mounts' |
|
| 106 | - ); |
|
| 107 | - parent::configure(); |
|
| 108 | - } |
|
| 109 | - |
|
| 110 | - protected function execute(InputInterface $input, OutputInterface $output): int { |
|
| 111 | - $user = $input->getOption('user'); |
|
| 112 | - $path = $input->getArgument('path'); |
|
| 113 | - if ($path === '-') { |
|
| 114 | - $json = file_get_contents('php://stdin'); |
|
| 115 | - } else { |
|
| 116 | - if (!file_exists($path)) { |
|
| 117 | - $output->writeln('<error>File not found: ' . $path . '</error>'); |
|
| 118 | - return 1; |
|
| 119 | - } |
|
| 120 | - $json = file_get_contents($path); |
|
| 121 | - } |
|
| 122 | - if (!is_string($json) || strlen($json) < 2) { |
|
| 123 | - $output->writeln('<error>Error while reading json</error>'); |
|
| 124 | - return 1; |
|
| 125 | - } |
|
| 126 | - $data = json_decode($json, true); |
|
| 127 | - if (!is_array($data)) { |
|
| 128 | - $output->writeln('<error>Error while parsing json</error>'); |
|
| 129 | - return 1; |
|
| 130 | - } |
|
| 131 | - |
|
| 132 | - $isLegacy = isset($data['user']) || isset($data['group']); |
|
| 133 | - if ($isLegacy) { |
|
| 134 | - $this->importLegacyStorageService->setData($data); |
|
| 135 | - $mounts = $this->importLegacyStorageService->getAllStorages(); |
|
| 136 | - foreach ($mounts as $mount) { |
|
| 137 | - if ($mount->getBackendOption('password') === false) { |
|
| 138 | - $output->writeln('<error>Failed to decrypt password</error>'); |
|
| 139 | - return 1; |
|
| 140 | - } |
|
| 141 | - } |
|
| 142 | - } else { |
|
| 143 | - if (!isset($data[0])) { //normalize to an array of mounts |
|
| 144 | - $data = [$data]; |
|
| 145 | - } |
|
| 146 | - $mounts = array_map([$this, 'parseData'], $data); |
|
| 147 | - } |
|
| 148 | - |
|
| 149 | - if ($user) { |
|
| 150 | - // ensure applicables are correct for personal mounts |
|
| 151 | - foreach ($mounts as $mount) { |
|
| 152 | - $mount->setApplicableGroups([]); |
|
| 153 | - $mount->setApplicableUsers([$user]); |
|
| 154 | - } |
|
| 155 | - } |
|
| 156 | - |
|
| 157 | - $storageService = $this->getStorageService($user); |
|
| 158 | - |
|
| 159 | - $existingMounts = $storageService->getAllStorages(); |
|
| 160 | - |
|
| 161 | - foreach ($mounts as $mount) { |
|
| 162 | - foreach ($existingMounts as $existingMount) { |
|
| 163 | - if ( |
|
| 164 | - $existingMount->getMountPoint() === $mount->getMountPoint() && |
|
| 165 | - $existingMount->getApplicableGroups() === $mount->getApplicableGroups() && |
|
| 166 | - $existingMount->getApplicableUsers() === $mount->getApplicableUsers() && |
|
| 167 | - $existingMount->getBackendOptions() === $mount->getBackendOptions() |
|
| 168 | - ) { |
|
| 169 | - $output->writeln("<error>Duplicate mount (" . $mount->getMountPoint() . ")</error>"); |
|
| 170 | - return 1; |
|
| 171 | - } |
|
| 172 | - } |
|
| 173 | - } |
|
| 174 | - |
|
| 175 | - if ($input->getOption('dry')) { |
|
| 176 | - if (count($mounts) === 0) { |
|
| 177 | - $output->writeln('<error>No mounts to be imported</error>'); |
|
| 178 | - return 1; |
|
| 179 | - } |
|
| 180 | - $listCommand = new ListCommand($this->globalService, $this->userService, $this->userSession, $this->userManager); |
|
| 181 | - $listInput = new ArrayInput([], $listCommand->getDefinition()); |
|
| 182 | - $listInput->setOption('output', $input->getOption('output')); |
|
| 183 | - $listInput->setOption('show-password', true); |
|
| 184 | - $listCommand->listMounts($user, $mounts, $listInput, $output); |
|
| 185 | - } else { |
|
| 186 | - foreach ($mounts as $mount) { |
|
| 187 | - $storageService->addStorage($mount); |
|
| 188 | - } |
|
| 189 | - } |
|
| 190 | - return 0; |
|
| 191 | - } |
|
| 192 | - |
|
| 193 | - private function parseData(array $data) { |
|
| 194 | - $mount = new StorageConfig($data['mount_id']); |
|
| 195 | - $mount->setMountPoint($data['mount_point']); |
|
| 196 | - $mount->setBackend($this->getBackendByClass($data['storage'])); |
|
| 197 | - $authBackend = $this->backendService->getAuthMechanism($data['authentication_type']); |
|
| 198 | - $mount->setAuthMechanism($authBackend); |
|
| 199 | - $mount->setBackendOptions($data['configuration']); |
|
| 200 | - $mount->setMountOptions($data['options']); |
|
| 201 | - $mount->setApplicableUsers(isset($data['applicable_users']) ? $data['applicable_users'] : []); |
|
| 202 | - $mount->setApplicableGroups(isset($data['applicable_groups']) ? $data['applicable_groups'] : []); |
|
| 203 | - return $mount; |
|
| 204 | - } |
|
| 205 | - |
|
| 206 | - private function getBackendByClass($className) { |
|
| 207 | - $backends = $this->backendService->getBackends(); |
|
| 208 | - foreach ($backends as $backend) { |
|
| 209 | - if ($backend->getStorageClass() === $className) { |
|
| 210 | - return $backend; |
|
| 211 | - } |
|
| 212 | - } |
|
| 213 | - } |
|
| 214 | - |
|
| 215 | - protected function getStorageService($userId) { |
|
| 216 | - if (!empty($userId)) { |
|
| 217 | - $user = $this->userManager->get($userId); |
|
| 218 | - if (is_null($user)) { |
|
| 219 | - throw new NoUserException("user $userId not found"); |
|
| 220 | - } |
|
| 221 | - $this->userSession->setUser($user); |
|
| 222 | - return $this->userService; |
|
| 223 | - } else { |
|
| 224 | - return $this->globalService; |
|
| 225 | - } |
|
| 226 | - } |
|
| 44 | + /** |
|
| 45 | + * @var GlobalStoragesService |
|
| 46 | + */ |
|
| 47 | + private $globalService; |
|
| 48 | + |
|
| 49 | + /** |
|
| 50 | + * @var UserStoragesService |
|
| 51 | + */ |
|
| 52 | + private $userService; |
|
| 53 | + |
|
| 54 | + /** |
|
| 55 | + * @var IUserSession |
|
| 56 | + */ |
|
| 57 | + private $userSession; |
|
| 58 | + |
|
| 59 | + /** |
|
| 60 | + * @var IUserManager |
|
| 61 | + */ |
|
| 62 | + private $userManager; |
|
| 63 | + |
|
| 64 | + /** @var ImportLegacyStoragesService */ |
|
| 65 | + private $importLegacyStorageService; |
|
| 66 | + |
|
| 67 | + /** @var BackendService */ |
|
| 68 | + private $backendService; |
|
| 69 | + |
|
| 70 | + public function __construct(GlobalStoragesService $globalService, |
|
| 71 | + UserStoragesService $userService, |
|
| 72 | + IUserSession $userSession, |
|
| 73 | + IUserManager $userManager, |
|
| 74 | + ImportLegacyStoragesService $importLegacyStorageService, |
|
| 75 | + BackendService $backendService |
|
| 76 | + ) { |
|
| 77 | + parent::__construct(); |
|
| 78 | + $this->globalService = $globalService; |
|
| 79 | + $this->userService = $userService; |
|
| 80 | + $this->userSession = $userSession; |
|
| 81 | + $this->userManager = $userManager; |
|
| 82 | + $this->importLegacyStorageService = $importLegacyStorageService; |
|
| 83 | + $this->backendService = $backendService; |
|
| 84 | + } |
|
| 85 | + |
|
| 86 | + protected function configure() { |
|
| 87 | + $this |
|
| 88 | + ->setName('files_external:import') |
|
| 89 | + ->setDescription('Import mount configurations') |
|
| 90 | + ->addOption( |
|
| 91 | + 'user', |
|
| 92 | + '', |
|
| 93 | + InputOption::VALUE_OPTIONAL, |
|
| 94 | + 'user to add the mount configurations for, if not set the mount will be added as system mount' |
|
| 95 | + ) |
|
| 96 | + ->addArgument( |
|
| 97 | + 'path', |
|
| 98 | + InputArgument::REQUIRED, |
|
| 99 | + 'path to a json file containing the mounts to import, use "-" to read from stdin' |
|
| 100 | + ) |
|
| 101 | + ->addOption( |
|
| 102 | + 'dry', |
|
| 103 | + '', |
|
| 104 | + InputOption::VALUE_NONE, |
|
| 105 | + 'Don\'t save the imported mounts, only list the new mounts' |
|
| 106 | + ); |
|
| 107 | + parent::configure(); |
|
| 108 | + } |
|
| 109 | + |
|
| 110 | + protected function execute(InputInterface $input, OutputInterface $output): int { |
|
| 111 | + $user = $input->getOption('user'); |
|
| 112 | + $path = $input->getArgument('path'); |
|
| 113 | + if ($path === '-') { |
|
| 114 | + $json = file_get_contents('php://stdin'); |
|
| 115 | + } else { |
|
| 116 | + if (!file_exists($path)) { |
|
| 117 | + $output->writeln('<error>File not found: ' . $path . '</error>'); |
|
| 118 | + return 1; |
|
| 119 | + } |
|
| 120 | + $json = file_get_contents($path); |
|
| 121 | + } |
|
| 122 | + if (!is_string($json) || strlen($json) < 2) { |
|
| 123 | + $output->writeln('<error>Error while reading json</error>'); |
|
| 124 | + return 1; |
|
| 125 | + } |
|
| 126 | + $data = json_decode($json, true); |
|
| 127 | + if (!is_array($data)) { |
|
| 128 | + $output->writeln('<error>Error while parsing json</error>'); |
|
| 129 | + return 1; |
|
| 130 | + } |
|
| 131 | + |
|
| 132 | + $isLegacy = isset($data['user']) || isset($data['group']); |
|
| 133 | + if ($isLegacy) { |
|
| 134 | + $this->importLegacyStorageService->setData($data); |
|
| 135 | + $mounts = $this->importLegacyStorageService->getAllStorages(); |
|
| 136 | + foreach ($mounts as $mount) { |
|
| 137 | + if ($mount->getBackendOption('password') === false) { |
|
| 138 | + $output->writeln('<error>Failed to decrypt password</error>'); |
|
| 139 | + return 1; |
|
| 140 | + } |
|
| 141 | + } |
|
| 142 | + } else { |
|
| 143 | + if (!isset($data[0])) { //normalize to an array of mounts |
|
| 144 | + $data = [$data]; |
|
| 145 | + } |
|
| 146 | + $mounts = array_map([$this, 'parseData'], $data); |
|
| 147 | + } |
|
| 148 | + |
|
| 149 | + if ($user) { |
|
| 150 | + // ensure applicables are correct for personal mounts |
|
| 151 | + foreach ($mounts as $mount) { |
|
| 152 | + $mount->setApplicableGroups([]); |
|
| 153 | + $mount->setApplicableUsers([$user]); |
|
| 154 | + } |
|
| 155 | + } |
|
| 156 | + |
|
| 157 | + $storageService = $this->getStorageService($user); |
|
| 158 | + |
|
| 159 | + $existingMounts = $storageService->getAllStorages(); |
|
| 160 | + |
|
| 161 | + foreach ($mounts as $mount) { |
|
| 162 | + foreach ($existingMounts as $existingMount) { |
|
| 163 | + if ( |
|
| 164 | + $existingMount->getMountPoint() === $mount->getMountPoint() && |
|
| 165 | + $existingMount->getApplicableGroups() === $mount->getApplicableGroups() && |
|
| 166 | + $existingMount->getApplicableUsers() === $mount->getApplicableUsers() && |
|
| 167 | + $existingMount->getBackendOptions() === $mount->getBackendOptions() |
|
| 168 | + ) { |
|
| 169 | + $output->writeln("<error>Duplicate mount (" . $mount->getMountPoint() . ")</error>"); |
|
| 170 | + return 1; |
|
| 171 | + } |
|
| 172 | + } |
|
| 173 | + } |
|
| 174 | + |
|
| 175 | + if ($input->getOption('dry')) { |
|
| 176 | + if (count($mounts) === 0) { |
|
| 177 | + $output->writeln('<error>No mounts to be imported</error>'); |
|
| 178 | + return 1; |
|
| 179 | + } |
|
| 180 | + $listCommand = new ListCommand($this->globalService, $this->userService, $this->userSession, $this->userManager); |
|
| 181 | + $listInput = new ArrayInput([], $listCommand->getDefinition()); |
|
| 182 | + $listInput->setOption('output', $input->getOption('output')); |
|
| 183 | + $listInput->setOption('show-password', true); |
|
| 184 | + $listCommand->listMounts($user, $mounts, $listInput, $output); |
|
| 185 | + } else { |
|
| 186 | + foreach ($mounts as $mount) { |
|
| 187 | + $storageService->addStorage($mount); |
|
| 188 | + } |
|
| 189 | + } |
|
| 190 | + return 0; |
|
| 191 | + } |
|
| 192 | + |
|
| 193 | + private function parseData(array $data) { |
|
| 194 | + $mount = new StorageConfig($data['mount_id']); |
|
| 195 | + $mount->setMountPoint($data['mount_point']); |
|
| 196 | + $mount->setBackend($this->getBackendByClass($data['storage'])); |
|
| 197 | + $authBackend = $this->backendService->getAuthMechanism($data['authentication_type']); |
|
| 198 | + $mount->setAuthMechanism($authBackend); |
|
| 199 | + $mount->setBackendOptions($data['configuration']); |
|
| 200 | + $mount->setMountOptions($data['options']); |
|
| 201 | + $mount->setApplicableUsers(isset($data['applicable_users']) ? $data['applicable_users'] : []); |
|
| 202 | + $mount->setApplicableGroups(isset($data['applicable_groups']) ? $data['applicable_groups'] : []); |
|
| 203 | + return $mount; |
|
| 204 | + } |
|
| 205 | + |
|
| 206 | + private function getBackendByClass($className) { |
|
| 207 | + $backends = $this->backendService->getBackends(); |
|
| 208 | + foreach ($backends as $backend) { |
|
| 209 | + if ($backend->getStorageClass() === $className) { |
|
| 210 | + return $backend; |
|
| 211 | + } |
|
| 212 | + } |
|
| 213 | + } |
|
| 214 | + |
|
| 215 | + protected function getStorageService($userId) { |
|
| 216 | + if (!empty($userId)) { |
|
| 217 | + $user = $this->userManager->get($userId); |
|
| 218 | + if (is_null($user)) { |
|
| 219 | + throw new NoUserException("user $userId not found"); |
|
| 220 | + } |
|
| 221 | + $this->userSession->setUser($user); |
|
| 222 | + return $this->userService; |
|
| 223 | + } else { |
|
| 224 | + return $this->globalService; |
|
| 225 | + } |
|
| 226 | + } |
|
| 227 | 227 | } |
@@ -34,20 +34,20 @@ |
||
| 34 | 34 | * @method void setName(string $name) |
| 35 | 35 | */ |
| 36 | 36 | class Client extends Entity { |
| 37 | - /** @var string */ |
|
| 38 | - protected $name; |
|
| 39 | - /** @var string */ |
|
| 40 | - protected $redirectUri; |
|
| 41 | - /** @var string */ |
|
| 42 | - protected $clientIdentifier; |
|
| 43 | - /** @var string */ |
|
| 44 | - protected $secret; |
|
| 37 | + /** @var string */ |
|
| 38 | + protected $name; |
|
| 39 | + /** @var string */ |
|
| 40 | + protected $redirectUri; |
|
| 41 | + /** @var string */ |
|
| 42 | + protected $clientIdentifier; |
|
| 43 | + /** @var string */ |
|
| 44 | + protected $secret; |
|
| 45 | 45 | |
| 46 | - public function __construct() { |
|
| 47 | - $this->addType('id', 'int'); |
|
| 48 | - $this->addType('name', 'string'); |
|
| 49 | - $this->addType('redirect_uri', 'string'); |
|
| 50 | - $this->addType('client_identifier', 'string'); |
|
| 51 | - $this->addType('secret', 'string'); |
|
| 52 | - } |
|
| 46 | + public function __construct() { |
|
| 47 | + $this->addType('id', 'int'); |
|
| 48 | + $this->addType('name', 'string'); |
|
| 49 | + $this->addType('redirect_uri', 'string'); |
|
| 50 | + $this->addType('client_identifier', 'string'); |
|
| 51 | + $this->addType('secret', 'string'); |
|
| 52 | + } |
|
| 53 | 53 | } |
@@ -31,31 +31,31 @@ |
||
| 31 | 31 | */ |
| 32 | 32 | interface ICredentials { |
| 33 | 33 | |
| 34 | - /** |
|
| 35 | - * Get the user UID |
|
| 36 | - * |
|
| 37 | - * @since 12 |
|
| 38 | - * |
|
| 39 | - * @return string |
|
| 40 | - */ |
|
| 41 | - public function getUID(); |
|
| 34 | + /** |
|
| 35 | + * Get the user UID |
|
| 36 | + * |
|
| 37 | + * @since 12 |
|
| 38 | + * |
|
| 39 | + * @return string |
|
| 40 | + */ |
|
| 41 | + public function getUID(); |
|
| 42 | 42 | |
| 43 | - /** |
|
| 44 | - * Get the login name the users used to login |
|
| 45 | - * |
|
| 46 | - * @since 12 |
|
| 47 | - * |
|
| 48 | - * @return string |
|
| 49 | - */ |
|
| 50 | - public function getLoginName(); |
|
| 43 | + /** |
|
| 44 | + * Get the login name the users used to login |
|
| 45 | + * |
|
| 46 | + * @since 12 |
|
| 47 | + * |
|
| 48 | + * @return string |
|
| 49 | + */ |
|
| 50 | + public function getLoginName(); |
|
| 51 | 51 | |
| 52 | - /** |
|
| 53 | - * Get the password |
|
| 54 | - * |
|
| 55 | - * @since 12 |
|
| 56 | - * |
|
| 57 | - * @return string |
|
| 58 | - * @throws PasswordUnavailableException |
|
| 59 | - */ |
|
| 60 | - public function getPassword(); |
|
| 52 | + /** |
|
| 53 | + * Get the password |
|
| 54 | + * |
|
| 55 | + * @since 12 |
|
| 56 | + * |
|
| 57 | + * @return string |
|
| 58 | + * @throws PasswordUnavailableException |
|
| 59 | + */ |
|
| 60 | + public function getPassword(); |
|
| 61 | 61 | } |
@@ -24,25 +24,25 @@ |
||
| 24 | 24 | namespace OC\Files\Cache\Wrapper; |
| 25 | 25 | |
| 26 | 26 | class CachePermissionsMask extends CacheWrapper { |
| 27 | - /** |
|
| 28 | - * @var int |
|
| 29 | - */ |
|
| 30 | - protected $mask; |
|
| 27 | + /** |
|
| 28 | + * @var int |
|
| 29 | + */ |
|
| 30 | + protected $mask; |
|
| 31 | 31 | |
| 32 | - /** |
|
| 33 | - * @param \OCP\Files\Cache\ICache $cache |
|
| 34 | - * @param int $mask |
|
| 35 | - */ |
|
| 36 | - public function __construct($cache, $mask) { |
|
| 37 | - parent::__construct($cache); |
|
| 38 | - $this->mask = $mask; |
|
| 39 | - } |
|
| 32 | + /** |
|
| 33 | + * @param \OCP\Files\Cache\ICache $cache |
|
| 34 | + * @param int $mask |
|
| 35 | + */ |
|
| 36 | + public function __construct($cache, $mask) { |
|
| 37 | + parent::__construct($cache); |
|
| 38 | + $this->mask = $mask; |
|
| 39 | + } |
|
| 40 | 40 | |
| 41 | - protected function formatCacheEntry($entry) { |
|
| 42 | - if (isset($entry['permissions'])) { |
|
| 43 | - $entry['scan_permissions'] = $entry['permissions']; |
|
| 44 | - $entry['permissions'] &= $this->mask; |
|
| 45 | - } |
|
| 46 | - return $entry; |
|
| 47 | - } |
|
| 41 | + protected function formatCacheEntry($entry) { |
|
| 42 | + if (isset($entry['permissions'])) { |
|
| 43 | + $entry['scan_permissions'] = $entry['permissions']; |
|
| 44 | + $entry['permissions'] &= $this->mask; |
|
| 45 | + } |
|
| 46 | + return $entry; |
|
| 47 | + } |
|
| 48 | 48 | } |
@@ -27,45 +27,45 @@ |
||
| 27 | 27 | |
| 28 | 28 | class Config implements \OCP\GlobalScale\IConfig { |
| 29 | 29 | |
| 30 | - /** @var IConfig */ |
|
| 31 | - private $config; |
|
| 30 | + /** @var IConfig */ |
|
| 31 | + private $config; |
|
| 32 | 32 | |
| 33 | - /** |
|
| 34 | - * Config constructor. |
|
| 35 | - * |
|
| 36 | - * @param IConfig $config |
|
| 37 | - */ |
|
| 38 | - public function __construct(IConfig $config) { |
|
| 39 | - $this->config = $config; |
|
| 40 | - } |
|
| 33 | + /** |
|
| 34 | + * Config constructor. |
|
| 35 | + * |
|
| 36 | + * @param IConfig $config |
|
| 37 | + */ |
|
| 38 | + public function __construct(IConfig $config) { |
|
| 39 | + $this->config = $config; |
|
| 40 | + } |
|
| 41 | 41 | |
| 42 | - /** |
|
| 43 | - * check if global scale is enabled |
|
| 44 | - * |
|
| 45 | - * @since 12.0.1 |
|
| 46 | - * @return bool |
|
| 47 | - */ |
|
| 48 | - public function isGlobalScaleEnabled() { |
|
| 49 | - $enabled = $this->config->getSystemValue('gs.enabled', false); |
|
| 50 | - return $enabled !== false; |
|
| 51 | - } |
|
| 42 | + /** |
|
| 43 | + * check if global scale is enabled |
|
| 44 | + * |
|
| 45 | + * @since 12.0.1 |
|
| 46 | + * @return bool |
|
| 47 | + */ |
|
| 48 | + public function isGlobalScaleEnabled() { |
|
| 49 | + $enabled = $this->config->getSystemValue('gs.enabled', false); |
|
| 50 | + return $enabled !== false; |
|
| 51 | + } |
|
| 52 | 52 | |
| 53 | - /** |
|
| 54 | - * check if federation should only be used internally in a global scale setup |
|
| 55 | - * |
|
| 56 | - * @since 12.0.1 |
|
| 57 | - * @return bool |
|
| 58 | - */ |
|
| 59 | - public function onlyInternalFederation() { |
|
| 60 | - // if global scale is disabled federation works always globally |
|
| 61 | - $gsEnabled = $this->isGlobalScaleEnabled(); |
|
| 62 | - if ($gsEnabled === false) { |
|
| 63 | - return false; |
|
| 64 | - } |
|
| 53 | + /** |
|
| 54 | + * check if federation should only be used internally in a global scale setup |
|
| 55 | + * |
|
| 56 | + * @since 12.0.1 |
|
| 57 | + * @return bool |
|
| 58 | + */ |
|
| 59 | + public function onlyInternalFederation() { |
|
| 60 | + // if global scale is disabled federation works always globally |
|
| 61 | + $gsEnabled = $this->isGlobalScaleEnabled(); |
|
| 62 | + if ($gsEnabled === false) { |
|
| 63 | + return false; |
|
| 64 | + } |
|
| 65 | 65 | |
| 66 | - $enabled = $this->config->getSystemValue('gs.federation', 'internal'); |
|
| 66 | + $enabled = $this->config->getSystemValue('gs.federation', 'internal'); |
|
| 67 | 67 | |
| 68 | - return $enabled === 'internal'; |
|
| 69 | - } |
|
| 68 | + return $enabled === 'internal'; |
|
| 69 | + } |
|
| 70 | 70 | |
| 71 | 71 | } |
@@ -32,20 +32,20 @@ |
||
| 32 | 32 | */ |
| 33 | 33 | interface IConfig { |
| 34 | 34 | |
| 35 | - /** |
|
| 36 | - * check if global scale is enabled |
|
| 37 | - * |
|
| 38 | - * @since 12.0.1 |
|
| 39 | - * @return bool |
|
| 40 | - */ |
|
| 41 | - public function isGlobalScaleEnabled(); |
|
| 35 | + /** |
|
| 36 | + * check if global scale is enabled |
|
| 37 | + * |
|
| 38 | + * @since 12.0.1 |
|
| 39 | + * @return bool |
|
| 40 | + */ |
|
| 41 | + public function isGlobalScaleEnabled(); |
|
| 42 | 42 | |
| 43 | - /** |
|
| 44 | - * check if federation should only be used internally in a global scale setup |
|
| 45 | - * |
|
| 46 | - * @since 12.0.1 |
|
| 47 | - * @return bool |
|
| 48 | - */ |
|
| 49 | - public function onlyInternalFederation(); |
|
| 43 | + /** |
|
| 44 | + * check if federation should only be used internally in a global scale setup |
|
| 45 | + * |
|
| 46 | + * @since 12.0.1 |
|
| 47 | + * @return bool |
|
| 48 | + */ |
|
| 49 | + public function onlyInternalFederation(); |
|
| 50 | 50 | |
| 51 | 51 | } |
@@ -35,43 +35,43 @@ |
||
| 35 | 35 | class SetMasterKeyStatus implements IRepairStep { |
| 36 | 36 | |
| 37 | 37 | |
| 38 | - /** @var IConfig */ |
|
| 39 | - private $config; |
|
| 38 | + /** @var IConfig */ |
|
| 39 | + private $config; |
|
| 40 | 40 | |
| 41 | 41 | |
| 42 | - public function __construct(IConfig $config) { |
|
| 43 | - $this->config = $config; |
|
| 44 | - } |
|
| 42 | + public function __construct(IConfig $config) { |
|
| 43 | + $this->config = $config; |
|
| 44 | + } |
|
| 45 | 45 | |
| 46 | - /** |
|
| 47 | - * Returns the step's name |
|
| 48 | - * |
|
| 49 | - * @return string |
|
| 50 | - * @since 9.1.0 |
|
| 51 | - */ |
|
| 52 | - public function getName() { |
|
| 53 | - return 'Write default encryption module configuration to the database'; |
|
| 54 | - } |
|
| 46 | + /** |
|
| 47 | + * Returns the step's name |
|
| 48 | + * |
|
| 49 | + * @return string |
|
| 50 | + * @since 9.1.0 |
|
| 51 | + */ |
|
| 52 | + public function getName() { |
|
| 53 | + return 'Write default encryption module configuration to the database'; |
|
| 54 | + } |
|
| 55 | 55 | |
| 56 | - /** |
|
| 57 | - * @param IOutput $output |
|
| 58 | - */ |
|
| 59 | - public function run(IOutput $output) { |
|
| 60 | - if (!$this->shouldRun()) { |
|
| 61 | - return; |
|
| 62 | - } |
|
| 56 | + /** |
|
| 57 | + * @param IOutput $output |
|
| 58 | + */ |
|
| 59 | + public function run(IOutput $output) { |
|
| 60 | + if (!$this->shouldRun()) { |
|
| 61 | + return; |
|
| 62 | + } |
|
| 63 | 63 | |
| 64 | - // if no config for the master key is set we set it explicitly to '0' in |
|
| 65 | - // order not to break old installations because the default changed to '1'. |
|
| 66 | - $configAlreadySet = $this->config->getAppValue('encryption', 'useMasterKey', false); |
|
| 67 | - if ($configAlreadySet === false) { |
|
| 68 | - $this->config->setAppValue('encryption', 'useMasterKey', '0'); |
|
| 69 | - } |
|
| 70 | - } |
|
| 64 | + // if no config for the master key is set we set it explicitly to '0' in |
|
| 65 | + // order not to break old installations because the default changed to '1'. |
|
| 66 | + $configAlreadySet = $this->config->getAppValue('encryption', 'useMasterKey', false); |
|
| 67 | + if ($configAlreadySet === false) { |
|
| 68 | + $this->config->setAppValue('encryption', 'useMasterKey', '0'); |
|
| 69 | + } |
|
| 70 | + } |
|
| 71 | 71 | |
| 72 | - protected function shouldRun() { |
|
| 73 | - $appVersion = $this->config->getAppValue('encryption', 'installed_version', '0.0.0'); |
|
| 74 | - return version_compare($appVersion, '2.0.0', '<'); |
|
| 75 | - } |
|
| 72 | + protected function shouldRun() { |
|
| 73 | + $appVersion = $this->config->getAppValue('encryption', 'installed_version', '0.0.0'); |
|
| 74 | + return version_compare($appVersion, '2.0.0', '<'); |
|
| 75 | + } |
|
| 76 | 76 | |
| 77 | 77 | } |
@@ -78,7 +78,7 @@ |
||
| 78 | 78 | $olderVersions = $ms->getMigratedVersions(); |
| 79 | 79 | $olderVersions[] = '0'; |
| 80 | 80 | $olderVersions[] = 'prev'; |
| 81 | - if (in_array($version, $olderVersions, true)) { |
|
| 81 | + if (in_array($version, $olderVersions, true)) { |
|
| 82 | 82 | $output->writeln('<error>Can not go back to previous migration without debug enabled</error>'); |
| 83 | 83 | return 1; |
| 84 | 84 | } |
@@ -36,90 +36,90 @@ |
||
| 36 | 36 | |
| 37 | 37 | class ExecuteCommand extends Command implements CompletionAwareInterface { |
| 38 | 38 | |
| 39 | - /** @var Connection */ |
|
| 40 | - private $connection; |
|
| 41 | - |
|
| 42 | - /** @var IConfig */ |
|
| 43 | - private $config; |
|
| 44 | - |
|
| 45 | - /** |
|
| 46 | - * ExecuteCommand constructor. |
|
| 47 | - * |
|
| 48 | - * @param Connection $connection |
|
| 49 | - * @param IConfig $config |
|
| 50 | - */ |
|
| 51 | - public function __construct(Connection $connection, IConfig $config) { |
|
| 52 | - $this->connection = $connection; |
|
| 53 | - $this->config = $config; |
|
| 54 | - |
|
| 55 | - parent::__construct(); |
|
| 56 | - } |
|
| 57 | - |
|
| 58 | - protected function configure() { |
|
| 59 | - $this |
|
| 60 | - ->setName('migrations:execute') |
|
| 61 | - ->setDescription('Execute a single migration version manually.') |
|
| 62 | - ->addArgument('app', InputArgument::REQUIRED, 'Name of the app this migration command shall work on') |
|
| 63 | - ->addArgument('version', InputArgument::REQUIRED, 'The version to execute.', null); |
|
| 64 | - |
|
| 65 | - parent::configure(); |
|
| 66 | - } |
|
| 67 | - |
|
| 68 | - /** |
|
| 69 | - * @param InputInterface $input |
|
| 70 | - * @param OutputInterface $output |
|
| 71 | - * @return int |
|
| 72 | - */ |
|
| 73 | - public function execute(InputInterface $input, OutputInterface $output): int { |
|
| 74 | - $appName = $input->getArgument('app'); |
|
| 75 | - $ms = new MigrationService($appName, $this->connection, new ConsoleOutput($output)); |
|
| 76 | - $version = $input->getArgument('version'); |
|
| 77 | - |
|
| 78 | - if ($this->config->getSystemValue('debug', false) === false) { |
|
| 79 | - $olderVersions = $ms->getMigratedVersions(); |
|
| 80 | - $olderVersions[] = '0'; |
|
| 81 | - $olderVersions[] = 'prev'; |
|
| 82 | - if (in_array($version, $olderVersions, true)) { |
|
| 83 | - $output->writeln('<error>Can not go back to previous migration without debug enabled</error>'); |
|
| 84 | - return 1; |
|
| 85 | - } |
|
| 86 | - } |
|
| 87 | - |
|
| 88 | - |
|
| 89 | - $ms->executeStep($version); |
|
| 90 | - return 0; |
|
| 91 | - } |
|
| 92 | - |
|
| 93 | - /** |
|
| 94 | - * @param string $optionName |
|
| 95 | - * @param CompletionContext $context |
|
| 96 | - * @return string[] |
|
| 97 | - */ |
|
| 98 | - public function completeOptionValues($optionName, CompletionContext $context) { |
|
| 99 | - return []; |
|
| 100 | - } |
|
| 101 | - |
|
| 102 | - /** |
|
| 103 | - * @param string $argumentName |
|
| 104 | - * @param CompletionContext $context |
|
| 105 | - * @return string[] |
|
| 106 | - */ |
|
| 107 | - public function completeArgumentValues($argumentName, CompletionContext $context) { |
|
| 108 | - if ($argumentName === 'app') { |
|
| 109 | - $allApps = \OC_App::getAllApps(); |
|
| 110 | - return array_diff($allApps, \OC_App::getEnabledApps(true, true)); |
|
| 111 | - } |
|
| 112 | - |
|
| 113 | - if ($argumentName === 'version') { |
|
| 114 | - $appName = $context->getWordAtIndex($context->getWordIndex() - 1); |
|
| 115 | - |
|
| 116 | - $ms = new MigrationService($appName, $this->connection); |
|
| 117 | - $migrations = $ms->getAvailableVersions(); |
|
| 118 | - |
|
| 119 | - array_unshift($migrations, 'next', 'latest'); |
|
| 120 | - return $migrations; |
|
| 121 | - } |
|
| 122 | - |
|
| 123 | - return []; |
|
| 124 | - } |
|
| 39 | + /** @var Connection */ |
|
| 40 | + private $connection; |
|
| 41 | + |
|
| 42 | + /** @var IConfig */ |
|
| 43 | + private $config; |
|
| 44 | + |
|
| 45 | + /** |
|
| 46 | + * ExecuteCommand constructor. |
|
| 47 | + * |
|
| 48 | + * @param Connection $connection |
|
| 49 | + * @param IConfig $config |
|
| 50 | + */ |
|
| 51 | + public function __construct(Connection $connection, IConfig $config) { |
|
| 52 | + $this->connection = $connection; |
|
| 53 | + $this->config = $config; |
|
| 54 | + |
|
| 55 | + parent::__construct(); |
|
| 56 | + } |
|
| 57 | + |
|
| 58 | + protected function configure() { |
|
| 59 | + $this |
|
| 60 | + ->setName('migrations:execute') |
|
| 61 | + ->setDescription('Execute a single migration version manually.') |
|
| 62 | + ->addArgument('app', InputArgument::REQUIRED, 'Name of the app this migration command shall work on') |
|
| 63 | + ->addArgument('version', InputArgument::REQUIRED, 'The version to execute.', null); |
|
| 64 | + |
|
| 65 | + parent::configure(); |
|
| 66 | + } |
|
| 67 | + |
|
| 68 | + /** |
|
| 69 | + * @param InputInterface $input |
|
| 70 | + * @param OutputInterface $output |
|
| 71 | + * @return int |
|
| 72 | + */ |
|
| 73 | + public function execute(InputInterface $input, OutputInterface $output): int { |
|
| 74 | + $appName = $input->getArgument('app'); |
|
| 75 | + $ms = new MigrationService($appName, $this->connection, new ConsoleOutput($output)); |
|
| 76 | + $version = $input->getArgument('version'); |
|
| 77 | + |
|
| 78 | + if ($this->config->getSystemValue('debug', false) === false) { |
|
| 79 | + $olderVersions = $ms->getMigratedVersions(); |
|
| 80 | + $olderVersions[] = '0'; |
|
| 81 | + $olderVersions[] = 'prev'; |
|
| 82 | + if (in_array($version, $olderVersions, true)) { |
|
| 83 | + $output->writeln('<error>Can not go back to previous migration without debug enabled</error>'); |
|
| 84 | + return 1; |
|
| 85 | + } |
|
| 86 | + } |
|
| 87 | + |
|
| 88 | + |
|
| 89 | + $ms->executeStep($version); |
|
| 90 | + return 0; |
|
| 91 | + } |
|
| 92 | + |
|
| 93 | + /** |
|
| 94 | + * @param string $optionName |
|
| 95 | + * @param CompletionContext $context |
|
| 96 | + * @return string[] |
|
| 97 | + */ |
|
| 98 | + public function completeOptionValues($optionName, CompletionContext $context) { |
|
| 99 | + return []; |
|
| 100 | + } |
|
| 101 | + |
|
| 102 | + /** |
|
| 103 | + * @param string $argumentName |
|
| 104 | + * @param CompletionContext $context |
|
| 105 | + * @return string[] |
|
| 106 | + */ |
|
| 107 | + public function completeArgumentValues($argumentName, CompletionContext $context) { |
|
| 108 | + if ($argumentName === 'app') { |
|
| 109 | + $allApps = \OC_App::getAllApps(); |
|
| 110 | + return array_diff($allApps, \OC_App::getEnabledApps(true, true)); |
|
| 111 | + } |
|
| 112 | + |
|
| 113 | + if ($argumentName === 'version') { |
|
| 114 | + $appName = $context->getWordAtIndex($context->getWordIndex() - 1); |
|
| 115 | + |
|
| 116 | + $ms = new MigrationService($appName, $this->connection); |
|
| 117 | + $migrations = $ms->getAvailableVersions(); |
|
| 118 | + |
|
| 119 | + array_unshift($migrations, 'next', 'latest'); |
|
| 120 | + return $migrations; |
|
| 121 | + } |
|
| 122 | + |
|
| 123 | + return []; |
|
| 124 | + } |
|
| 125 | 125 | } |