-
-
Notifications
You must be signed in to change notification settings - Fork 4.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
App password command #24317
Merged
Merged
App password command #24317
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,137 @@ | ||
<?php | ||
/** | ||
* @copyright Copyright (c) 2020, NextCloud, Inc. | ||
* | ||
* @author Andreas Fischer <bantu@owncloud.com> | ||
* @author Christopher Schäpers <kondou@ts.unde.re> | ||
* @author Clark Tomlinson <fallen013@gmail.com> | ||
* @author Joas Schilling <coding@schilljs.com> | ||
* @author Laurens Post <lkpost@scept.re> | ||
* @author Morris Jobke <hey@morrisjobke.de> | ||
* @author Roeland Jago Douma <roeland@famdouma.nl> | ||
* @author Sujith H <sharidasan@owncloud.com> | ||
* @author Sean Molenaar <sean@seanmolenaar.eu> | ||
* | ||
* @license AGPL-3.0 | ||
* | ||
* This code is free software: you can redistribute it and/or modify | ||
* it under the terms of the GNU Affero General Public License, version 3, | ||
* as published by the Free Software Foundation. | ||
* | ||
* This program is distributed in the hope that it will be useful, | ||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
* GNU Affero General Public License for more details. | ||
* | ||
* You should have received a copy of the GNU Affero General Public License, version 3, | ||
* along with this program. If not, see <http://www.gnu.org/licenses/> | ||
* | ||
*/ | ||
|
||
namespace OC\Core\Command\User; | ||
|
||
use OC\Authentication\Token\IProvider; | ||
use OC\Authentication\Token\IToken; | ||
use OCP\IUserManager; | ||
use OCP\Security\ICrypto; | ||
use OCP\Security\ISecureRandom; | ||
use Symfony\Component\Console\Command\Command; | ||
use Symfony\Component\Console\Helper\QuestionHelper; | ||
use Symfony\Component\Console\Input\InputArgument; | ||
use Symfony\Component\Console\Input\InputInterface; | ||
use Symfony\Component\Console\Input\InputOption; | ||
use Symfony\Component\Console\Output\OutputInterface; | ||
use Symfony\Component\Console\Question\Question; | ||
|
||
class AddAppPassword extends Command { | ||
|
||
/** @var IUserManager */ | ||
protected $userManager; | ||
/** @var IProvider */ | ||
protected $tokenProvider; | ||
/** @var ISecureRandom */ | ||
private $random; | ||
/** @var ICrypto */ | ||
private $crypto; | ||
|
||
public function __construct(IUserManager $userManager, | ||
IProvider $tokenProvider, | ||
ISecureRandom $random, | ||
ICrypto $crypto) { | ||
$this->tokenProvider = $tokenProvider; | ||
$this->userManager = $userManager; | ||
$this->random = $random; | ||
$this->crypto = $crypto; | ||
parent::__construct(); | ||
} | ||
|
||
protected function configure() { | ||
$this | ||
->setName('user:add-app-password') | ||
->setDescription('Add app password for the named user') | ||
->addArgument( | ||
'user', | ||
InputArgument::REQUIRED, | ||
'Username to add app password for' | ||
) | ||
->addOption( | ||
'password-from-env', | ||
null, | ||
InputOption::VALUE_NONE, | ||
'read password from environment variable NC_PASS/OC_PASS' | ||
) | ||
; | ||
} | ||
|
||
protected function execute(InputInterface $input, OutputInterface $output): int { | ||
$username = $input->getArgument('user'); | ||
|
||
$user = $this->userManager->get($username); | ||
if (is_null($user)) { | ||
$output->writeln('<error>User does not exist</error>'); | ||
return 1; | ||
} | ||
|
||
if ($input->getOption('password-from-env')) { | ||
$password = getenv('NC_PASS') ?? getenv('OC_PASS'); | ||
if (!$password) { | ||
$output->writeln('<error>--password-from-env given, but NC_PASS is empty!</error>'); | ||
return 1; | ||
} | ||
} elseif ($input->isInteractive()) { | ||
/** @var QuestionHelper $helper */ | ||
$helper = $this->getHelper('question'); | ||
|
||
$question = new Question('Enter the user password: '); | ||
$question->setHidden(true); | ||
$password = $helper->ask($input, $output, $question); | ||
|
||
if ($password === null) { | ||
$output->writeln("<error>Password cannot be empty!</error>"); | ||
return 1; | ||
} | ||
} else { | ||
$output->writeln("<error>Interactive input or --password-from-env is needed for entering a new password!</error>"); | ||
return 1; | ||
} | ||
|
||
$output->writeln('<info>The password is not validated so what you provide is what gets recorded in the token</info>'); | ||
|
||
|
||
$token = $this->random->generate(72, ISecureRandom::CHAR_UPPER.ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_DIGITS); | ||
$this->tokenProvider->generateToken( | ||
$token, | ||
$user->getUID(), | ||
$user->getDisplayName(), | ||
$password, | ||
'cli', | ||
IToken::PERMANENT_TOKEN, | ||
IToken::DO_NOT_REMEMBER | ||
); | ||
|
||
$output->writeln('app password:'); | ||
$output->writeln($token); | ||
|
||
return 0; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
can we make the magic number 72 a constant somewhere so we use the same length in all code paths?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure why it's 72 to begin with, @rullzer any comment on this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
72 was done because of the bcrypt limit of 72 bytes