@@ -27,12 +27,12 @@ |
||
| 27 | 27 | |
| 28 | 28 | class ModuleAlreadyExistsException extends GenericEncryptionException { |
| 29 | 29 | |
| 30 | - /** |
|
| 31 | - * @param string $id |
|
| 32 | - * @param string $name |
|
| 33 | - */ |
|
| 34 | - public function __construct($id, $name) { |
|
| 35 | - parent::__construct('Id "' . $id . '" already used by encryption module "' . $name . '"'); |
|
| 36 | - } |
|
| 30 | + /** |
|
| 31 | + * @param string $id |
|
| 32 | + * @param string $name |
|
| 33 | + */ |
|
| 34 | + public function __construct($id, $name) { |
|
| 35 | + parent::__construct('Id "' . $id . '" already used by encryption module "' . $name . '"'); |
|
| 36 | + } |
|
| 37 | 37 | |
| 38 | 38 | } |
@@ -28,8 +28,8 @@ |
||
| 28 | 28 | |
| 29 | 29 | class EncryptionHeaderToLargeException extends GenericEncryptionException { |
| 30 | 30 | |
| 31 | - public function __construct() { |
|
| 32 | - parent::__construct('max header size exceeded'); |
|
| 33 | - } |
|
| 31 | + public function __construct() { |
|
| 32 | + parent::__construct('max header size exceeded'); |
|
| 33 | + } |
|
| 34 | 34 | |
| 35 | 35 | } |
@@ -27,10 +27,10 @@ |
||
| 27 | 27 | |
| 28 | 28 | class EncryptionHeaderKeyExistsException extends GenericEncryptionException { |
| 29 | 29 | |
| 30 | - /** |
|
| 31 | - * @param string $key |
|
| 32 | - */ |
|
| 33 | - public function __construct($key) { |
|
| 34 | - parent::__construct('header key "'. $key . '" already reserved by ownCloud'); |
|
| 35 | - } |
|
| 30 | + /** |
|
| 31 | + * @param string $key |
|
| 32 | + */ |
|
| 33 | + public function __construct($key) { |
|
| 34 | + parent::__construct('header key "'. $key . '" already reserved by ownCloud'); |
|
| 35 | + } |
|
| 36 | 36 | } |
@@ -27,50 +27,50 @@ |
||
| 27 | 27 | use OC\Files\View; |
| 28 | 28 | |
| 29 | 29 | class HookManager { |
| 30 | - /** |
|
| 31 | - * @var Update |
|
| 32 | - */ |
|
| 33 | - private static $updater; |
|
| 30 | + /** |
|
| 31 | + * @var Update |
|
| 32 | + */ |
|
| 33 | + private static $updater; |
|
| 34 | 34 | |
| 35 | - public static function postShared($params) { |
|
| 36 | - self::getUpdate()->postShared($params); |
|
| 37 | - } |
|
| 38 | - public static function postUnshared($params) { |
|
| 39 | - self::getUpdate()->postUnshared($params); |
|
| 40 | - } |
|
| 35 | + public static function postShared($params) { |
|
| 36 | + self::getUpdate()->postShared($params); |
|
| 37 | + } |
|
| 38 | + public static function postUnshared($params) { |
|
| 39 | + self::getUpdate()->postUnshared($params); |
|
| 40 | + } |
|
| 41 | 41 | |
| 42 | - public static function postRename($params) { |
|
| 43 | - self::getUpdate()->postRename($params); |
|
| 44 | - } |
|
| 42 | + public static function postRename($params) { |
|
| 43 | + self::getUpdate()->postRename($params); |
|
| 44 | + } |
|
| 45 | 45 | |
| 46 | - public static function postRestore($params) { |
|
| 47 | - self::getUpdate()->postRestore($params); |
|
| 48 | - } |
|
| 46 | + public static function postRestore($params) { |
|
| 47 | + self::getUpdate()->postRestore($params); |
|
| 48 | + } |
|
| 49 | 49 | |
| 50 | - /** |
|
| 51 | - * @return Update |
|
| 52 | - */ |
|
| 53 | - private static function getUpdate() { |
|
| 54 | - if (is_null(self::$updater)) { |
|
| 55 | - $user = \OC::$server->getUserSession()->getUser(); |
|
| 56 | - $uid = ''; |
|
| 57 | - if ($user) { |
|
| 58 | - $uid = $user->getUID(); |
|
| 59 | - } |
|
| 60 | - self::$updater = new Update( |
|
| 61 | - new View(), |
|
| 62 | - new Util( |
|
| 63 | - new View(), |
|
| 64 | - \OC::$server->getUserManager(), |
|
| 65 | - \OC::$server->getGroupManager(), |
|
| 66 | - \OC::$server->getConfig()), |
|
| 67 | - Filesystem::getMountManager(), |
|
| 68 | - \OC::$server->getEncryptionManager(), |
|
| 69 | - \OC::$server->getEncryptionFilesHelper(), |
|
| 70 | - $uid |
|
| 71 | - ); |
|
| 72 | - } |
|
| 50 | + /** |
|
| 51 | + * @return Update |
|
| 52 | + */ |
|
| 53 | + private static function getUpdate() { |
|
| 54 | + if (is_null(self::$updater)) { |
|
| 55 | + $user = \OC::$server->getUserSession()->getUser(); |
|
| 56 | + $uid = ''; |
|
| 57 | + if ($user) { |
|
| 58 | + $uid = $user->getUID(); |
|
| 59 | + } |
|
| 60 | + self::$updater = new Update( |
|
| 61 | + new View(), |
|
| 62 | + new Util( |
|
| 63 | + new View(), |
|
| 64 | + \OC::$server->getUserManager(), |
|
| 65 | + \OC::$server->getGroupManager(), |
|
| 66 | + \OC::$server->getConfig()), |
|
| 67 | + Filesystem::getMountManager(), |
|
| 68 | + \OC::$server->getEncryptionManager(), |
|
| 69 | + \OC::$server->getEncryptionFilesHelper(), |
|
| 70 | + $uid |
|
| 71 | + ); |
|
| 72 | + } |
|
| 73 | 73 | |
| 74 | - return self::$updater; |
|
| 75 | - } |
|
| 74 | + return self::$updater; |
|
| 75 | + } |
|
| 76 | 76 | } |
@@ -26,8 +26,8 @@ |
||
| 26 | 26 | $server = \OC::$server; |
| 27 | 27 | |
| 28 | 28 | $controller = new \OC\OCS\Provider( |
| 29 | - 'ocs_provider', |
|
| 30 | - $server->getRequest(), |
|
| 31 | - $server->getAppManager() |
|
| 29 | + 'ocs_provider', |
|
| 30 | + $server->getRequest(), |
|
| 31 | + $server->getAppManager() |
|
| 32 | 32 | ); |
| 33 | 33 | echo $controller->buildProviderList()->render(); |
@@ -1,6 +1,6 @@ |
||
| 1 | 1 | <?php |
| 2 | - /** @var array $_ */ |
|
| 3 | - /** @var \OCP\IL10N $l */ |
|
| 2 | + /** @var array $_ */ |
|
| 3 | + /** @var \OCP\IL10N $l */ |
|
| 4 | 4 | |
| 5 | 5 | style('core', ['styles', 'header']); |
| 6 | 6 | ?> |
@@ -29,46 +29,46 @@ |
||
| 29 | 29 | use \OCP\IUserManager; |
| 30 | 30 | |
| 31 | 31 | class UserController extends Controller { |
| 32 | - /** |
|
| 33 | - * @var IUserManager |
|
| 34 | - */ |
|
| 35 | - protected $userManager; |
|
| 32 | + /** |
|
| 33 | + * @var IUserManager |
|
| 34 | + */ |
|
| 35 | + protected $userManager; |
|
| 36 | 36 | |
| 37 | - public function __construct($appName, |
|
| 38 | - IRequest $request, |
|
| 39 | - IUserManager $userManager |
|
| 40 | - ) { |
|
| 41 | - parent::__construct($appName, $request); |
|
| 42 | - $this->userManager = $userManager; |
|
| 43 | - } |
|
| 37 | + public function __construct($appName, |
|
| 38 | + IRequest $request, |
|
| 39 | + IUserManager $userManager |
|
| 40 | + ) { |
|
| 41 | + parent::__construct($appName, $request); |
|
| 42 | + $this->userManager = $userManager; |
|
| 43 | + } |
|
| 44 | 44 | |
| 45 | - /** |
|
| 46 | - * Lookup user display names |
|
| 47 | - * |
|
| 48 | - * @NoAdminRequired |
|
| 49 | - * |
|
| 50 | - * @param array $users |
|
| 51 | - * |
|
| 52 | - * @return JSONResponse |
|
| 53 | - */ |
|
| 54 | - public function getDisplayNames($users) { |
|
| 55 | - $result = array(); |
|
| 45 | + /** |
|
| 46 | + * Lookup user display names |
|
| 47 | + * |
|
| 48 | + * @NoAdminRequired |
|
| 49 | + * |
|
| 50 | + * @param array $users |
|
| 51 | + * |
|
| 52 | + * @return JSONResponse |
|
| 53 | + */ |
|
| 54 | + public function getDisplayNames($users) { |
|
| 55 | + $result = array(); |
|
| 56 | 56 | |
| 57 | - foreach ($users as $user) { |
|
| 58 | - $userObject = $this->userManager->get($user); |
|
| 59 | - if (is_object($userObject)) { |
|
| 60 | - $result[$user] = $userObject->getDisplayName(); |
|
| 61 | - } else { |
|
| 62 | - $result[$user] = $user; |
|
| 63 | - } |
|
| 64 | - } |
|
| 57 | + foreach ($users as $user) { |
|
| 58 | + $userObject = $this->userManager->get($user); |
|
| 59 | + if (is_object($userObject)) { |
|
| 60 | + $result[$user] = $userObject->getDisplayName(); |
|
| 61 | + } else { |
|
| 62 | + $result[$user] = $user; |
|
| 63 | + } |
|
| 64 | + } |
|
| 65 | 65 | |
| 66 | - $json = array( |
|
| 67 | - 'users' => $result, |
|
| 68 | - 'status' => 'success' |
|
| 69 | - ); |
|
| 66 | + $json = array( |
|
| 67 | + 'users' => $result, |
|
| 68 | + 'status' => 'success' |
|
| 69 | + ); |
|
| 70 | 70 | |
| 71 | - return new JSONResponse($json); |
|
| 71 | + return new JSONResponse($json); |
|
| 72 | 72 | |
| 73 | - } |
|
| 73 | + } |
|
| 74 | 74 | } |
@@ -34,28 +34,28 @@ |
||
| 34 | 34 | |
| 35 | 35 | class RemoveCertificate extends Base { |
| 36 | 36 | |
| 37 | - /** @var ICertificateManager */ |
|
| 38 | - protected $certificateManager; |
|
| 39 | - |
|
| 40 | - public function __construct(ICertificateManager $certificateManager) { |
|
| 41 | - $this->certificateManager = $certificateManager; |
|
| 42 | - parent::__construct(); |
|
| 43 | - } |
|
| 44 | - |
|
| 45 | - protected function configure() { |
|
| 46 | - $this |
|
| 47 | - ->setName('security:certificates:remove') |
|
| 48 | - ->setDescription('remove trusted certificate') |
|
| 49 | - ->addArgument( |
|
| 50 | - 'name', |
|
| 51 | - InputArgument::REQUIRED, |
|
| 52 | - 'the file name of the certificate to remove' |
|
| 53 | - ); |
|
| 54 | - } |
|
| 55 | - |
|
| 56 | - protected function execute(InputInterface $input, OutputInterface $output) { |
|
| 57 | - $name = $input->getArgument('name'); |
|
| 58 | - |
|
| 59 | - $this->certificateManager->removeCertificate($name); |
|
| 60 | - } |
|
| 37 | + /** @var ICertificateManager */ |
|
| 38 | + protected $certificateManager; |
|
| 39 | + |
|
| 40 | + public function __construct(ICertificateManager $certificateManager) { |
|
| 41 | + $this->certificateManager = $certificateManager; |
|
| 42 | + parent::__construct(); |
|
| 43 | + } |
|
| 44 | + |
|
| 45 | + protected function configure() { |
|
| 46 | + $this |
|
| 47 | + ->setName('security:certificates:remove') |
|
| 48 | + ->setDescription('remove trusted certificate') |
|
| 49 | + ->addArgument( |
|
| 50 | + 'name', |
|
| 51 | + InputArgument::REQUIRED, |
|
| 52 | + 'the file name of the certificate to remove' |
|
| 53 | + ); |
|
| 54 | + } |
|
| 55 | + |
|
| 56 | + protected function execute(InputInterface $input, OutputInterface $output) { |
|
| 57 | + $name = $input->getArgument('name'); |
|
| 58 | + |
|
| 59 | + $this->certificateManager->removeCertificate($name); |
|
| 60 | + } |
|
| 61 | 61 | } |
@@ -34,64 +34,64 @@ |
||
| 34 | 34 | |
| 35 | 35 | class ListCertificates extends Base { |
| 36 | 36 | |
| 37 | - /** @var ICertificateManager */ |
|
| 38 | - protected $certificateManager; |
|
| 39 | - /** @var IL10N */ |
|
| 40 | - protected $l; |
|
| 37 | + /** @var ICertificateManager */ |
|
| 38 | + protected $certificateManager; |
|
| 39 | + /** @var IL10N */ |
|
| 40 | + protected $l; |
|
| 41 | 41 | |
| 42 | - public function __construct(ICertificateManager $certificateManager, IL10N $l) { |
|
| 43 | - $this->certificateManager = $certificateManager; |
|
| 44 | - $this->l = $l; |
|
| 45 | - parent::__construct(); |
|
| 46 | - } |
|
| 42 | + public function __construct(ICertificateManager $certificateManager, IL10N $l) { |
|
| 43 | + $this->certificateManager = $certificateManager; |
|
| 44 | + $this->l = $l; |
|
| 45 | + parent::__construct(); |
|
| 46 | + } |
|
| 47 | 47 | |
| 48 | - protected function configure() { |
|
| 49 | - $this |
|
| 50 | - ->setName('security:certificates') |
|
| 51 | - ->setDescription('list trusted certificates'); |
|
| 52 | - parent::configure(); |
|
| 53 | - } |
|
| 48 | + protected function configure() { |
|
| 49 | + $this |
|
| 50 | + ->setName('security:certificates') |
|
| 51 | + ->setDescription('list trusted certificates'); |
|
| 52 | + parent::configure(); |
|
| 53 | + } |
|
| 54 | 54 | |
| 55 | - protected function execute(InputInterface $input, OutputInterface $output) { |
|
| 56 | - $outputType = $input->getOption('output'); |
|
| 57 | - if ($outputType === self::OUTPUT_FORMAT_JSON || $outputType === self::OUTPUT_FORMAT_JSON_PRETTY) { |
|
| 58 | - $certificates = array_map(function (ICertificate $certificate) { |
|
| 59 | - return [ |
|
| 60 | - 'name' => $certificate->getName(), |
|
| 61 | - 'common_name' => $certificate->getCommonName(), |
|
| 62 | - 'organization' => $certificate->getOrganization(), |
|
| 63 | - 'expire' => $certificate->getExpireDate()->format(\DateTime::ATOM), |
|
| 64 | - 'issuer' => $certificate->getIssuerName(), |
|
| 65 | - 'issuer_organization' => $certificate->getIssuerOrganization(), |
|
| 66 | - 'issue_date' => $certificate->getIssueDate()->format(\DateTime::ATOM) |
|
| 67 | - ]; |
|
| 68 | - }, $this->certificateManager->listCertificates()); |
|
| 69 | - if ($outputType === self::OUTPUT_FORMAT_JSON) { |
|
| 70 | - $output->writeln(json_encode(array_values($certificates))); |
|
| 71 | - } else { |
|
| 72 | - $output->writeln(json_encode(array_values($certificates), JSON_PRETTY_PRINT)); |
|
| 73 | - } |
|
| 74 | - } else { |
|
| 75 | - $table = new Table($output); |
|
| 76 | - $table->setHeaders([ |
|
| 77 | - 'File Name', |
|
| 78 | - 'Common Name', |
|
| 79 | - 'Organization', |
|
| 80 | - 'Valid Until', |
|
| 81 | - 'Issued By' |
|
| 82 | - ]); |
|
| 55 | + protected function execute(InputInterface $input, OutputInterface $output) { |
|
| 56 | + $outputType = $input->getOption('output'); |
|
| 57 | + if ($outputType === self::OUTPUT_FORMAT_JSON || $outputType === self::OUTPUT_FORMAT_JSON_PRETTY) { |
|
| 58 | + $certificates = array_map(function (ICertificate $certificate) { |
|
| 59 | + return [ |
|
| 60 | + 'name' => $certificate->getName(), |
|
| 61 | + 'common_name' => $certificate->getCommonName(), |
|
| 62 | + 'organization' => $certificate->getOrganization(), |
|
| 63 | + 'expire' => $certificate->getExpireDate()->format(\DateTime::ATOM), |
|
| 64 | + 'issuer' => $certificate->getIssuerName(), |
|
| 65 | + 'issuer_organization' => $certificate->getIssuerOrganization(), |
|
| 66 | + 'issue_date' => $certificate->getIssueDate()->format(\DateTime::ATOM) |
|
| 67 | + ]; |
|
| 68 | + }, $this->certificateManager->listCertificates()); |
|
| 69 | + if ($outputType === self::OUTPUT_FORMAT_JSON) { |
|
| 70 | + $output->writeln(json_encode(array_values($certificates))); |
|
| 71 | + } else { |
|
| 72 | + $output->writeln(json_encode(array_values($certificates), JSON_PRETTY_PRINT)); |
|
| 73 | + } |
|
| 74 | + } else { |
|
| 75 | + $table = new Table($output); |
|
| 76 | + $table->setHeaders([ |
|
| 77 | + 'File Name', |
|
| 78 | + 'Common Name', |
|
| 79 | + 'Organization', |
|
| 80 | + 'Valid Until', |
|
| 81 | + 'Issued By' |
|
| 82 | + ]); |
|
| 83 | 83 | |
| 84 | - $rows = array_map(function (ICertificate $certificate) { |
|
| 85 | - return [ |
|
| 86 | - $certificate->getName(), |
|
| 87 | - $certificate->getCommonName(), |
|
| 88 | - $certificate->getOrganization(), |
|
| 89 | - $this->l->l('date', $certificate->getExpireDate()), |
|
| 90 | - $certificate->getIssuerName() |
|
| 91 | - ]; |
|
| 92 | - }, $this->certificateManager->listCertificates()); |
|
| 93 | - $table->setRows($rows); |
|
| 94 | - $table->render(); |
|
| 95 | - } |
|
| 96 | - } |
|
| 84 | + $rows = array_map(function (ICertificate $certificate) { |
|
| 85 | + return [ |
|
| 86 | + $certificate->getName(), |
|
| 87 | + $certificate->getCommonName(), |
|
| 88 | + $certificate->getOrganization(), |
|
| 89 | + $this->l->l('date', $certificate->getExpireDate()), |
|
| 90 | + $certificate->getIssuerName() |
|
| 91 | + ]; |
|
| 92 | + }, $this->certificateManager->listCertificates()); |
|
| 93 | + $table->setRows($rows); |
|
| 94 | + $table->render(); |
|
| 95 | + } |
|
| 96 | + } |
|
| 97 | 97 | } |