Passphrase "MIXED case" Type (#11255)

* An additional approach to create passphrases with one random word being in UPPERCASE. * Also remove duplicate character count from passphrase generator --------- Co-authored-by: Stephan Heffner <[email protected]> Co-authored-by: Jonathan White <[email protected]>
keepassxreboot · Dec 26, 2024 · e76e9d4 · e76e9d4
1 parent 9670a5e
commit e76e9d4
Show file tree

Hide file tree

Showing 6 changed files with 78 additions and 90 deletions.
diff --git a/share/translations/keepassxc_en.ts b/share/translations/keepassxc_en.ts
@@ -6902,10 +6902,6 @@ The following data is missing:
         <source>Word Count:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Character Count:</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Word Case:</source>
         <translation type="unfinished"></translation>
@@ -6918,10 +6914,6 @@ The following data is missing:
         <source>Add custom wordlist</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>character</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
@@ -7035,6 +7027,10 @@ Do you want to overwrite it?</source>
         <source>Characters: %1</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>MIXED case</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <source>Excluded characters: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;, &quot;B&quot;, &quot;8&quot;, &quot;G&quot;, &quot;6&quot;</source>
         <translation type="unfinished"></translation>

diff --git a/src/core/PassphraseGenerator.cpp b/src/core/PassphraseGenerator.cpp
@@ -122,6 +122,7 @@ QString PassphraseGenerator::generatePassphrase() const
     }
 
     QStringList words;
+    int randomIndex = randomGen()->randomUInt(static_cast<quint32>(m_wordCount));
     for (int i = 0; i < m_wordCount; ++i) {
         int wordIndex = randomGen()->randomUInt(static_cast<quint32>(m_wordlist.size()));
         auto tmpWord = m_wordlist.at(wordIndex);
@@ -134,6 +135,9 @@ QString PassphraseGenerator::generatePassphrase() const
         case TITLECASE:
             tmpWord = tmpWord.replace(0, 1, tmpWord.left(1).toUpper());
             break;
+        case MIXEDCASE:
+            tmpWord = i == randomIndex ? tmpWord.toUpper() : tmpWord.toLower();
+            break;
         case LOWERCASE:
             tmpWord = tmpWord.toLower();
             break;

diff --git a/src/core/PassphraseGenerator.h b/src/core/PassphraseGenerator.h
@@ -30,7 +30,8 @@ class PassphraseGenerator
     {
         LOWERCASE,
         UPPERCASE,
-        TITLECASE
+        TITLECASE,
+        MIXEDCASE
     };
 
     double estimateEntropy(int wordCount = 0);

diff --git a/src/gui/PasswordGeneratorWidget.cpp b/src/gui/PasswordGeneratorWidget.cpp
@@ -99,6 +99,7 @@ PasswordGeneratorWidget::PasswordGeneratorWidget(QWidget* parent)
     m_ui->wordCaseComboBox->addItem(tr("lower case"), PassphraseGenerator::LOWERCASE);
     m_ui->wordCaseComboBox->addItem(tr("UPPER CASE"), PassphraseGenerator::UPPERCASE);
     m_ui->wordCaseComboBox->addItem(tr("Title Case"), PassphraseGenerator::TITLECASE);
+    m_ui->wordCaseComboBox->addItem(tr("MIXED case"), PassphraseGenerator::MIXEDCASE);
 
     // load system-wide wordlists
     QDir path(resources()->wordlistPath(""));
@@ -276,7 +277,6 @@ void PasswordGeneratorWidget::updatePasswordStrength()
     PasswordHealth passwordHealth(0);
     if (m_ui->tabWidget->currentIndex() == Diceware) {
         passwordHealth.init(m_dicewareGenerator->estimateEntropy());
-        m_ui->charactersInPassphraseLabel->setText(QString::number(m_ui->editNewPassword->text().length()));
     } else {
         passwordHealth = PasswordHealth(m_ui->editNewPassword->text());
     }

diff --git a/src/gui/PasswordGeneratorWidget.ui b/src/gui/PasswordGeneratorWidget.ui
@@ -769,26 +769,6 @@ QProgressBar::chunk {
       <layout class="QGridLayout" name="gridLayout_2">
        <item row="0" column="0">
         <layout class="QGridLayout" name="gridLayout_3">
-         <item row="2" column="1" alignment="Qt::AlignRight">
-          <widget class="QLabel" name="labelWordSeparator">
-           <property name="text">
-            <string>Word Separator:</string>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="1" alignment="Qt::AlignRight">
-          <widget class="QLabel" name="labelWordList">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="text">
-            <string>Wordlist:</string>
-           </property>
-          </widget>
-         </item>
          <item row="1" column="2">
           <layout class="QHBoxLayout" name="horizontalLayout_3">
            <property name="sizeConstraint">
@@ -834,29 +814,59 @@ QProgressBar::chunk {
            </item>
           </layout>
          </item>
-         <item row="1" column="1" alignment="Qt::AlignRight">
-          <widget class="QLabel" name="labelWordCount">
+         <item row="3" column="1" alignment="Qt::AlignRight">
+          <widget class="QLabel" name="wordCaseLabel">
            <property name="text">
-            <string>Word Count:</string>
-           </property>
-           <property name="buddy">
-            <cstring>spinBoxLength</cstring>
+            <string>Word Case:</string>
            </property>
           </widget>
          </item>
-         <item row="4" column="1" alignment="Qt::AlignRight">
-          <widget class="QLabel" name="characterCountLabel">
+         <item row="2" column="1" alignment="Qt::AlignRight">
+          <widget class="QLabel" name="labelWordSeparator">
            <property name="text">
-            <string>Character Count:</string>
+            <string>Word Separator:</string>
            </property>
           </widget>
          </item>
-         <item row="3" column="1" alignment="Qt::AlignRight">
-          <widget class="QLabel" name="wordCaseLabel">
-           <property name="text">
-            <string>Word Case:</string>
-           </property>
-          </widget>
+         <item row="0" column="2">
+          <layout class="QHBoxLayout" name="horizontalLayout_10">
+           <item>
+            <widget class="QComboBox" name="comboBoxWordList">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QPushButton" name="buttonDeleteWordList">
+             <property name="focusPolicy">
+              <enum>Qt::TabFocus</enum>
+             </property>
+             <property name="toolTip">
+              <string>Delete selected wordlist</string>
+             </property>
+             <property name="accessibleDescription">
+              <string>Delete selected wordlist</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QPushButton" name="buttonAddWordList">
+             <property name="focusPolicy">
+              <enum>Qt::TabFocus</enum>
+             </property>
+             <property name="toolTip">
+              <string>Add custom wordlist</string>
+             </property>
+             <property name="accessibleDescription">
+              <string>Add custom wordlist</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
          </item>
          <item row="3" column="2">
           <layout class="QHBoxLayout" name="horizontalLayout_6">
@@ -878,6 +888,16 @@ QProgressBar::chunk {
            </item>
           </layout>
          </item>
+         <item row="1" column="1" alignment="Qt::AlignRight">
+          <widget class="QLabel" name="labelWordCount">
+           <property name="text">
+            <string>Word Count:</string>
+           </property>
+           <property name="buddy">
+            <cstring>spinBoxLength</cstring>
+           </property>
+          </widget>
+         </item>
          <item row="2" column="2">
           <layout class="QHBoxLayout" name="horizontalLayout_9">
            <item>
@@ -914,50 +934,16 @@ QProgressBar::chunk {
            </item>
           </layout>
          </item>
-         <item row="0" column="2">
-          <layout class="QHBoxLayout" name="horizontalLayout_10">
-           <item>
-            <widget class="QComboBox" name="comboBoxWordList">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QPushButton" name="buttonDeleteWordList">
-             <property name="focusPolicy">
-              <enum>Qt::TabFocus</enum>
-             </property>
-             <property name="toolTip">
-              <string>Delete selected wordlist</string>
-             </property>
-             <property name="accessibleDescription">
-              <string>Delete selected wordlist</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QPushButton" name="buttonAddWordList">
-             <property name="focusPolicy">
-              <enum>Qt::TabFocus</enum>
-             </property>
-             <property name="toolTip">
-              <string>Add custom wordlist</string>
-             </property>
-             <property name="accessibleDescription">
-              <string>Add custom wordlist</string>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-         <item row="4" column="2" alignment="Qt::AlignLeft">
-          <widget class="QLabel" name="charactersInPassphraseLabel">
+         <item row="0" column="1" alignment="Qt::AlignRight">
+          <widget class="QLabel" name="labelWordList">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
            <property name="text">
-            <string>character</string>
+            <string>Wordlist:</string>
            </property>
           </widget>
          </item>

diff --git a/tests/gui/TestGui.cpp b/tests/gui/TestGui.cpp
@@ -1027,11 +1027,12 @@ void TestGui::testDicewareEntryEntropy()
         // Verify entropy and strength
         auto* entropyLabel = pwGeneratorWidget->findChild<QLabel*>("entropyLabel");
         auto* strengthLabel = pwGeneratorWidget->findChild<QLabel*>("strengthLabel");
-        auto* wordLengthLabel = pwGeneratorWidget->findChild<QLabel*>("charactersInPassphraseLabel");
+        auto* wordLengthLabel = pwGeneratorWidget->findChild<QLabel*>("passwordLengthLabel");
 
         QTRY_COMPARE_WITH_TIMEOUT(entropyLabel->text(), QString("Entropy: 77.55 bit"), 200);
         QCOMPARE(strengthLabel->text(), QString("Password Quality: Good"));
-        QCOMPARE(wordLengthLabel->text().toInt(), pwGeneratorWidget->getGeneratedPassword().size());
+        QCOMPARE(wordLengthLabel->text(),
+                 QString("Characters: %1").arg(QString::number(pwGeneratorWidget->getGeneratedPassword().length())));
 
         QTest::mouseClick(generatedPassword, Qt::LeftButton);
         QTest::keyClick(generatedPassword, Qt::Key_Escape););