@@ -26,66 +26,66 @@ |
||
| 26 | 26 | |
| 27 | 27 | class RequestURL extends AbstractStringCheck { |
| 28 | 28 | |
| 29 | - /** @var string */ |
|
| 30 | - protected $url; |
|
| 29 | + /** @var string */ |
|
| 30 | + protected $url; |
|
| 31 | 31 | |
| 32 | - /** @var IRequest */ |
|
| 33 | - protected $request; |
|
| 32 | + /** @var IRequest */ |
|
| 33 | + protected $request; |
|
| 34 | 34 | |
| 35 | - /** |
|
| 36 | - * @param IL10N $l |
|
| 37 | - * @param IRequest $request |
|
| 38 | - */ |
|
| 39 | - public function __construct(IL10N $l, IRequest $request) { |
|
| 40 | - parent::__construct($l); |
|
| 41 | - $this->request = $request; |
|
| 42 | - } |
|
| 35 | + /** |
|
| 36 | + * @param IL10N $l |
|
| 37 | + * @param IRequest $request |
|
| 38 | + */ |
|
| 39 | + public function __construct(IL10N $l, IRequest $request) { |
|
| 40 | + parent::__construct($l); |
|
| 41 | + $this->request = $request; |
|
| 42 | + } |
|
| 43 | 43 | |
| 44 | - /** |
|
| 45 | - * @param string $operator |
|
| 46 | - * @param string $value |
|
| 47 | - * @return bool |
|
| 48 | - */ |
|
| 49 | - public function executeCheck($operator, $value) { |
|
| 50 | - $actualValue = $this->getActualValue(); |
|
| 51 | - if (in_array($operator, ['is', '!is'])) { |
|
| 52 | - switch ($value) { |
|
| 53 | - case 'webdav': |
|
| 54 | - if ($operator === 'is') { |
|
| 55 | - return $this->isWebDAVRequest(); |
|
| 56 | - } else { |
|
| 57 | - return !$this->isWebDAVRequest(); |
|
| 58 | - } |
|
| 59 | - } |
|
| 60 | - } |
|
| 61 | - return $this->executeStringCheck($operator, $value, $actualValue); |
|
| 62 | - } |
|
| 44 | + /** |
|
| 45 | + * @param string $operator |
|
| 46 | + * @param string $value |
|
| 47 | + * @return bool |
|
| 48 | + */ |
|
| 49 | + public function executeCheck($operator, $value) { |
|
| 50 | + $actualValue = $this->getActualValue(); |
|
| 51 | + if (in_array($operator, ['is', '!is'])) { |
|
| 52 | + switch ($value) { |
|
| 53 | + case 'webdav': |
|
| 54 | + if ($operator === 'is') { |
|
| 55 | + return $this->isWebDAVRequest(); |
|
| 56 | + } else { |
|
| 57 | + return !$this->isWebDAVRequest(); |
|
| 58 | + } |
|
| 59 | + } |
|
| 60 | + } |
|
| 61 | + return $this->executeStringCheck($operator, $value, $actualValue); |
|
| 62 | + } |
|
| 63 | 63 | |
| 64 | - /** |
|
| 65 | - * @return string |
|
| 66 | - */ |
|
| 67 | - protected function getActualValue() { |
|
| 68 | - if ($this->url !== null) { |
|
| 69 | - return $this->url; |
|
| 70 | - } |
|
| 64 | + /** |
|
| 65 | + * @return string |
|
| 66 | + */ |
|
| 67 | + protected function getActualValue() { |
|
| 68 | + if ($this->url !== null) { |
|
| 69 | + return $this->url; |
|
| 70 | + } |
|
| 71 | 71 | |
| 72 | - $this->url = $this->request->getServerProtocol() . '://';// E.g. http(s) + :// |
|
| 73 | - $this->url .= $this->request->getServerHost();// E.g. localhost |
|
| 74 | - $this->url .= $this->request->getScriptName();// E.g. /nextcloud/index.php |
|
| 75 | - $this->url .= $this->request->getPathInfo();// E.g. /apps/files_texteditor/ajax/loadfile |
|
| 72 | + $this->url = $this->request->getServerProtocol() . '://';// E.g. http(s) + :// |
|
| 73 | + $this->url .= $this->request->getServerHost();// E.g. localhost |
|
| 74 | + $this->url .= $this->request->getScriptName();// E.g. /nextcloud/index.php |
|
| 75 | + $this->url .= $this->request->getPathInfo();// E.g. /apps/files_texteditor/ajax/loadfile |
|
| 76 | 76 | |
| 77 | - return $this->url; // E.g. https://localhost/nextcloud/index.php/apps/files_texteditor/ajax/loadfile |
|
| 78 | - } |
|
| 77 | + return $this->url; // E.g. https://localhost/nextcloud/index.php/apps/files_texteditor/ajax/loadfile |
|
| 78 | + } |
|
| 79 | 79 | |
| 80 | - /** |
|
| 81 | - * @return bool |
|
| 82 | - */ |
|
| 83 | - protected function isWebDAVRequest() { |
|
| 84 | - return substr($this->request->getScriptName(), 0 - strlen('/remote.php')) === '/remote.php' && ( |
|
| 85 | - $this->request->getPathInfo() === '/webdav' || |
|
| 86 | - strpos($this->request->getPathInfo(), '/webdav/') === 0 || |
|
| 87 | - $this->request->getPathInfo() === '/dav/files' || |
|
| 88 | - strpos($this->request->getPathInfo(), '/dav/files/') === 0 |
|
| 89 | - ); |
|
| 90 | - } |
|
| 80 | + /** |
|
| 81 | + * @return bool |
|
| 82 | + */ |
|
| 83 | + protected function isWebDAVRequest() { |
|
| 84 | + return substr($this->request->getScriptName(), 0 - strlen('/remote.php')) === '/remote.php' && ( |
|
| 85 | + $this->request->getPathInfo() === '/webdav' || |
|
| 86 | + strpos($this->request->getPathInfo(), '/webdav/') === 0 || |
|
| 87 | + $this->request->getPathInfo() === '/dav/files' || |
|
| 88 | + strpos($this->request->getPathInfo(), '/dav/files/') === 0 |
|
| 89 | + ); |
|
| 90 | + } |
|
| 91 | 91 | } |
@@ -69,10 +69,10 @@ |
||
| 69 | 69 | return $this->url; |
| 70 | 70 | } |
| 71 | 71 | |
| 72 | - $this->url = $this->request->getServerProtocol() . '://';// E.g. http(s) + :// |
|
| 73 | - $this->url .= $this->request->getServerHost();// E.g. localhost |
|
| 74 | - $this->url .= $this->request->getScriptName();// E.g. /nextcloud/index.php |
|
| 75 | - $this->url .= $this->request->getPathInfo();// E.g. /apps/files_texteditor/ajax/loadfile |
|
| 72 | + $this->url = $this->request->getServerProtocol().'://'; // E.g. http(s) + :// |
|
| 73 | + $this->url .= $this->request->getServerHost(); // E.g. localhost |
|
| 74 | + $this->url .= $this->request->getScriptName(); // E.g. /nextcloud/index.php |
|
| 75 | + $this->url .= $this->request->getPathInfo(); // E.g. /apps/files_texteditor/ajax/loadfile |
|
| 76 | 76 | |
| 77 | 77 | return $this->url; // E.g. https://localhost/nextcloud/index.php/apps/files_texteditor/ajax/loadfile |
| 78 | 78 | } |
@@ -5,7 +5,7 @@ |
||
| 5 | 5 | use OCP\AppFramework\Http; |
| 6 | 6 | |
| 7 | 7 | class NotSubAdminException extends \Exception { |
| 8 | - public function __construct() { |
|
| 9 | - parent::__construct('Logged in user must be at least a sub admin', Http::STATUS_FORBIDDEN); |
|
| 10 | - } |
|
| 8 | + public function __construct() { |
|
| 9 | + parent::__construct('Logged in user must be at least a sub admin', Http::STATUS_FORBIDDEN); |
|
| 10 | + } |
|
| 11 | 11 | } |
@@ -89,7 +89,7 @@ discard block |
||
| 89 | 89 | } else { |
| 90 | 90 | $p = new ProgressBar($output); |
| 91 | 91 | $p->start(); |
| 92 | - $this->userManager->callForSeenUsers(function (IUser $user) use ($p) { |
|
| 92 | + $this->userManager->callForSeenUsers(function(IUser $user) use ($p) { |
|
| 93 | 93 | $p->advance(); |
| 94 | 94 | $this->expireVersionsForUser($user); |
| 95 | 95 | }); |
@@ -116,7 +116,7 @@ discard block |
||
| 116 | 116 | \OC_Util::setupFS($user); |
| 117 | 117 | |
| 118 | 118 | // Check if this user has a version directory |
| 119 | - $view = new \OC\Files\View('/' . $user); |
|
| 119 | + $view = new \OC\Files\View('/'.$user); |
|
| 120 | 120 | if (!$view->is_dir('/files_versions')) { |
| 121 | 121 | return false; |
| 122 | 122 | } |
@@ -37,94 +37,94 @@ |
||
| 37 | 37 | |
| 38 | 38 | class ExpireVersions extends Command { |
| 39 | 39 | |
| 40 | - /** |
|
| 41 | - * @var Expiration |
|
| 42 | - */ |
|
| 43 | - private $expiration; |
|
| 40 | + /** |
|
| 41 | + * @var Expiration |
|
| 42 | + */ |
|
| 43 | + private $expiration; |
|
| 44 | 44 | |
| 45 | - /** |
|
| 46 | - * @var IUserManager |
|
| 47 | - */ |
|
| 48 | - private $userManager; |
|
| 45 | + /** |
|
| 46 | + * @var IUserManager |
|
| 47 | + */ |
|
| 48 | + private $userManager; |
|
| 49 | 49 | |
| 50 | - /** |
|
| 51 | - * @param IUserManager $userManager |
|
| 52 | - * @param Expiration $expiration |
|
| 53 | - */ |
|
| 54 | - public function __construct(IUserManager $userManager, |
|
| 55 | - Expiration $expiration) { |
|
| 56 | - parent::__construct(); |
|
| 50 | + /** |
|
| 51 | + * @param IUserManager $userManager |
|
| 52 | + * @param Expiration $expiration |
|
| 53 | + */ |
|
| 54 | + public function __construct(IUserManager $userManager, |
|
| 55 | + Expiration $expiration) { |
|
| 56 | + parent::__construct(); |
|
| 57 | 57 | |
| 58 | - $this->userManager = $userManager; |
|
| 59 | - $this->expiration = $expiration; |
|
| 60 | - } |
|
| 58 | + $this->userManager = $userManager; |
|
| 59 | + $this->expiration = $expiration; |
|
| 60 | + } |
|
| 61 | 61 | |
| 62 | - protected function configure() { |
|
| 63 | - $this |
|
| 64 | - ->setName('versions:expire') |
|
| 65 | - ->setDescription('Expires the users file versions') |
|
| 66 | - ->addArgument( |
|
| 67 | - 'user_id', |
|
| 68 | - InputArgument::OPTIONAL | InputArgument::IS_ARRAY, |
|
| 69 | - 'expire file versions of the given user(s), if no user is given file versions for all users will be expired.' |
|
| 70 | - ); |
|
| 71 | - } |
|
| 62 | + protected function configure() { |
|
| 63 | + $this |
|
| 64 | + ->setName('versions:expire') |
|
| 65 | + ->setDescription('Expires the users file versions') |
|
| 66 | + ->addArgument( |
|
| 67 | + 'user_id', |
|
| 68 | + InputArgument::OPTIONAL | InputArgument::IS_ARRAY, |
|
| 69 | + 'expire file versions of the given user(s), if no user is given file versions for all users will be expired.' |
|
| 70 | + ); |
|
| 71 | + } |
|
| 72 | 72 | |
| 73 | - protected function execute(InputInterface $input, OutputInterface $output): int { |
|
| 74 | - $maxAge = $this->expiration->getMaxAgeAsTimestamp(); |
|
| 75 | - if (!$maxAge) { |
|
| 76 | - $output->writeln("No expiry configured."); |
|
| 77 | - return 1; |
|
| 78 | - } |
|
| 73 | + protected function execute(InputInterface $input, OutputInterface $output): int { |
|
| 74 | + $maxAge = $this->expiration->getMaxAgeAsTimestamp(); |
|
| 75 | + if (!$maxAge) { |
|
| 76 | + $output->writeln("No expiry configured."); |
|
| 77 | + return 1; |
|
| 78 | + } |
|
| 79 | 79 | |
| 80 | - $users = $input->getArgument('user_id'); |
|
| 81 | - if (!empty($users)) { |
|
| 82 | - foreach ($users as $user) { |
|
| 83 | - if ($this->userManager->userExists($user)) { |
|
| 84 | - $output->writeln("Remove deleted files of <info>$user</info>"); |
|
| 85 | - $userObject = $this->userManager->get($user); |
|
| 86 | - $this->expireVersionsForUser($userObject); |
|
| 87 | - } else { |
|
| 88 | - $output->writeln("<error>Unknown user $user</error>"); |
|
| 89 | - return 1; |
|
| 90 | - } |
|
| 91 | - } |
|
| 92 | - } else { |
|
| 93 | - $p = new ProgressBar($output); |
|
| 94 | - $p->start(); |
|
| 95 | - $this->userManager->callForSeenUsers(function (IUser $user) use ($p) { |
|
| 96 | - $p->advance(); |
|
| 97 | - $this->expireVersionsForUser($user); |
|
| 98 | - }); |
|
| 99 | - $p->finish(); |
|
| 100 | - $output->writeln(''); |
|
| 101 | - } |
|
| 102 | - return 0; |
|
| 103 | - } |
|
| 80 | + $users = $input->getArgument('user_id'); |
|
| 81 | + if (!empty($users)) { |
|
| 82 | + foreach ($users as $user) { |
|
| 83 | + if ($this->userManager->userExists($user)) { |
|
| 84 | + $output->writeln("Remove deleted files of <info>$user</info>"); |
|
| 85 | + $userObject = $this->userManager->get($user); |
|
| 86 | + $this->expireVersionsForUser($userObject); |
|
| 87 | + } else { |
|
| 88 | + $output->writeln("<error>Unknown user $user</error>"); |
|
| 89 | + return 1; |
|
| 90 | + } |
|
| 91 | + } |
|
| 92 | + } else { |
|
| 93 | + $p = new ProgressBar($output); |
|
| 94 | + $p->start(); |
|
| 95 | + $this->userManager->callForSeenUsers(function (IUser $user) use ($p) { |
|
| 96 | + $p->advance(); |
|
| 97 | + $this->expireVersionsForUser($user); |
|
| 98 | + }); |
|
| 99 | + $p->finish(); |
|
| 100 | + $output->writeln(''); |
|
| 101 | + } |
|
| 102 | + return 0; |
|
| 103 | + } |
|
| 104 | 104 | |
| 105 | - public function expireVersionsForUser(IUser $user) { |
|
| 106 | - $uid = $user->getUID(); |
|
| 107 | - if (!$this->setupFS($uid)) { |
|
| 108 | - return; |
|
| 109 | - } |
|
| 110 | - Storage::expireOlderThanMaxForUser($uid); |
|
| 111 | - } |
|
| 105 | + public function expireVersionsForUser(IUser $user) { |
|
| 106 | + $uid = $user->getUID(); |
|
| 107 | + if (!$this->setupFS($uid)) { |
|
| 108 | + return; |
|
| 109 | + } |
|
| 110 | + Storage::expireOlderThanMaxForUser($uid); |
|
| 111 | + } |
|
| 112 | 112 | |
| 113 | - /** |
|
| 114 | - * Act on behalf on versions item owner |
|
| 115 | - * @param string $user |
|
| 116 | - * @return boolean |
|
| 117 | - */ |
|
| 118 | - protected function setupFS($user) { |
|
| 119 | - \OC_Util::tearDownFS(); |
|
| 120 | - \OC_Util::setupFS($user); |
|
| 113 | + /** |
|
| 114 | + * Act on behalf on versions item owner |
|
| 115 | + * @param string $user |
|
| 116 | + * @return boolean |
|
| 117 | + */ |
|
| 118 | + protected function setupFS($user) { |
|
| 119 | + \OC_Util::tearDownFS(); |
|
| 120 | + \OC_Util::setupFS($user); |
|
| 121 | 121 | |
| 122 | - // Check if this user has a version directory |
|
| 123 | - $view = new \OC\Files\View('/' . $user); |
|
| 124 | - if (!$view->is_dir('/files_versions')) { |
|
| 125 | - return false; |
|
| 126 | - } |
|
| 122 | + // Check if this user has a version directory |
|
| 123 | + $view = new \OC\Files\View('/' . $user); |
|
| 124 | + if (!$view->is_dir('/files_versions')) { |
|
| 125 | + return false; |
|
| 126 | + } |
|
| 127 | 127 | |
| 128 | - return true; |
|
| 129 | - } |
|
| 128 | + return true; |
|
| 129 | + } |
|
| 130 | 130 | } |
@@ -105,8 +105,8 @@ |
||
| 105 | 105 | protected function deleteVersions($user) { |
| 106 | 106 | \OC_Util::tearDownFS(); |
| 107 | 107 | \OC_Util::setupFS($user); |
| 108 | - if ($this->rootFolder->nodeExists('/' . $user . '/files_versions')) { |
|
| 109 | - $this->rootFolder->get('/' . $user . '/files_versions')->delete(); |
|
| 108 | + if ($this->rootFolder->nodeExists('/'.$user.'/files_versions')) { |
|
| 109 | + $this->rootFolder->get('/'.$user.'/files_versions')->delete(); |
|
| 110 | 110 | } |
| 111 | 111 | } |
| 112 | 112 | } |
@@ -33,83 +33,83 @@ |
||
| 33 | 33 | |
| 34 | 34 | class CleanUp extends Command { |
| 35 | 35 | |
| 36 | - /** @var IUserManager */ |
|
| 37 | - protected $userManager; |
|
| 36 | + /** @var IUserManager */ |
|
| 37 | + protected $userManager; |
|
| 38 | 38 | |
| 39 | - /** @var IRootFolder */ |
|
| 40 | - protected $rootFolder; |
|
| 39 | + /** @var IRootFolder */ |
|
| 40 | + protected $rootFolder; |
|
| 41 | 41 | |
| 42 | - /** |
|
| 43 | - * @param IRootFolder $rootFolder |
|
| 44 | - * @param IUserManager $userManager |
|
| 45 | - */ |
|
| 46 | - public function __construct(IRootFolder $rootFolder, IUserManager $userManager) { |
|
| 47 | - parent::__construct(); |
|
| 48 | - $this->userManager = $userManager; |
|
| 49 | - $this->rootFolder = $rootFolder; |
|
| 50 | - } |
|
| 42 | + /** |
|
| 43 | + * @param IRootFolder $rootFolder |
|
| 44 | + * @param IUserManager $userManager |
|
| 45 | + */ |
|
| 46 | + public function __construct(IRootFolder $rootFolder, IUserManager $userManager) { |
|
| 47 | + parent::__construct(); |
|
| 48 | + $this->userManager = $userManager; |
|
| 49 | + $this->rootFolder = $rootFolder; |
|
| 50 | + } |
|
| 51 | 51 | |
| 52 | - protected function configure() { |
|
| 53 | - $this |
|
| 54 | - ->setName('versions:cleanup') |
|
| 55 | - ->setDescription('Delete versions') |
|
| 56 | - ->addArgument( |
|
| 57 | - 'user_id', |
|
| 58 | - InputArgument::OPTIONAL | InputArgument::IS_ARRAY, |
|
| 59 | - 'delete versions of the given user(s), if no user is given all versions will be deleted' |
|
| 60 | - ); |
|
| 61 | - } |
|
| 52 | + protected function configure() { |
|
| 53 | + $this |
|
| 54 | + ->setName('versions:cleanup') |
|
| 55 | + ->setDescription('Delete versions') |
|
| 56 | + ->addArgument( |
|
| 57 | + 'user_id', |
|
| 58 | + InputArgument::OPTIONAL | InputArgument::IS_ARRAY, |
|
| 59 | + 'delete versions of the given user(s), if no user is given all versions will be deleted' |
|
| 60 | + ); |
|
| 61 | + } |
|
| 62 | 62 | |
| 63 | 63 | |
| 64 | - protected function execute(InputInterface $input, OutputInterface $output): int { |
|
| 65 | - $users = $input->getArgument('user_id'); |
|
| 66 | - if (!empty($users)) { |
|
| 67 | - foreach ($users as $user) { |
|
| 68 | - if ($this->userManager->userExists($user)) { |
|
| 69 | - $output->writeln("Delete versions of <info>$user</info>"); |
|
| 70 | - $this->deleteVersions($user); |
|
| 71 | - } else { |
|
| 72 | - $output->writeln("<error>Unknown user $user</error>"); |
|
| 73 | - return 1; |
|
| 74 | - } |
|
| 75 | - } |
|
| 76 | - } else { |
|
| 77 | - $output->writeln('Delete all versions'); |
|
| 78 | - foreach ($this->userManager->getBackends() as $backend) { |
|
| 79 | - $name = get_class($backend); |
|
| 64 | + protected function execute(InputInterface $input, OutputInterface $output): int { |
|
| 65 | + $users = $input->getArgument('user_id'); |
|
| 66 | + if (!empty($users)) { |
|
| 67 | + foreach ($users as $user) { |
|
| 68 | + if ($this->userManager->userExists($user)) { |
|
| 69 | + $output->writeln("Delete versions of <info>$user</info>"); |
|
| 70 | + $this->deleteVersions($user); |
|
| 71 | + } else { |
|
| 72 | + $output->writeln("<error>Unknown user $user</error>"); |
|
| 73 | + return 1; |
|
| 74 | + } |
|
| 75 | + } |
|
| 76 | + } else { |
|
| 77 | + $output->writeln('Delete all versions'); |
|
| 78 | + foreach ($this->userManager->getBackends() as $backend) { |
|
| 79 | + $name = get_class($backend); |
|
| 80 | 80 | |
| 81 | - if ($backend instanceof IUserBackend) { |
|
| 82 | - $name = $backend->getBackendName(); |
|
| 83 | - } |
|
| 81 | + if ($backend instanceof IUserBackend) { |
|
| 82 | + $name = $backend->getBackendName(); |
|
| 83 | + } |
|
| 84 | 84 | |
| 85 | - $output->writeln("Delete versions for users on backend <info>$name</info>"); |
|
| 85 | + $output->writeln("Delete versions for users on backend <info>$name</info>"); |
|
| 86 | 86 | |
| 87 | - $limit = 500; |
|
| 88 | - $offset = 0; |
|
| 89 | - do { |
|
| 90 | - $users = $backend->getUsers('', $limit, $offset); |
|
| 91 | - foreach ($users as $user) { |
|
| 92 | - $output->writeln(" <info>$user</info>"); |
|
| 93 | - $this->deleteVersions($user); |
|
| 94 | - } |
|
| 95 | - $offset += $limit; |
|
| 96 | - } while (count($users) >= $limit); |
|
| 97 | - } |
|
| 98 | - } |
|
| 99 | - return 0; |
|
| 100 | - } |
|
| 87 | + $limit = 500; |
|
| 88 | + $offset = 0; |
|
| 89 | + do { |
|
| 90 | + $users = $backend->getUsers('', $limit, $offset); |
|
| 91 | + foreach ($users as $user) { |
|
| 92 | + $output->writeln(" <info>$user</info>"); |
|
| 93 | + $this->deleteVersions($user); |
|
| 94 | + } |
|
| 95 | + $offset += $limit; |
|
| 96 | + } while (count($users) >= $limit); |
|
| 97 | + } |
|
| 98 | + } |
|
| 99 | + return 0; |
|
| 100 | + } |
|
| 101 | 101 | |
| 102 | 102 | |
| 103 | - /** |
|
| 104 | - * delete versions for the given user |
|
| 105 | - * |
|
| 106 | - * @param string $user |
|
| 107 | - */ |
|
| 108 | - protected function deleteVersions($user) { |
|
| 109 | - \OC_Util::tearDownFS(); |
|
| 110 | - \OC_Util::setupFS($user); |
|
| 111 | - if ($this->rootFolder->nodeExists('/' . $user . '/files_versions')) { |
|
| 112 | - $this->rootFolder->get('/' . $user . '/files_versions')->delete(); |
|
| 113 | - } |
|
| 114 | - } |
|
| 103 | + /** |
|
| 104 | + * delete versions for the given user |
|
| 105 | + * |
|
| 106 | + * @param string $user |
|
| 107 | + */ |
|
| 108 | + protected function deleteVersions($user) { |
|
| 109 | + \OC_Util::tearDownFS(); |
|
| 110 | + \OC_Util::setupFS($user); |
|
| 111 | + if ($this->rootFolder->nodeExists('/' . $user . '/files_versions')) { |
|
| 112 | + $this->rootFolder->get('/' . $user . '/files_versions')->delete(); |
|
| 113 | + } |
|
| 114 | + } |
|
| 115 | 115 | } |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | return; |
| 67 | 67 | } |
| 68 | 68 | |
| 69 | - $this->userManager->callForSeenUsers(function (IUser $user) { |
|
| 69 | + $this->userManager->callForSeenUsers(function(IUser $user) { |
|
| 70 | 70 | $uid = $user->getUID(); |
| 71 | 71 | if (!$this->setupFS($uid)) { |
| 72 | 72 | return; |
@@ -85,7 +85,7 @@ discard block |
||
| 85 | 85 | \OC_Util::setupFS($user); |
| 86 | 86 | |
| 87 | 87 | // Check if this user has a versions directory |
| 88 | - $view = new \OC\Files\View('/' . $user); |
|
| 88 | + $view = new \OC\Files\View('/'.$user); |
|
| 89 | 89 | if (!$view->is_dir('/files_versions')) { |
| 90 | 90 | return false; |
| 91 | 91 | } |
@@ -31,56 +31,56 @@ |
||
| 31 | 31 | use OCP\IUserManager; |
| 32 | 32 | |
| 33 | 33 | class ExpireVersions extends \OC\BackgroundJob\TimedJob { |
| 34 | - public const ITEMS_PER_SESSION = 1000; |
|
| 34 | + public const ITEMS_PER_SESSION = 1000; |
|
| 35 | 35 | |
| 36 | - /** |
|
| 37 | - * @var Expiration |
|
| 38 | - */ |
|
| 39 | - private $expiration; |
|
| 36 | + /** |
|
| 37 | + * @var Expiration |
|
| 38 | + */ |
|
| 39 | + private $expiration; |
|
| 40 | 40 | |
| 41 | - /** |
|
| 42 | - * @var IUserManager |
|
| 43 | - */ |
|
| 44 | - private $userManager; |
|
| 41 | + /** |
|
| 42 | + * @var IUserManager |
|
| 43 | + */ |
|
| 44 | + private $userManager; |
|
| 45 | 45 | |
| 46 | - public function __construct(IUserManager $userManager, Expiration $expiration) { |
|
| 47 | - // Run once per 30 minutes |
|
| 48 | - $this->setInterval(60 * 30); |
|
| 46 | + public function __construct(IUserManager $userManager, Expiration $expiration) { |
|
| 47 | + // Run once per 30 minutes |
|
| 48 | + $this->setInterval(60 * 30); |
|
| 49 | 49 | |
| 50 | - $this->expiration = $expiration; |
|
| 51 | - $this->userManager = $userManager; |
|
| 52 | - } |
|
| 50 | + $this->expiration = $expiration; |
|
| 51 | + $this->userManager = $userManager; |
|
| 52 | + } |
|
| 53 | 53 | |
| 54 | - protected function run($argument) { |
|
| 55 | - $maxAge = $this->expiration->getMaxAgeAsTimestamp(); |
|
| 56 | - if (!$maxAge) { |
|
| 57 | - return; |
|
| 58 | - } |
|
| 54 | + protected function run($argument) { |
|
| 55 | + $maxAge = $this->expiration->getMaxAgeAsTimestamp(); |
|
| 56 | + if (!$maxAge) { |
|
| 57 | + return; |
|
| 58 | + } |
|
| 59 | 59 | |
| 60 | - $this->userManager->callForSeenUsers(function (IUser $user) { |
|
| 61 | - $uid = $user->getUID(); |
|
| 62 | - if (!$this->setupFS($uid)) { |
|
| 63 | - return; |
|
| 64 | - } |
|
| 65 | - Storage::expireOlderThanMaxForUser($uid); |
|
| 66 | - }); |
|
| 67 | - } |
|
| 60 | + $this->userManager->callForSeenUsers(function (IUser $user) { |
|
| 61 | + $uid = $user->getUID(); |
|
| 62 | + if (!$this->setupFS($uid)) { |
|
| 63 | + return; |
|
| 64 | + } |
|
| 65 | + Storage::expireOlderThanMaxForUser($uid); |
|
| 66 | + }); |
|
| 67 | + } |
|
| 68 | 68 | |
| 69 | - /** |
|
| 70 | - * Act on behalf on trash item owner |
|
| 71 | - * @param string $user |
|
| 72 | - * @return boolean |
|
| 73 | - */ |
|
| 74 | - protected function setupFS($user) { |
|
| 75 | - \OC_Util::tearDownFS(); |
|
| 76 | - \OC_Util::setupFS($user); |
|
| 69 | + /** |
|
| 70 | + * Act on behalf on trash item owner |
|
| 71 | + * @param string $user |
|
| 72 | + * @return boolean |
|
| 73 | + */ |
|
| 74 | + protected function setupFS($user) { |
|
| 75 | + \OC_Util::tearDownFS(); |
|
| 76 | + \OC_Util::setupFS($user); |
|
| 77 | 77 | |
| 78 | - // Check if this user has a versions directory |
|
| 79 | - $view = new \OC\Files\View('/' . $user); |
|
| 80 | - if (!$view->is_dir('/files_versions')) { |
|
| 81 | - return false; |
|
| 82 | - } |
|
| 78 | + // Check if this user has a versions directory |
|
| 79 | + $view = new \OC\Files\View('/' . $user); |
|
| 80 | + if (!$view->is_dir('/files_versions')) { |
|
| 81 | + return false; |
|
| 82 | + } |
|
| 83 | 83 | |
| 84 | - return true; |
|
| 85 | - } |
|
| 84 | + return true; |
|
| 85 | + } |
|
| 86 | 86 | } |
@@ -99,7 +99,7 @@ |
||
| 99 | 99 | $this->checker->writeCoreSignature($x509, $rsa, $path); |
| 100 | 100 | $output->writeln('Successfully signed "core"'); |
| 101 | 101 | } catch (\Exception $e) { |
| 102 | - $output->writeln('Error: ' . $e->getMessage()); |
|
| 102 | + $output->writeln('Error: '.$e->getMessage()); |
|
| 103 | 103 | return 1; |
| 104 | 104 | } |
| 105 | 105 | return 0; |
@@ -39,69 +39,69 @@ |
||
| 39 | 39 | * @package OC\Core\Command\Integrity |
| 40 | 40 | */ |
| 41 | 41 | class SignCore extends Command { |
| 42 | - /** @var Checker */ |
|
| 43 | - private $checker; |
|
| 44 | - /** @var FileAccessHelper */ |
|
| 45 | - private $fileAccessHelper; |
|
| 42 | + /** @var Checker */ |
|
| 43 | + private $checker; |
|
| 44 | + /** @var FileAccessHelper */ |
|
| 45 | + private $fileAccessHelper; |
|
| 46 | 46 | |
| 47 | - /** |
|
| 48 | - * @param Checker $checker |
|
| 49 | - * @param FileAccessHelper $fileAccessHelper |
|
| 50 | - */ |
|
| 51 | - public function __construct(Checker $checker, |
|
| 52 | - FileAccessHelper $fileAccessHelper) { |
|
| 53 | - parent::__construct(null); |
|
| 54 | - $this->checker = $checker; |
|
| 55 | - $this->fileAccessHelper = $fileAccessHelper; |
|
| 56 | - } |
|
| 47 | + /** |
|
| 48 | + * @param Checker $checker |
|
| 49 | + * @param FileAccessHelper $fileAccessHelper |
|
| 50 | + */ |
|
| 51 | + public function __construct(Checker $checker, |
|
| 52 | + FileAccessHelper $fileAccessHelper) { |
|
| 53 | + parent::__construct(null); |
|
| 54 | + $this->checker = $checker; |
|
| 55 | + $this->fileAccessHelper = $fileAccessHelper; |
|
| 56 | + } |
|
| 57 | 57 | |
| 58 | - protected function configure() { |
|
| 59 | - $this |
|
| 60 | - ->setName('integrity:sign-core') |
|
| 61 | - ->setDescription('Sign core using a private key.') |
|
| 62 | - ->addOption('privateKey', null, InputOption::VALUE_REQUIRED, 'Path to private key to use for signing') |
|
| 63 | - ->addOption('certificate', null, InputOption::VALUE_REQUIRED, 'Path to certificate to use for signing') |
|
| 64 | - ->addOption('path', null, InputOption::VALUE_REQUIRED, 'Path of core to sign'); |
|
| 65 | - } |
|
| 58 | + protected function configure() { |
|
| 59 | + $this |
|
| 60 | + ->setName('integrity:sign-core') |
|
| 61 | + ->setDescription('Sign core using a private key.') |
|
| 62 | + ->addOption('privateKey', null, InputOption::VALUE_REQUIRED, 'Path to private key to use for signing') |
|
| 63 | + ->addOption('certificate', null, InputOption::VALUE_REQUIRED, 'Path to certificate to use for signing') |
|
| 64 | + ->addOption('path', null, InputOption::VALUE_REQUIRED, 'Path of core to sign'); |
|
| 65 | + } |
|
| 66 | 66 | |
| 67 | - /** |
|
| 68 | - * {@inheritdoc } |
|
| 69 | - */ |
|
| 70 | - protected function execute(InputInterface $input, OutputInterface $output): int { |
|
| 71 | - $privateKeyPath = $input->getOption('privateKey'); |
|
| 72 | - $keyBundlePath = $input->getOption('certificate'); |
|
| 73 | - $path = $input->getOption('path'); |
|
| 74 | - if (is_null($privateKeyPath) || is_null($keyBundlePath) || is_null($path)) { |
|
| 75 | - $output->writeln('--privateKey, --certificate and --path are required.'); |
|
| 76 | - return 1; |
|
| 77 | - } |
|
| 67 | + /** |
|
| 68 | + * {@inheritdoc } |
|
| 69 | + */ |
|
| 70 | + protected function execute(InputInterface $input, OutputInterface $output): int { |
|
| 71 | + $privateKeyPath = $input->getOption('privateKey'); |
|
| 72 | + $keyBundlePath = $input->getOption('certificate'); |
|
| 73 | + $path = $input->getOption('path'); |
|
| 74 | + if (is_null($privateKeyPath) || is_null($keyBundlePath) || is_null($path)) { |
|
| 75 | + $output->writeln('--privateKey, --certificate and --path are required.'); |
|
| 76 | + return 1; |
|
| 77 | + } |
|
| 78 | 78 | |
| 79 | - $privateKey = $this->fileAccessHelper->file_get_contents($privateKeyPath); |
|
| 80 | - $keyBundle = $this->fileAccessHelper->file_get_contents($keyBundlePath); |
|
| 79 | + $privateKey = $this->fileAccessHelper->file_get_contents($privateKeyPath); |
|
| 80 | + $keyBundle = $this->fileAccessHelper->file_get_contents($keyBundlePath); |
|
| 81 | 81 | |
| 82 | - if ($privateKey === false) { |
|
| 83 | - $output->writeln(sprintf('Private key "%s" does not exists.', $privateKeyPath)); |
|
| 84 | - return 1; |
|
| 85 | - } |
|
| 82 | + if ($privateKey === false) { |
|
| 83 | + $output->writeln(sprintf('Private key "%s" does not exists.', $privateKeyPath)); |
|
| 84 | + return 1; |
|
| 85 | + } |
|
| 86 | 86 | |
| 87 | - if ($keyBundle === false) { |
|
| 88 | - $output->writeln(sprintf('Certificate "%s" does not exists.', $keyBundlePath)); |
|
| 89 | - return 1; |
|
| 90 | - } |
|
| 87 | + if ($keyBundle === false) { |
|
| 88 | + $output->writeln(sprintf('Certificate "%s" does not exists.', $keyBundlePath)); |
|
| 89 | + return 1; |
|
| 90 | + } |
|
| 91 | 91 | |
| 92 | - $rsa = new RSA(); |
|
| 93 | - $rsa->loadKey($privateKey); |
|
| 94 | - $x509 = new X509(); |
|
| 95 | - $x509->loadX509($keyBundle); |
|
| 96 | - $x509->setPrivateKey($rsa); |
|
| 92 | + $rsa = new RSA(); |
|
| 93 | + $rsa->loadKey($privateKey); |
|
| 94 | + $x509 = new X509(); |
|
| 95 | + $x509->loadX509($keyBundle); |
|
| 96 | + $x509->setPrivateKey($rsa); |
|
| 97 | 97 | |
| 98 | - try { |
|
| 99 | - $this->checker->writeCoreSignature($x509, $rsa, $path); |
|
| 100 | - $output->writeln('Successfully signed "core"'); |
|
| 101 | - } catch (\Exception $e) { |
|
| 102 | - $output->writeln('Error: ' . $e->getMessage()); |
|
| 103 | - return 1; |
|
| 104 | - } |
|
| 105 | - return 0; |
|
| 106 | - } |
|
| 98 | + try { |
|
| 99 | + $this->checker->writeCoreSignature($x509, $rsa, $path); |
|
| 100 | + $output->writeln('Successfully signed "core"'); |
|
| 101 | + } catch (\Exception $e) { |
|
| 102 | + $output->writeln('Error: ' . $e->getMessage()); |
|
| 103 | + return 1; |
|
| 104 | + } |
|
| 105 | + return 0; |
|
| 106 | + } |
|
| 107 | 107 | } |
@@ -51,7 +51,7 @@ |
||
| 51 | 51 | */ |
| 52 | 52 | public function completeArgumentValues($argumentName, CompletionContext $context) { |
| 53 | 53 | if ($argumentName === 'uid') { |
| 54 | - return array_map(function (IUser $user) { |
|
| 54 | + return array_map(function(IUser $user) { |
|
| 55 | 55 | return $user->getUID(); |
| 56 | 56 | }, $this->userManager->search($context->getCurrentWord(), 100)); |
| 57 | 57 | } |
@@ -31,33 +31,33 @@ |
||
| 31 | 31 | |
| 32 | 32 | class Base extends \OC\Core\Command\Base { |
| 33 | 33 | |
| 34 | - /** @var IUserManager */ |
|
| 35 | - protected $userManager; |
|
| 34 | + /** @var IUserManager */ |
|
| 35 | + protected $userManager; |
|
| 36 | 36 | |
| 37 | - /** |
|
| 38 | - * Return possible values for the named option |
|
| 39 | - * |
|
| 40 | - * @param string $optionName |
|
| 41 | - * @param CompletionContext $context |
|
| 42 | - * @return string[] |
|
| 43 | - */ |
|
| 44 | - public function completeOptionValues($optionName, CompletionContext $context) { |
|
| 45 | - return []; |
|
| 46 | - } |
|
| 37 | + /** |
|
| 38 | + * Return possible values for the named option |
|
| 39 | + * |
|
| 40 | + * @param string $optionName |
|
| 41 | + * @param CompletionContext $context |
|
| 42 | + * @return string[] |
|
| 43 | + */ |
|
| 44 | + public function completeOptionValues($optionName, CompletionContext $context) { |
|
| 45 | + return []; |
|
| 46 | + } |
|
| 47 | 47 | |
| 48 | - /** |
|
| 49 | - * Return possible values for the named argument |
|
| 50 | - * |
|
| 51 | - * @param string $argumentName |
|
| 52 | - * @param CompletionContext $context |
|
| 53 | - * @return string[] |
|
| 54 | - */ |
|
| 55 | - public function completeArgumentValues($argumentName, CompletionContext $context) { |
|
| 56 | - if ($argumentName === 'uid') { |
|
| 57 | - return array_map(function (IUser $user) { |
|
| 58 | - return $user->getUID(); |
|
| 59 | - }, $this->userManager->search($context->getCurrentWord(), 100)); |
|
| 60 | - } |
|
| 61 | - return []; |
|
| 62 | - } |
|
| 48 | + /** |
|
| 49 | + * Return possible values for the named argument |
|
| 50 | + * |
|
| 51 | + * @param string $argumentName |
|
| 52 | + * @param CompletionContext $context |
|
| 53 | + * @return string[] |
|
| 54 | + */ |
|
| 55 | + public function completeArgumentValues($argumentName, CompletionContext $context) { |
|
| 56 | + if ($argumentName === 'uid') { |
|
| 57 | + return array_map(function (IUser $user) { |
|
| 58 | + return $user->getUID(); |
|
| 59 | + }, $this->userManager->search($context->getCurrentWord(), 100)); |
|
| 60 | + } |
|
| 61 | + return []; |
|
| 62 | + } |
|
| 63 | 63 | } |
@@ -26,7 +26,7 @@ |
||
| 26 | 26 | namespace OC\Core\Command\Background; |
| 27 | 27 | |
| 28 | 28 | class Ajax extends Base { |
| 29 | - protected function getMode() { |
|
| 30 | - return 'ajax'; |
|
| 31 | - } |
|
| 29 | + protected function getMode() { |
|
| 30 | + return 'ajax'; |
|
| 31 | + } |
|
| 32 | 32 | } |
@@ -26,7 +26,7 @@ |
||
| 26 | 26 | namespace OC\Core\Command\Background; |
| 27 | 27 | |
| 28 | 28 | class Cron extends Base { |
| 29 | - protected function getMode() { |
|
| 30 | - return 'cron'; |
|
| 31 | - } |
|
| 29 | + protected function getMode() { |
|
| 30 | + return 'cron'; |
|
| 31 | + } |
|
| 32 | 32 | } |