@@ -38,76 +38,76 @@ |
||
38 | 38 | * @package OC\Core\Command\Integrity |
39 | 39 | */ |
40 | 40 | class SignApp extends Command { |
41 | - /** @var Checker */ |
|
42 | - private $checker; |
|
43 | - /** @var FileAccessHelper */ |
|
44 | - private $fileAccessHelper; |
|
45 | - /** @var IURLGenerator */ |
|
46 | - private $urlGenerator; |
|
41 | + /** @var Checker */ |
|
42 | + private $checker; |
|
43 | + /** @var FileAccessHelper */ |
|
44 | + private $fileAccessHelper; |
|
45 | + /** @var IURLGenerator */ |
|
46 | + private $urlGenerator; |
|
47 | 47 | |
48 | - /** |
|
49 | - * @param Checker $checker |
|
50 | - * @param FileAccessHelper $fileAccessHelper |
|
51 | - * @param IURLGenerator $urlGenerator |
|
52 | - */ |
|
53 | - public function __construct(Checker $checker, |
|
54 | - FileAccessHelper $fileAccessHelper, |
|
55 | - IURLGenerator $urlGenerator) { |
|
56 | - parent::__construct(null); |
|
57 | - $this->checker = $checker; |
|
58 | - $this->fileAccessHelper = $fileAccessHelper; |
|
59 | - $this->urlGenerator = $urlGenerator; |
|
60 | - } |
|
48 | + /** |
|
49 | + * @param Checker $checker |
|
50 | + * @param FileAccessHelper $fileAccessHelper |
|
51 | + * @param IURLGenerator $urlGenerator |
|
52 | + */ |
|
53 | + public function __construct(Checker $checker, |
|
54 | + FileAccessHelper $fileAccessHelper, |
|
55 | + IURLGenerator $urlGenerator) { |
|
56 | + parent::__construct(null); |
|
57 | + $this->checker = $checker; |
|
58 | + $this->fileAccessHelper = $fileAccessHelper; |
|
59 | + $this->urlGenerator = $urlGenerator; |
|
60 | + } |
|
61 | 61 | |
62 | - protected function configure() { |
|
63 | - $this |
|
64 | - ->setName('integrity:sign-app') |
|
65 | - ->setDescription('Signs an app using a private key.') |
|
66 | - ->addOption('path', null, InputOption::VALUE_REQUIRED, 'Application to sign') |
|
67 | - ->addOption('privateKey', null, InputOption::VALUE_REQUIRED, 'Path to private key to use for signing') |
|
68 | - ->addOption('certificate', null, InputOption::VALUE_REQUIRED, 'Path to certificate to use for signing'); |
|
69 | - } |
|
62 | + protected function configure() { |
|
63 | + $this |
|
64 | + ->setName('integrity:sign-app') |
|
65 | + ->setDescription('Signs an app using a private key.') |
|
66 | + ->addOption('path', null, InputOption::VALUE_REQUIRED, 'Application to sign') |
|
67 | + ->addOption('privateKey', null, InputOption::VALUE_REQUIRED, 'Path to private key to use for signing') |
|
68 | + ->addOption('certificate', null, InputOption::VALUE_REQUIRED, 'Path to certificate to use for signing'); |
|
69 | + } |
|
70 | 70 | |
71 | - /** |
|
72 | - * {@inheritdoc } |
|
73 | - */ |
|
74 | - protected function execute(InputInterface $input, OutputInterface $output) { |
|
75 | - $path = $input->getOption('path'); |
|
76 | - $privateKeyPath = $input->getOption('privateKey'); |
|
77 | - $keyBundlePath = $input->getOption('certificate'); |
|
78 | - if(is_null($path) || is_null($privateKeyPath) || is_null($keyBundlePath)) { |
|
79 | - $documentationUrl = $this->urlGenerator->linkToDocs('developer-code-integrity'); |
|
80 | - $output->writeln('This command requires the --path, --privateKey and --certificate.'); |
|
81 | - $output->writeln('Example: ./occ integrity:sign-app --path="/Users/lukasreschke/Programming/myapp/" --privateKey="/Users/lukasreschke/private/myapp.key" --certificate="/Users/lukasreschke/public/mycert.crt"'); |
|
82 | - $output->writeln('For more information please consult the documentation: '. $documentationUrl); |
|
83 | - return null; |
|
84 | - } |
|
71 | + /** |
|
72 | + * {@inheritdoc } |
|
73 | + */ |
|
74 | + protected function execute(InputInterface $input, OutputInterface $output) { |
|
75 | + $path = $input->getOption('path'); |
|
76 | + $privateKeyPath = $input->getOption('privateKey'); |
|
77 | + $keyBundlePath = $input->getOption('certificate'); |
|
78 | + if(is_null($path) || is_null($privateKeyPath) || is_null($keyBundlePath)) { |
|
79 | + $documentationUrl = $this->urlGenerator->linkToDocs('developer-code-integrity'); |
|
80 | + $output->writeln('This command requires the --path, --privateKey and --certificate.'); |
|
81 | + $output->writeln('Example: ./occ integrity:sign-app --path="/Users/lukasreschke/Programming/myapp/" --privateKey="/Users/lukasreschke/private/myapp.key" --certificate="/Users/lukasreschke/public/mycert.crt"'); |
|
82 | + $output->writeln('For more information please consult the documentation: '. $documentationUrl); |
|
83 | + return null; |
|
84 | + } |
|
85 | 85 | |
86 | - $privateKey = $this->fileAccessHelper->file_get_contents($privateKeyPath); |
|
87 | - $keyBundle = $this->fileAccessHelper->file_get_contents($keyBundlePath); |
|
86 | + $privateKey = $this->fileAccessHelper->file_get_contents($privateKeyPath); |
|
87 | + $keyBundle = $this->fileAccessHelper->file_get_contents($keyBundlePath); |
|
88 | 88 | |
89 | - if($privateKey === false) { |
|
90 | - $output->writeln(sprintf('Private key "%s" does not exists.', $privateKeyPath)); |
|
91 | - return null; |
|
92 | - } |
|
89 | + if($privateKey === false) { |
|
90 | + $output->writeln(sprintf('Private key "%s" does not exists.', $privateKeyPath)); |
|
91 | + return null; |
|
92 | + } |
|
93 | 93 | |
94 | - if($keyBundle === false) { |
|
95 | - $output->writeln(sprintf('Certificate "%s" does not exists.', $keyBundlePath)); |
|
96 | - return null; |
|
97 | - } |
|
94 | + if($keyBundle === false) { |
|
95 | + $output->writeln(sprintf('Certificate "%s" does not exists.', $keyBundlePath)); |
|
96 | + return null; |
|
97 | + } |
|
98 | 98 | |
99 | - $rsa = new RSA(); |
|
100 | - $rsa->loadKey($privateKey); |
|
101 | - $x509 = new X509(); |
|
102 | - $x509->loadX509($keyBundle); |
|
103 | - $x509->setPrivateKey($rsa); |
|
104 | - try { |
|
105 | - $this->checker->writeAppSignature($path, $x509, $rsa); |
|
106 | - $output->writeln('Successfully signed "'.$path.'"'); |
|
107 | - } catch (\Exception $e){ |
|
108 | - $output->writeln('Error: ' . $e->getMessage()); |
|
109 | - return 1; |
|
110 | - } |
|
111 | - return 0; |
|
112 | - } |
|
99 | + $rsa = new RSA(); |
|
100 | + $rsa->loadKey($privateKey); |
|
101 | + $x509 = new X509(); |
|
102 | + $x509->loadX509($keyBundle); |
|
103 | + $x509->setPrivateKey($rsa); |
|
104 | + try { |
|
105 | + $this->checker->writeAppSignature($path, $x509, $rsa); |
|
106 | + $output->writeln('Successfully signed "'.$path.'"'); |
|
107 | + } catch (\Exception $e){ |
|
108 | + $output->writeln('Error: ' . $e->getMessage()); |
|
109 | + return 1; |
|
110 | + } |
|
111 | + return 0; |
|
112 | + } |
|
113 | 113 | } |
@@ -75,23 +75,23 @@ discard block |
||
75 | 75 | $path = $input->getOption('path'); |
76 | 76 | $privateKeyPath = $input->getOption('privateKey'); |
77 | 77 | $keyBundlePath = $input->getOption('certificate'); |
78 | - if(is_null($path) || is_null($privateKeyPath) || is_null($keyBundlePath)) { |
|
78 | + if (is_null($path) || is_null($privateKeyPath) || is_null($keyBundlePath)) { |
|
79 | 79 | $documentationUrl = $this->urlGenerator->linkToDocs('developer-code-integrity'); |
80 | 80 | $output->writeln('This command requires the --path, --privateKey and --certificate.'); |
81 | 81 | $output->writeln('Example: ./occ integrity:sign-app --path="/Users/lukasreschke/Programming/myapp/" --privateKey="/Users/lukasreschke/private/myapp.key" --certificate="/Users/lukasreschke/public/mycert.crt"'); |
82 | - $output->writeln('For more information please consult the documentation: '. $documentationUrl); |
|
82 | + $output->writeln('For more information please consult the documentation: '.$documentationUrl); |
|
83 | 83 | return null; |
84 | 84 | } |
85 | 85 | |
86 | 86 | $privateKey = $this->fileAccessHelper->file_get_contents($privateKeyPath); |
87 | 87 | $keyBundle = $this->fileAccessHelper->file_get_contents($keyBundlePath); |
88 | 88 | |
89 | - if($privateKey === false) { |
|
89 | + if ($privateKey === false) { |
|
90 | 90 | $output->writeln(sprintf('Private key "%s" does not exists.', $privateKeyPath)); |
91 | 91 | return null; |
92 | 92 | } |
93 | 93 | |
94 | - if($keyBundle === false) { |
|
94 | + if ($keyBundle === false) { |
|
95 | 95 | $output->writeln(sprintf('Certificate "%s" does not exists.', $keyBundlePath)); |
96 | 96 | return null; |
97 | 97 | } |
@@ -104,8 +104,8 @@ discard block |
||
104 | 104 | try { |
105 | 105 | $this->checker->writeAppSignature($path, $x509, $rsa); |
106 | 106 | $output->writeln('Successfully signed "'.$path.'"'); |
107 | - } catch (\Exception $e){ |
|
108 | - $output->writeln('Error: ' . $e->getMessage()); |
|
107 | + } catch (\Exception $e) { |
|
108 | + $output->writeln('Error: '.$e->getMessage()); |
|
109 | 109 | return 1; |
110 | 110 | } |
111 | 111 | return 0; |
@@ -34,34 +34,34 @@ |
||
34 | 34 | * @package OC\Core\Command\Integrity |
35 | 35 | */ |
36 | 36 | class CheckCore extends Base { |
37 | - /** |
|
38 | - * @var Checker |
|
39 | - */ |
|
40 | - private $checker; |
|
37 | + /** |
|
38 | + * @var Checker |
|
39 | + */ |
|
40 | + private $checker; |
|
41 | 41 | |
42 | - public function __construct(Checker $checker) { |
|
43 | - parent::__construct(); |
|
44 | - $this->checker = $checker; |
|
45 | - } |
|
42 | + public function __construct(Checker $checker) { |
|
43 | + parent::__construct(); |
|
44 | + $this->checker = $checker; |
|
45 | + } |
|
46 | 46 | |
47 | - /** |
|
48 | - * {@inheritdoc } |
|
49 | - */ |
|
50 | - protected function configure() { |
|
51 | - parent::configure(); |
|
52 | - $this |
|
53 | - ->setName('integrity:check-core') |
|
54 | - ->setDescription('Check integrity of core code using a signature.'); |
|
55 | - } |
|
47 | + /** |
|
48 | + * {@inheritdoc } |
|
49 | + */ |
|
50 | + protected function configure() { |
|
51 | + parent::configure(); |
|
52 | + $this |
|
53 | + ->setName('integrity:check-core') |
|
54 | + ->setDescription('Check integrity of core code using a signature.'); |
|
55 | + } |
|
56 | 56 | |
57 | - /** |
|
58 | - * {@inheritdoc } |
|
59 | - */ |
|
60 | - protected function execute(InputInterface $input, OutputInterface $output) { |
|
61 | - $result = $this->checker->verifyCoreSignature(); |
|
62 | - $this->writeArrayInOutputFormat($input, $output, $result); |
|
63 | - if (count($result)>0){ |
|
64 | - return 1; |
|
65 | - } |
|
66 | - } |
|
57 | + /** |
|
58 | + * {@inheritdoc } |
|
59 | + */ |
|
60 | + protected function execute(InputInterface $input, OutputInterface $output) { |
|
61 | + $result = $this->checker->verifyCoreSignature(); |
|
62 | + $this->writeArrayInOutputFormat($input, $output, $result); |
|
63 | + if (count($result)>0){ |
|
64 | + return 1; |
|
65 | + } |
|
66 | + } |
|
67 | 67 | } |
@@ -60,7 +60,7 @@ |
||
60 | 60 | protected function execute(InputInterface $input, OutputInterface $output) { |
61 | 61 | $result = $this->checker->verifyCoreSignature(); |
62 | 62 | $this->writeArrayInOutputFormat($input, $output, $result); |
63 | - if (count($result)>0){ |
|
63 | + if (count($result) > 0) { |
|
64 | 64 | return 1; |
65 | 65 | } |
66 | 66 | } |
@@ -56,20 +56,20 @@ |
||
56 | 56 | |
57 | 57 | protected function execute(InputInterface $input, OutputInterface $output) { |
58 | 58 | $user = $this->userManager->get($input->getArgument('uid')); |
59 | - if(is_null($user)) { |
|
59 | + if (is_null($user)) { |
|
60 | 60 | $output->writeln('<error>User does not exist</error>'); |
61 | 61 | return; |
62 | 62 | } |
63 | 63 | |
64 | 64 | $lastLogin = $user->getLastLogin(); |
65 | - if($lastLogin === 0) { |
|
66 | - $output->writeln('User ' . $user->getUID() . |
|
65 | + if ($lastLogin === 0) { |
|
66 | + $output->writeln('User '.$user->getUID(). |
|
67 | 67 | ' has never logged in, yet.'); |
68 | 68 | } else { |
69 | 69 | $date = new \DateTime(); |
70 | 70 | $date->setTimestamp($lastLogin); |
71 | - $output->writeln($user->getUID() . |
|
72 | - '`s last login: ' . $date->format('d.m.Y H:i')); |
|
71 | + $output->writeln($user->getUID(). |
|
72 | + '`s last login: '.$date->format('d.m.Y H:i')); |
|
73 | 73 | } |
74 | 74 | } |
75 | 75 | } |
@@ -32,44 +32,44 @@ |
||
32 | 32 | use Symfony\Component\Console\Output\OutputInterface; |
33 | 33 | |
34 | 34 | class LastSeen extends Command { |
35 | - /** @var IUserManager */ |
|
36 | - protected $userManager; |
|
35 | + /** @var IUserManager */ |
|
36 | + protected $userManager; |
|
37 | 37 | |
38 | - /** |
|
39 | - * @param IUserManager $userManager |
|
40 | - */ |
|
41 | - public function __construct(IUserManager $userManager) { |
|
42 | - $this->userManager = $userManager; |
|
43 | - parent::__construct(); |
|
44 | - } |
|
38 | + /** |
|
39 | + * @param IUserManager $userManager |
|
40 | + */ |
|
41 | + public function __construct(IUserManager $userManager) { |
|
42 | + $this->userManager = $userManager; |
|
43 | + parent::__construct(); |
|
44 | + } |
|
45 | 45 | |
46 | - protected function configure() { |
|
47 | - $this |
|
48 | - ->setName('user:lastseen') |
|
49 | - ->setDescription('shows when the user was logged in last time') |
|
50 | - ->addArgument( |
|
51 | - 'uid', |
|
52 | - InputArgument::REQUIRED, |
|
53 | - 'the username' |
|
54 | - ); |
|
55 | - } |
|
46 | + protected function configure() { |
|
47 | + $this |
|
48 | + ->setName('user:lastseen') |
|
49 | + ->setDescription('shows when the user was logged in last time') |
|
50 | + ->addArgument( |
|
51 | + 'uid', |
|
52 | + InputArgument::REQUIRED, |
|
53 | + 'the username' |
|
54 | + ); |
|
55 | + } |
|
56 | 56 | |
57 | - protected function execute(InputInterface $input, OutputInterface $output) { |
|
58 | - $user = $this->userManager->get($input->getArgument('uid')); |
|
59 | - if(is_null($user)) { |
|
60 | - $output->writeln('<error>User does not exist</error>'); |
|
61 | - return; |
|
62 | - } |
|
57 | + protected function execute(InputInterface $input, OutputInterface $output) { |
|
58 | + $user = $this->userManager->get($input->getArgument('uid')); |
|
59 | + if(is_null($user)) { |
|
60 | + $output->writeln('<error>User does not exist</error>'); |
|
61 | + return; |
|
62 | + } |
|
63 | 63 | |
64 | - $lastLogin = $user->getLastLogin(); |
|
65 | - if($lastLogin === 0) { |
|
66 | - $output->writeln('User ' . $user->getUID() . |
|
67 | - ' has never logged in, yet.'); |
|
68 | - } else { |
|
69 | - $date = new \DateTime(); |
|
70 | - $date->setTimestamp($lastLogin); |
|
71 | - $output->writeln($user->getUID() . |
|
72 | - '`s last login: ' . $date->format('d.m.Y H:i')); |
|
73 | - } |
|
74 | - } |
|
64 | + $lastLogin = $user->getLastLogin(); |
|
65 | + if($lastLogin === 0) { |
|
66 | + $output->writeln('User ' . $user->getUID() . |
|
67 | + ' has never logged in, yet.'); |
|
68 | + } else { |
|
69 | + $date = new \DateTime(); |
|
70 | + $date->setTimestamp($lastLogin); |
|
71 | + $output->writeln($user->getUID() . |
|
72 | + '`s last login: ' . $date->format('d.m.Y H:i')); |
|
73 | + } |
|
74 | + } |
|
75 | 75 | } |
@@ -117,12 +117,12 @@ |
||
117 | 117 | try { |
118 | 118 | $success = $user->setPassword($password); |
119 | 119 | } catch (\Exception $e) { |
120 | - $output->writeln('<error>' . $e->getMessage() . '</error>'); |
|
120 | + $output->writeln('<error>'.$e->getMessage().'</error>'); |
|
121 | 121 | return 1; |
122 | 122 | } |
123 | 123 | |
124 | 124 | if ($success) { |
125 | - $output->writeln("<info>Successfully reset password for " . $username . "</info>"); |
|
125 | + $output->writeln("<info>Successfully reset password for ".$username."</info>"); |
|
126 | 126 | } else { |
127 | 127 | $output->writeln("<error>Error while resetting password!</error>"); |
128 | 128 | return 1; |
@@ -39,98 +39,98 @@ |
||
39 | 39 | |
40 | 40 | class ResetPassword extends Command { |
41 | 41 | |
42 | - /** @var IUserManager */ |
|
43 | - protected $userManager; |
|
44 | - |
|
45 | - public function __construct(IUserManager $userManager) { |
|
46 | - $this->userManager = $userManager; |
|
47 | - parent::__construct(); |
|
48 | - } |
|
49 | - |
|
50 | - protected function configure() { |
|
51 | - $this |
|
52 | - ->setName('user:resetpassword') |
|
53 | - ->setDescription('Resets the password of the named user') |
|
54 | - ->addArgument( |
|
55 | - 'user', |
|
56 | - InputArgument::REQUIRED, |
|
57 | - 'Username to reset password' |
|
58 | - ) |
|
59 | - ->addOption( |
|
60 | - 'password-from-env', |
|
61 | - null, |
|
62 | - InputOption::VALUE_NONE, |
|
63 | - 'read password from environment variable OC_PASS' |
|
64 | - ) |
|
65 | - ; |
|
66 | - } |
|
67 | - |
|
68 | - protected function execute(InputInterface $input, OutputInterface $output) { |
|
69 | - $username = $input->getArgument('user'); |
|
70 | - |
|
71 | - /** @var $user \OCP\IUser */ |
|
72 | - $user = $this->userManager->get($username); |
|
73 | - if (is_null($user)) { |
|
74 | - $output->writeln('<error>User does not exist</error>'); |
|
75 | - return 1; |
|
76 | - } |
|
77 | - |
|
78 | - if ($input->getOption('password-from-env')) { |
|
79 | - $password = getenv('OC_PASS'); |
|
80 | - if (!$password) { |
|
81 | - $output->writeln('<error>--password-from-env given, but OC_PASS is empty!</error>'); |
|
82 | - return 1; |
|
83 | - } |
|
84 | - } elseif ($input->isInteractive()) { |
|
85 | - /** @var QuestionHelper $helper */ |
|
86 | - $helper = $this->getHelper('question'); |
|
87 | - |
|
88 | - if (\OCP\App::isEnabled('encryption')) { |
|
89 | - $output->writeln( |
|
90 | - '<error>Warning: Resetting the password when using encryption will result in data loss!</error>' |
|
91 | - ); |
|
92 | - |
|
93 | - $question = new ConfirmationQuestion('Do you want to continue?'); |
|
94 | - if (!$helper->ask($input, $output, $question)) { |
|
95 | - return 1; |
|
96 | - } |
|
97 | - } |
|
98 | - |
|
99 | - $question = new Question('Enter a new password: '); |
|
100 | - $question->setHidden(true); |
|
101 | - $password = $helper->ask($input, $output, $question); |
|
102 | - |
|
103 | - if ($password === null) { |
|
104 | - $output->writeln("<error>Password cannot be empty!</error>"); |
|
105 | - return 1; |
|
106 | - } |
|
107 | - |
|
108 | - $question = new Question('Confirm the new password: '); |
|
109 | - $question->setHidden(true); |
|
110 | - $confirm = $helper->ask($input, $output, $question); |
|
111 | - |
|
112 | - if ($password !== $confirm) { |
|
113 | - $output->writeln("<error>Passwords did not match!</error>"); |
|
114 | - return 1; |
|
115 | - } |
|
116 | - } else { |
|
117 | - $output->writeln("<error>Interactive input or --password-from-env is needed for entering a new password!</error>"); |
|
118 | - return 1; |
|
119 | - } |
|
120 | - |
|
121 | - |
|
122 | - try { |
|
123 | - $success = $user->setPassword($password); |
|
124 | - } catch (\Exception $e) { |
|
125 | - $output->writeln('<error>' . $e->getMessage() . '</error>'); |
|
126 | - return 1; |
|
127 | - } |
|
128 | - |
|
129 | - if ($success) { |
|
130 | - $output->writeln("<info>Successfully reset password for " . $username . "</info>"); |
|
131 | - } else { |
|
132 | - $output->writeln("<error>Error while resetting password!</error>"); |
|
133 | - return 1; |
|
134 | - } |
|
135 | - } |
|
42 | + /** @var IUserManager */ |
|
43 | + protected $userManager; |
|
44 | + |
|
45 | + public function __construct(IUserManager $userManager) { |
|
46 | + $this->userManager = $userManager; |
|
47 | + parent::__construct(); |
|
48 | + } |
|
49 | + |
|
50 | + protected function configure() { |
|
51 | + $this |
|
52 | + ->setName('user:resetpassword') |
|
53 | + ->setDescription('Resets the password of the named user') |
|
54 | + ->addArgument( |
|
55 | + 'user', |
|
56 | + InputArgument::REQUIRED, |
|
57 | + 'Username to reset password' |
|
58 | + ) |
|
59 | + ->addOption( |
|
60 | + 'password-from-env', |
|
61 | + null, |
|
62 | + InputOption::VALUE_NONE, |
|
63 | + 'read password from environment variable OC_PASS' |
|
64 | + ) |
|
65 | + ; |
|
66 | + } |
|
67 | + |
|
68 | + protected function execute(InputInterface $input, OutputInterface $output) { |
|
69 | + $username = $input->getArgument('user'); |
|
70 | + |
|
71 | + /** @var $user \OCP\IUser */ |
|
72 | + $user = $this->userManager->get($username); |
|
73 | + if (is_null($user)) { |
|
74 | + $output->writeln('<error>User does not exist</error>'); |
|
75 | + return 1; |
|
76 | + } |
|
77 | + |
|
78 | + if ($input->getOption('password-from-env')) { |
|
79 | + $password = getenv('OC_PASS'); |
|
80 | + if (!$password) { |
|
81 | + $output->writeln('<error>--password-from-env given, but OC_PASS is empty!</error>'); |
|
82 | + return 1; |
|
83 | + } |
|
84 | + } elseif ($input->isInteractive()) { |
|
85 | + /** @var QuestionHelper $helper */ |
|
86 | + $helper = $this->getHelper('question'); |
|
87 | + |
|
88 | + if (\OCP\App::isEnabled('encryption')) { |
|
89 | + $output->writeln( |
|
90 | + '<error>Warning: Resetting the password when using encryption will result in data loss!</error>' |
|
91 | + ); |
|
92 | + |
|
93 | + $question = new ConfirmationQuestion('Do you want to continue?'); |
|
94 | + if (!$helper->ask($input, $output, $question)) { |
|
95 | + return 1; |
|
96 | + } |
|
97 | + } |
|
98 | + |
|
99 | + $question = new Question('Enter a new password: '); |
|
100 | + $question->setHidden(true); |
|
101 | + $password = $helper->ask($input, $output, $question); |
|
102 | + |
|
103 | + if ($password === null) { |
|
104 | + $output->writeln("<error>Password cannot be empty!</error>"); |
|
105 | + return 1; |
|
106 | + } |
|
107 | + |
|
108 | + $question = new Question('Confirm the new password: '); |
|
109 | + $question->setHidden(true); |
|
110 | + $confirm = $helper->ask($input, $output, $question); |
|
111 | + |
|
112 | + if ($password !== $confirm) { |
|
113 | + $output->writeln("<error>Passwords did not match!</error>"); |
|
114 | + return 1; |
|
115 | + } |
|
116 | + } else { |
|
117 | + $output->writeln("<error>Interactive input or --password-from-env is needed for entering a new password!</error>"); |
|
118 | + return 1; |
|
119 | + } |
|
120 | + |
|
121 | + |
|
122 | + try { |
|
123 | + $success = $user->setPassword($password); |
|
124 | + } catch (\Exception $e) { |
|
125 | + $output->writeln('<error>' . $e->getMessage() . '</error>'); |
|
126 | + return 1; |
|
127 | + } |
|
128 | + |
|
129 | + if ($success) { |
|
130 | + $output->writeln("<info>Successfully reset password for " . $username . "</info>"); |
|
131 | + } else { |
|
132 | + $output->writeln("<error>Error while resetting password!</error>"); |
|
133 | + return 1; |
|
134 | + } |
|
135 | + } |
|
136 | 136 | } |
@@ -27,7 +27,7 @@ |
||
27 | 27 | |
28 | 28 | class WebCron extends Base { |
29 | 29 | |
30 | - protected function getMode() { |
|
31 | - return 'webcron'; |
|
32 | - } |
|
30 | + protected function getMode() { |
|
31 | + return 'webcron'; |
|
32 | + } |
|
33 | 33 | } |
@@ -39,39 +39,39 @@ |
||
39 | 39 | abstract class Base extends Command { |
40 | 40 | |
41 | 41 | |
42 | - abstract protected function getMode(); |
|
42 | + abstract protected function getMode(); |
|
43 | 43 | |
44 | - /** |
|
45 | - * @var \OCP\IConfig |
|
46 | - */ |
|
47 | - protected $config; |
|
44 | + /** |
|
45 | + * @var \OCP\IConfig |
|
46 | + */ |
|
47 | + protected $config; |
|
48 | 48 | |
49 | - /** |
|
50 | - * @param \OCP\IConfig $config |
|
51 | - */ |
|
52 | - public function __construct(IConfig $config) { |
|
53 | - $this->config = $config; |
|
54 | - parent::__construct(); |
|
55 | - } |
|
49 | + /** |
|
50 | + * @param \OCP\IConfig $config |
|
51 | + */ |
|
52 | + public function __construct(IConfig $config) { |
|
53 | + $this->config = $config; |
|
54 | + parent::__construct(); |
|
55 | + } |
|
56 | 56 | |
57 | - protected function configure() { |
|
58 | - $mode = $this->getMode(); |
|
59 | - $this |
|
60 | - ->setName("background:$mode") |
|
61 | - ->setDescription("Use $mode to run background jobs"); |
|
62 | - } |
|
57 | + protected function configure() { |
|
58 | + $mode = $this->getMode(); |
|
59 | + $this |
|
60 | + ->setName("background:$mode") |
|
61 | + ->setDescription("Use $mode to run background jobs"); |
|
62 | + } |
|
63 | 63 | |
64 | - /** |
|
65 | - * Executing this command will set the background job mode for owncloud. |
|
66 | - * The mode to set is specified by the concrete sub class by implementing the |
|
67 | - * getMode() function. |
|
68 | - * |
|
69 | - * @param InputInterface $input |
|
70 | - * @param OutputInterface $output |
|
71 | - */ |
|
72 | - protected function execute(InputInterface $input, OutputInterface $output) { |
|
73 | - $mode = $this->getMode(); |
|
74 | - $this->config->setAppValue( 'core', 'backgroundjobs_mode', $mode ); |
|
75 | - $output->writeln("Set mode for background jobs to '$mode'"); |
|
76 | - } |
|
64 | + /** |
|
65 | + * Executing this command will set the background job mode for owncloud. |
|
66 | + * The mode to set is specified by the concrete sub class by implementing the |
|
67 | + * getMode() function. |
|
68 | + * |
|
69 | + * @param InputInterface $input |
|
70 | + * @param OutputInterface $output |
|
71 | + */ |
|
72 | + protected function execute(InputInterface $input, OutputInterface $output) { |
|
73 | + $mode = $this->getMode(); |
|
74 | + $this->config->setAppValue( 'core', 'backgroundjobs_mode', $mode ); |
|
75 | + $output->writeln("Set mode for background jobs to '$mode'"); |
|
76 | + } |
|
77 | 77 | } |
@@ -71,7 +71,7 @@ |
||
71 | 71 | */ |
72 | 72 | protected function execute(InputInterface $input, OutputInterface $output) { |
73 | 73 | $mode = $this->getMode(); |
74 | - $this->config->setAppValue( 'core', 'backgroundjobs_mode', $mode ); |
|
74 | + $this->config->setAppValue('core', 'backgroundjobs_mode', $mode); |
|
75 | 75 | $output->writeln("Set mode for background jobs to '$mode'"); |
76 | 76 | } |
77 | 77 | } |
@@ -27,7 +27,7 @@ |
||
27 | 27 | |
28 | 28 | class Cron extends Base { |
29 | 29 | |
30 | - protected function getMode() { |
|
31 | - return 'cron'; |
|
32 | - } |
|
30 | + protected function getMode() { |
|
31 | + return 'cron'; |
|
32 | + } |
|
33 | 33 | } |
@@ -27,7 +27,7 @@ |
||
27 | 27 | |
28 | 28 | class Ajax extends Base { |
29 | 29 | |
30 | - protected function getMode() { |
|
31 | - return 'ajax'; |
|
32 | - } |
|
30 | + protected function getMode() { |
|
31 | + return 'ajax'; |
|
32 | + } |
|
33 | 33 | } |
@@ -32,127 +32,127 @@ |
||
32 | 32 | use Symfony\Component\Console\Output\OutputInterface; |
33 | 33 | |
34 | 34 | class ListConfigs extends Base { |
35 | - protected $defaultOutputFormat = self::OUTPUT_FORMAT_JSON_PRETTY; |
|
36 | - |
|
37 | - /** * @var SystemConfig */ |
|
38 | - protected $systemConfig; |
|
39 | - |
|
40 | - /** @var IAppConfig */ |
|
41 | - protected $appConfig; |
|
42 | - |
|
43 | - /** |
|
44 | - * @param SystemConfig $systemConfig |
|
45 | - * @param IAppConfig $appConfig |
|
46 | - */ |
|
47 | - public function __construct(SystemConfig $systemConfig, IAppConfig $appConfig) { |
|
48 | - parent::__construct(); |
|
49 | - $this->systemConfig = $systemConfig; |
|
50 | - $this->appConfig = $appConfig; |
|
51 | - } |
|
52 | - |
|
53 | - protected function configure() { |
|
54 | - parent::configure(); |
|
55 | - |
|
56 | - $this |
|
57 | - ->setName('config:list') |
|
58 | - ->setDescription('List all configs') |
|
59 | - ->addArgument( |
|
60 | - 'app', |
|
61 | - InputArgument::OPTIONAL, |
|
62 | - 'Name of the app ("system" to get the config.php values, "all" for all apps and system)', |
|
63 | - 'all' |
|
64 | - ) |
|
65 | - ->addOption( |
|
66 | - 'private', |
|
67 | - null, |
|
68 | - InputOption::VALUE_NONE, |
|
69 | - 'Use this option when you want to include sensitive configs like passwords, salts, ...' |
|
70 | - ) |
|
71 | - ; |
|
72 | - } |
|
73 | - |
|
74 | - protected function execute(InputInterface $input, OutputInterface $output) { |
|
75 | - $app = $input->getArgument('app'); |
|
76 | - $noSensitiveValues = !$input->getOption('private'); |
|
77 | - |
|
78 | - switch ($app) { |
|
79 | - case 'system': |
|
80 | - $configs = [ |
|
81 | - 'system' => $this->getSystemConfigs($noSensitiveValues), |
|
82 | - ]; |
|
83 | - break; |
|
84 | - |
|
85 | - case 'all': |
|
86 | - $apps = $this->appConfig->getApps(); |
|
87 | - $configs = [ |
|
88 | - 'system' => $this->getSystemConfigs($noSensitiveValues), |
|
89 | - 'apps' => [], |
|
90 | - ]; |
|
91 | - foreach ($apps as $appName) { |
|
92 | - $configs['apps'][$appName] = $this->getAppConfigs($appName, $noSensitiveValues); |
|
93 | - } |
|
94 | - break; |
|
95 | - |
|
96 | - default: |
|
97 | - $configs = [ |
|
98 | - 'apps' => [ |
|
99 | - $app => $this->getAppConfigs($app, $noSensitiveValues), |
|
100 | - ], |
|
101 | - ]; |
|
102 | - } |
|
103 | - |
|
104 | - $this->writeArrayInOutputFormat($input, $output, $configs); |
|
105 | - } |
|
106 | - |
|
107 | - /** |
|
108 | - * Get the system configs |
|
109 | - * |
|
110 | - * @param bool $noSensitiveValues |
|
111 | - * @return array |
|
112 | - */ |
|
113 | - protected function getSystemConfigs($noSensitiveValues) { |
|
114 | - $keys = $this->systemConfig->getKeys(); |
|
115 | - |
|
116 | - $configs = []; |
|
117 | - foreach ($keys as $key) { |
|
118 | - if ($noSensitiveValues) { |
|
119 | - $value = $this->systemConfig->getFilteredValue($key, serialize(null)); |
|
120 | - } else { |
|
121 | - $value = $this->systemConfig->getValue($key, serialize(null)); |
|
122 | - } |
|
123 | - |
|
124 | - if ($value !== 'N;') { |
|
125 | - $configs[$key] = $value; |
|
126 | - } |
|
127 | - } |
|
128 | - |
|
129 | - return $configs; |
|
130 | - } |
|
131 | - |
|
132 | - /** |
|
133 | - * Get the app configs |
|
134 | - * |
|
135 | - * @param string $app |
|
136 | - * @param bool $noSensitiveValues |
|
137 | - * @return array |
|
138 | - */ |
|
139 | - protected function getAppConfigs($app, $noSensitiveValues) { |
|
140 | - if ($noSensitiveValues) { |
|
141 | - return $this->appConfig->getFilteredValues($app, false); |
|
142 | - } else { |
|
143 | - return $this->appConfig->getValues($app, false); |
|
144 | - } |
|
145 | - } |
|
146 | - |
|
147 | - /** |
|
148 | - * @param string $argumentName |
|
149 | - * @param CompletionContext $context |
|
150 | - * @return string[] |
|
151 | - */ |
|
152 | - public function completeArgumentValues($argumentName, CompletionContext $context) { |
|
153 | - if ($argumentName === 'app') { |
|
154 | - return array_merge(['all', 'system'], \OC_App::getAllApps()); |
|
155 | - } |
|
156 | - return []; |
|
157 | - } |
|
35 | + protected $defaultOutputFormat = self::OUTPUT_FORMAT_JSON_PRETTY; |
|
36 | + |
|
37 | + /** * @var SystemConfig */ |
|
38 | + protected $systemConfig; |
|
39 | + |
|
40 | + /** @var IAppConfig */ |
|
41 | + protected $appConfig; |
|
42 | + |
|
43 | + /** |
|
44 | + * @param SystemConfig $systemConfig |
|
45 | + * @param IAppConfig $appConfig |
|
46 | + */ |
|
47 | + public function __construct(SystemConfig $systemConfig, IAppConfig $appConfig) { |
|
48 | + parent::__construct(); |
|
49 | + $this->systemConfig = $systemConfig; |
|
50 | + $this->appConfig = $appConfig; |
|
51 | + } |
|
52 | + |
|
53 | + protected function configure() { |
|
54 | + parent::configure(); |
|
55 | + |
|
56 | + $this |
|
57 | + ->setName('config:list') |
|
58 | + ->setDescription('List all configs') |
|
59 | + ->addArgument( |
|
60 | + 'app', |
|
61 | + InputArgument::OPTIONAL, |
|
62 | + 'Name of the app ("system" to get the config.php values, "all" for all apps and system)', |
|
63 | + 'all' |
|
64 | + ) |
|
65 | + ->addOption( |
|
66 | + 'private', |
|
67 | + null, |
|
68 | + InputOption::VALUE_NONE, |
|
69 | + 'Use this option when you want to include sensitive configs like passwords, salts, ...' |
|
70 | + ) |
|
71 | + ; |
|
72 | + } |
|
73 | + |
|
74 | + protected function execute(InputInterface $input, OutputInterface $output) { |
|
75 | + $app = $input->getArgument('app'); |
|
76 | + $noSensitiveValues = !$input->getOption('private'); |
|
77 | + |
|
78 | + switch ($app) { |
|
79 | + case 'system': |
|
80 | + $configs = [ |
|
81 | + 'system' => $this->getSystemConfigs($noSensitiveValues), |
|
82 | + ]; |
|
83 | + break; |
|
84 | + |
|
85 | + case 'all': |
|
86 | + $apps = $this->appConfig->getApps(); |
|
87 | + $configs = [ |
|
88 | + 'system' => $this->getSystemConfigs($noSensitiveValues), |
|
89 | + 'apps' => [], |
|
90 | + ]; |
|
91 | + foreach ($apps as $appName) { |
|
92 | + $configs['apps'][$appName] = $this->getAppConfigs($appName, $noSensitiveValues); |
|
93 | + } |
|
94 | + break; |
|
95 | + |
|
96 | + default: |
|
97 | + $configs = [ |
|
98 | + 'apps' => [ |
|
99 | + $app => $this->getAppConfigs($app, $noSensitiveValues), |
|
100 | + ], |
|
101 | + ]; |
|
102 | + } |
|
103 | + |
|
104 | + $this->writeArrayInOutputFormat($input, $output, $configs); |
|
105 | + } |
|
106 | + |
|
107 | + /** |
|
108 | + * Get the system configs |
|
109 | + * |
|
110 | + * @param bool $noSensitiveValues |
|
111 | + * @return array |
|
112 | + */ |
|
113 | + protected function getSystemConfigs($noSensitiveValues) { |
|
114 | + $keys = $this->systemConfig->getKeys(); |
|
115 | + |
|
116 | + $configs = []; |
|
117 | + foreach ($keys as $key) { |
|
118 | + if ($noSensitiveValues) { |
|
119 | + $value = $this->systemConfig->getFilteredValue($key, serialize(null)); |
|
120 | + } else { |
|
121 | + $value = $this->systemConfig->getValue($key, serialize(null)); |
|
122 | + } |
|
123 | + |
|
124 | + if ($value !== 'N;') { |
|
125 | + $configs[$key] = $value; |
|
126 | + } |
|
127 | + } |
|
128 | + |
|
129 | + return $configs; |
|
130 | + } |
|
131 | + |
|
132 | + /** |
|
133 | + * Get the app configs |
|
134 | + * |
|
135 | + * @param string $app |
|
136 | + * @param bool $noSensitiveValues |
|
137 | + * @return array |
|
138 | + */ |
|
139 | + protected function getAppConfigs($app, $noSensitiveValues) { |
|
140 | + if ($noSensitiveValues) { |
|
141 | + return $this->appConfig->getFilteredValues($app, false); |
|
142 | + } else { |
|
143 | + return $this->appConfig->getValues($app, false); |
|
144 | + } |
|
145 | + } |
|
146 | + |
|
147 | + /** |
|
148 | + * @param string $argumentName |
|
149 | + * @param CompletionContext $context |
|
150 | + * @return string[] |
|
151 | + */ |
|
152 | + public function completeArgumentValues($argumentName, CompletionContext $context) { |
|
153 | + if ($argumentName === 'app') { |
|
154 | + return array_merge(['all', 'system'], \OC_App::getAllApps()); |
|
155 | + } |
|
156 | + return []; |
|
157 | + } |
|
158 | 158 | } |