napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[users] Flag password problems even when weak-passwords are ok

Browse Source 
- when you allow weak passwords, flag problems as warnings (yellow)
 - when weak passwords aren't allowed, they are fatal errors (red)
This commit is contained in:
Adriaan de Groot 2019-11-01 14:48:46 +01:00
parent a4e3ea2a86
commit 196a358493
1 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/modules/users/UsersPage.cpp
View File

@ -51,12 +51,22 @@ static constexpr const int USERNAME_MAX_LENGTH = 31;
static constexpr const int HOSTNAME_MIN_LENGTH = 2; static constexpr const int HOSTNAME_MIN_LENGTH = 2;
static constexpr const int HOSTNAME_MAX_LENGTH = 63; static constexpr const int HOSTNAME_MAX_LENGTH = 63;
/** @brief How bad is the error for labelError() ? */
enum class Badness
{
Fatal,
Warning
};
/** Add an error message and pixmap to a label. */ /** Add an error message and pixmap to a label. */
static inline void static inline void
labelError( QLabel* pix, QLabel* label, const QString& message ) labelError( QLabel* pix, QLabel* label, const QString& message, Badness bad = Badness::Fatal )
{ {
label->setText( message ); label->setText( message );
pix->setPixmap( CalamaresUtils::defaultPixmap( CalamaresUtils::No, CalamaresUtils::Original, label->size() ) ); pix->setPixmap( CalamaresUtils::defaultPixmap( ( bad == Badness::Fatal ) ? CalamaresUtils::StatusError
: CalamaresUtils::StatusWarning,
CalamaresUtils::Original,
label->size() ) );
} }
/** Clear error, indicate OK on a label. */ /** Clear error, indicate OK on a label. */
@ -399,6 +409,7 @@ UsersPage::checkPasswordAcceptance( const QString& pw1, const QString& pw2, QLab
{ {
if ( pw1.isEmpty() && pw2.isEmpty() ) if ( pw1.isEmpty() && pw2.isEmpty() )
{ {
// Not exactly labelOk() because we also don't want a checkmark OK
badge->clear(); badge->clear();
message->clear(); message->clear();
return false; return false;
@ -410,21 +421,31 @@ UsersPage::checkPasswordAcceptance( const QString& pw1, const QString& pw2, QLab
} }
else else
{ {
if ( ui->checkBoxValidatePassword->isChecked() ) bool failureIsFatal = ui->checkBoxValidatePassword->isChecked();
{ bool failureFound = false;
for ( auto pc : m_passwordChecks ) for ( auto pc : m_passwordChecks )
{ {
QString s = pc.filter( pw1 ); QString s = pc.filter( pw1 );
if ( !s.isEmpty() ) if ( !s.isEmpty() )
{ {
labelError( badge, message, s ); labelError( badge, message, s, failureIsFatal ? Badness::Fatal : Badness::Warning );
failureFound = true;
if ( failureIsFatal )
{
return false; return false;
} }
} }
} }
if ( !failureFound )
{
labelOk( badge, message ); labelOk( badge, message );
}
// Here, if failureFound is true then we've found **warnings**,
// which is ok to continue but the user should know.
return true; return true;
} }
} }