#435 netdisco-deploy allows blank admin password

This commit is contained in:
Oliver Gorwits
2018-10-19 15:06:58 +01:00
parent 2818591462
commit 1baa6dacc6

View File

@@ -174,9 +174,7 @@ sub deploy_db {
print color 'reset'; print color 'reset';
say ''; say '';
my $name = $term->get_reply(prompt => 'Username: '); my ($name, $pass) = get_userpass($term);
my $pass = $term->get_reply(prompt => 'Password: ');
$users->create({ $users->create({
username => $name, username => $name,
password => _make_password($pass), password => _make_password($pass),
@@ -196,6 +194,19 @@ sub deploy_db {
); );
} }
sub get_userpass {
my $term = shift;
my $name = $term->get_reply(prompt => 'Username: ');
my $pass = $term->get_reply(prompt => 'Password: ');
unless ($name and $pass) {
say 'username and password cannot be empty, please try again.';
($name, $pass) = get_userpass($term);
}
return ($name, $pass);
}
sub deploy_oui { sub deploy_oui {
my $schema = schema('netdisco'); my $schema = schema('netdisco');
$schema->storage->disconnect; $schema->storage->disconnect;