Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-02-12 01:27:54 +01:00
Code Issues Packages Projects Releases Activity

[bin/grav newuser] Prompt twice for password since input is hidden (Fixes #307)

Browse Source
This commit is contained in:
Timm Albers
2015-09-07 19:18:26 +02:00
parent e494c87e28
commit 9d7a46fe94
1 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
system/src/Grav/Console/Cli/NewUserCommand.php
View File

@@ -8,6 +8,7 @@ use Grav\Common\User\User;
use Grav\Console\ConsoleTrait;
use RuntimeException;
use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Helper\Helper;
use Symfony\Component\Console\Formatter\OutputFormatterStyle;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
@@ -66,16 +67,20 @@ class NewUserCommand extends Command
$username = $helper->ask($this->input, $this->output, $question);
// Get password and validate
$question = new Question('Enter a <yellow>password</yellow>: ');
$question->setValidator(function ($value) {
$password = $this->askForPassword($helper, 'Enter a <yellow>password</yellow>: ', function ($value) {
if (!preg_match('/(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}/', $value)) {
throw new RuntimeException('Password must contain at least one number and one uppercase and lowercase letter, and at least 8 or more characters');
}
return $value;
});
$question->setHidden(true);
$question->setHiddenFallback(false);
$data['password'] = $helper->ask($this->input, $this->output, $question);
// Since input is hidden when prompting for passwords, the user is asked to repeat the password
$this->askForPassword($helper, 'Repeat the <yellow>password</yellow>: ', function ($value) use ($password) {
if (strcmp($password, $value)) {
throw new RuntimeException('Passwords did not match.');
}
return $value;
});
$data['password'] = $password;
// Get email and validate
$question = new Question('Enter an <yellow>email</yellow>: ');
@@ -135,4 +140,22 @@ class NewUserCommand extends Command
$this->output->writeln('');
$this->output->writeln('<green>Success!</green> User <cyan>'. $username .'</cyan> created.');
}
/**
* Get password and validate.
*
* @param Helper $helper
* @param string $question
* @param callable $validator
*
* @return string
*/
protected function askForPassword(Helper $helper, $question, callable $validator)
{
$question = new Question($question);
$question->setValidator($validator);
$question->setHidden(true);
$question->setHiddenFallback(false);
return $helper->ask($this->input, $this->output, $question);
}
}