Modified MainWindow::setKeychainPassphrase() to use the same query and unlocking mechanism as MainWindow::makeKeychainBackup().

Author: CodeShark

src/mainwindow.cpp

@@ -808,41 +808,97 @@ void MainWindow::lockAllKeychains()
     keychainModel->lockAllKeychains();
 }
 
-void MainWindow::setKeychainPassphrase()
+int MainWindow::setKeychainPassphrase(const QString& keychainName)
 {
-    if (!synchedVault.isVaultOpen())
+    QString name;
+    bool bLocked;
+    bool bEncrypted;
+    if (keychainName.isEmpty())
     {
-        showError(tr("No vault is open."));
-        return;
-    }
+        QModelIndex index = keychainSelectionModel->currentIndex();
+        int row = index.row();
+        if (row < 0)
+        {
+            showError(tr("No keychain is selected."));
+            return QDialog::Rejected;
+        }
 
-    QModelIndex index = keychainSelectionModel->currentIndex();
-    int row = index.row();
-    if (row < 0)
-    {
-        showError(tr("No keychain is selected."));
-        return;
+        bLocked = (keychainModel->getStatus(row) == KeychainModel::LOCKED);
+        bEncrypted = keychainModel->isEncrypted(row);
+
+        QStandardItem* nameItem = keychainModel->item(row, 0);
+        name = nameItem->data(Qt::DisplayRole).toString();
     }
+    else
+    {
+        if (!keychainModel->exists(keychainName))
+        {
+            showError(tr("Keychain not found."));
+            return QDialog::Rejected;
+        }
 
-    int status = keychainModel->getStatus(row);
+        bLocked = keychainModel->isLocked(keychainName);
+        bEncrypted = keychainModel->isEncrypted(keychainName);
+
+        name = keychainName;
+    } 
 
-    if (status == KeychainModel::PUBLIC)
+    try
     {
-        showError(tr("Keychain is nonprivate."));
-        return;
-    }
+        if (!synchedVault.isVaultOpen()) throw std::runtime_error("No vault is open.");
+        CoinDB::VaultLock lock(synchedVault);
+        if (!synchedVault.isVaultOpen()) throw std::runtime_error("No vault is open.");
 
-    QStandardItem* nameItem = keychainModel->item(row, 0);
-    QString name = nameItem->text();
+        if (bLocked && !unlockKeychain(name)) return QDialog::Rejected;
 
-    bool bLocked = status == KeychainModel::LOCKED;
-    bool bEncrypted = keychainModel->isEncrypted(row);
-    if (bLocked && bEncrypted)
+        SetPassphraseDialog dlg(tr("keychain \"") + name + "\"", tr("WARNING: IF YOU FORGET THIS PASSPHRASE THERE IS NO WAY TO RECOVER IT!!!"), this);
+        while (dlg.exec())
+        {
+            try
+            {
+                QString passphrase = dlg.getPassphrase();
+                if (passphrase.isEmpty())
+                {
+                    QString prompt(tr("You did not enter a passphrase."));
+                    if (bEncrypted)
+                    {
+                        prompt += tr(" Are you sure you want to remove keychain encryption from ") + name + "?";
+                    }
+                    else
+                    {
+                        prompt += tr(" Leave keychain ") + name + tr(" unencrypted?");
+                    } 
+                        
+                    if (QMessageBox::Yes == QMessageBox::question(this, tr("Confirm"), prompt))
+                    {
+                        keychainModel->decryptKeychain(name);
+                        if (bLocked) { lockKeychain(name); }
+                        return QDialog::Accepted;
+                    }
+                }
+                else
+                {
+                    secure_bytes_t hash = passphraseHash(dlg.getPassphrase().toStdString());
+                    keychainModel->encryptKeychain(name, hash); 
+                    if (bLocked) { lockKeychain(name); }
+                    return QDialog::Accepted;
+                }
+            }
+            catch (const std::exception& e)
+            {
+                showError(e.what());
+            }
+        }
+    }
+    catch (const exception& e)
     {
-        showError(tr("Keychain must first be unlocked."));
-        return;
+        LOGGER(error) << "MainWindow::setKeychainPassphrase - " << e.what() << std::endl;
+        if (bLocked) { lockKeychain(name); }
+        showError(e.what());
     }
 
+    return QDialog::Rejected;
+
     SetPassphraseDialog dlg(tr("keychain \"") + name + "\"", tr("WARNING: IF YOU FORGET THIS PASSPHRASE THERE IS NO WAY TO RECOVER IT!!!"), this);
     while (dlg.exec())
     {
@@ -863,26 +919,26 @@ void MainWindow::setKeychainPassphrase()
 
                 if (QMessageBox::Yes == QMessageBox::question(this, tr("Confirm"), prompt))
                 {
-                    if (bLocked) { keychainModel->unlockKeychain(name); }
                     keychainModel->decryptKeychain(name);
                     if (bLocked) { keychainModel->lockKeychain(name); }
-                    return;
+                    return QDialog::Accepted;
                 }
             }
             else
             {
                 secure_bytes_t hash = passphraseHash(dlg.getPassphrase().toStdString());
-                if (bLocked) { keychainModel->unlockKeychain(name); }
                 keychainModel->encryptKeychain(name, hash); 
-                keychainModel->lockKeychain(name);
-                return;
+                if (bLocked) { keychainModel->lockKeychain(name); }
+                return QDialog::Accepted;
             }
         }
         catch (const std::exception& e)
         {
             showError(e.what());
         }
     }
+
+    return QDialog::Rejected;
 }
 
 int MainWindow::makeKeychainBackup(const QString& keychainName)
@@ -900,12 +956,11 @@ int MainWindow::makeKeychainBackup(const QString& keychainName)
 
         if (!keychainModel->hasSeed(row))
         {
-            showError(tr("Keychain does not contain seed."));
+            showError(tr("Entropy seed for keychain is not known. Please use another backup format."));
             return QDialog::Rejected;
         }
 
-        int status = keychainModel->getStatus(row);
-        bLocked = status == KeychainModel::LOCKED;
+        bLocked = (keychainModel->getStatus(row) == KeychainModel::LOCKED);
 
         QStandardItem* nameItem = keychainModel->item(row, 0);
         name = nameItem->data(Qt::DisplayRole).toString();
@@ -918,6 +973,12 @@ int MainWindow::makeKeychainBackup(const QString& keychainName)
             return QDialog::Rejected;
         }
 
+        if (!keychainModel->hasSeed(keychainName))
+        {
+            showError(tr("Entropy seed for keychain is not known. Please use another backup format."));
+            return QDialog::Rejected;
+        }
+
         bLocked = keychainModel->isLocked(keychainName);
 
         name = keychainName;
@@ -1214,7 +1275,7 @@ void MainWindow::updateCurrentKeychain(const QModelIndex& current, const QModelI
 
         unlockKeychainAction->setEnabled(status == KeychainModel::LOCKED);
         lockKeychainAction->setEnabled(status == KeychainModel::UNLOCKED);
-        setKeychainPassphraseAction->setEnabled(status == KeychainModel::UNLOCKED || (status == KeychainModel::LOCKED && !keychainModel->isEncrypted(row)));
+        setKeychainPassphraseAction->setEnabled(status != KeychainModel::PUBLIC);
         exportPrivateKeychainAction->setEnabled(status != KeychainModel::PUBLIC);
         exportPublicKeychainAction->setEnabled(true);
         viewPrivateBIP32Action->setEnabled(status != KeychainModel::PUBLIC);

src/mainwindow.h

@@ -141,7 +141,7 @@ private slots:
     bool unlockKeychain(QString name = QString());
     void lockKeychain(QString name = QString());
     void lockAllKeychains();
-    void setKeychainPassphrase();
+    int  setKeychainPassphrase(const QString& keychainName = QString());
     int  makeKeychainBackup(const QString& keychainName = QString());
     void importKeychain(QString fileName = QString());
     void exportKeychain(bool exportPrivate);