CipherDialog: Improve password fields validation

sandman7920 · sandman7920 · commit b7f5ef3ff957 · 2021-07-07T10:42:15.000+03:00
For RawKey key format, password length must at least 3 symbols.
'0x' is just a placeholder and the real key begins at the third symbol
diff --git a/src/CipherDialog.cpp b/src/CipherDialog.cpp
@@ -79,10 +79,9 @@ CipherSettings CipherDialog::getCipherSettings() const
 
 void CipherDialog::checkInputFields()
 {
+    CipherSettings::KeyFormats keyFormat = CipherSettings::getKeyFormat(ui->comboKeyFormat->currentIndex());
     if(sender() == ui->comboKeyFormat)
     {
-        CipherSettings::KeyFormats keyFormat = CipherSettings::getKeyFormat(ui->comboKeyFormat->currentIndex());
-
         if(keyFormat == CipherSettings::KeyFormats::Passphrase)
         {
             ui->editPassword->setValidator(nullptr);
@@ -99,8 +98,14 @@ void CipherDialog::checkInputFields()
     }
 
     bool valid = true;
-    if(encryptMode)
-        valid = ui->editPassword->text() == ui->editPassword2->text();
+    if(encryptMode) {
+        const QString password1 = ui->editPassword->text();
+        valid = password1 == ui->editPassword2->text();
+
+        if (keyFormat == CipherSettings::KeyFormats::RawKey) {
+            valid &= password1.isEmpty() || password1.length() > 2;
+        }
+    }
 
     ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(valid);
 }

Original file line number	Diff line number	Diff line change
`@@ -79,10 +79,9 @@ CipherSettings CipherDialog::getCipherSettings() const`
`79`	`79`
`80`	`80`	`void CipherDialog::checkInputFields()`
`81`	`81`	`{`
	`82`	`+ CipherSettings::KeyFormats keyFormat = CipherSettings::getKeyFormat(ui->comboKeyFormat->currentIndex());`
`82`	`83`	`if(sender() == ui->comboKeyFormat)`
`83`	`84`	`{`
`84`		`- CipherSettings::KeyFormats keyFormat = CipherSettings::getKeyFormat(ui->comboKeyFormat->currentIndex());`
`85`		`-`
`86`	`85`	`if(keyFormat == CipherSettings::KeyFormats::Passphrase)`
`87`	`86`	`{`
`88`	`87`	`ui->editPassword->setValidator(nullptr);`
`@@ -99,8 +98,14 @@ void CipherDialog::checkInputFields()`
`99`	`98`	`}`
`100`	`99`
`101`	`100`	`bool valid = true;`
`102`		`- if(encryptMode)`
`103`		`- valid = ui->editPassword->text() == ui->editPassword2->text();`
	`101`	`+ if(encryptMode) {`
	`102`	`+ const QString password1 = ui->editPassword->text();`
	`103`	`+ valid = password1 == ui->editPassword2->text();`
	`104`	`+`
	`105`	`+ if (keyFormat == CipherSettings::KeyFormats::RawKey) {`
	`106`	`+ valid &= password1.isEmpty() \|\| password1.length() > 2;`
	`107`	`+ }`
	`108`	`+ }`
`104`	`109`
`105`	`110`	`ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(valid);`
`106`	`111`	`}`