Add custom button "Continue with weak password"

keepassxreboot · Nov 6, 2023 · f318654 · f318654
1 parent e8058e2
commit f318654
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 11 deletions.
diff --git a/share/translations/keepassxc_en.ts b/share/translations/keepassxc_en.ts
@@ -1839,7 +1839,7 @@ Are you sure you want to continue without a password?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>WARNING! Using a weak password may expose your accounts to security risks. Do you wish to continue?</source>
+        <source>This is a weak password! For better protection of your secrets, you should choose a stronger password.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -6524,6 +6524,10 @@ Do you want to overwrite it?</source>
         <source>Continue</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Continue with weak password</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QObject</name>

diff --git a/src/gui/MessageBox.cpp b/src/gui/MessageBox.cpp
@@ -66,6 +66,7 @@ void MessageBox::initializeButtonDefs()
         {Disable, {QMessageBox::tr("Disable"), QMessageBox::ButtonRole::AcceptRole}},
         {Merge, {QMessageBox::tr("Merge"), QMessageBox::ButtonRole::AcceptRole}},
         {Continue, {QMessageBox::tr("Continue"), QMessageBox::ButtonRole::AcceptRole}},
+        {ContinueWithWeakPass, {QMessageBox::tr("Continue with weak password"), QMessageBox::ButtonRole::AcceptRole}},
     };
 }
 

diff --git a/src/gui/MessageBox.h b/src/gui/MessageBox.h
@@ -58,10 +58,11 @@ class MessageBox
         Disable = 1 << 25,
         Merge = 1 << 26,
         Continue = 1 << 27,
+        ContinueWithWeakPass = 1 << 28,
 
         // Internal loop markers. Update Last when new KeePassXC button is added
         First = Ok,
-        Last = Continue,
+        Last = ContinueWithWeakPass,
     };
 
     enum Action

diff --git a/src/gui/dbsettings/DatabaseSettingsWidgetDatabaseKey.cpp b/src/gui/dbsettings/DatabaseSettingsWidgetDatabaseKey.cpp
@@ -177,13 +177,12 @@ bool DatabaseSettingsWidgetDatabaseKey::save()
     // Show warning if database password is weak
     if (!m_passwordEditWidget->isEmpty()
         && m_passwordEditWidget->getPasswordQuality() < PasswordHealth::Quality::Good) {
-        auto dialogResult =
-            MessageBox::warning(this,
-                                tr("Weak password"),
-                                tr("WARNING! Using a weak password may expose your accounts to security risks. "
-                                   "Do you wish to continue?"),
-                                MessageBox::Continue | MessageBox::Cancel,
-                                MessageBox::Cancel);
+        auto dialogResult = MessageBox::warning(this,
+                                                tr("Weak password"),
+                                                tr("This is a weak password! For better protection of your secrets, "
+                                                   "you should choose a stronger password."),
+                                                MessageBox::ContinueWithWeakPass | MessageBox::Cancel,
+                                                MessageBox::Cancel);
 
         if (dialogResult == MessageBox::Cancel) {
             return false;

diff --git a/tests/gui/TestGui.cpp b/tests/gui/TestGui.cpp
@@ -287,7 +287,7 @@ void TestGui::testCreateDatabase()
         fileDialog()->setNextFileName(tmpFile.fileName());
 
         // click Continue on the warning due to weak password
-        MessageBox::setNextAnswer(MessageBox::Continue);
+        MessageBox::setNextAnswer(MessageBox::ContinueWithWeakPass);
         QTest::keyClick(fileEdit, Qt::Key::Key_Enter);
 
         tmpFile.remove(););

diff --git a/tests/gui/TestGuiFdoSecrets.cpp b/tests/gui/TestGuiFdoSecrets.cpp
@@ -1880,7 +1880,7 @@ bool TestGuiFdoSecrets::driveNewDatabaseWizard()
             fileDialog()->setNextFileName(tmpFile.fileName());
 
             // click Continue on the warning due to weak password
-            MessageBox::setNextAnswer(MessageBox::Continue);
+            MessageBox::setNextAnswer(MessageBox::ContinueWithWeakPass);
             wizard->accept();
 
             tmpFile.remove();