if keys are not on server, also delete local keys

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>

diff --git a/src/libsync/clientsideencryption.cpp b/src/libsync/clientsideencryption.cpp
index 2dcce06ce5ba34de23c27bb6ee71d40f5bd950ea..1367a99841c60305b252bd63df3290a82c151e23 100644 (file)
--- a/src/libsync/clientsideencryption.cpp
+++ b/src/libsync/clientsideencryption.cpp
@@ -1194,10 +1194,12 @@ void ClientSideEncryption::forgetSensitiveData(const AccountPtr &account)
     const auto deletePrivateKeyJob = createDeleteJob(user + e2e_private);
     const auto deleteCertJob = createDeleteJob(user + e2e_cert);
     const auto deleteMnemonicJob = createDeleteJob(user + e2e_mnemonic);
+    const auto deletePublicKeyJob = createDeleteJob(user + e2e_public);
 
     connect(deletePrivateKeyJob, &DeletePasswordJob::finished, this, &ClientSideEncryption::handlePrivateKeyDeleted);
     connect(deleteCertJob, &DeletePasswordJob::finished, this, &ClientSideEncryption::handleCertificateDeleted);
     connect(deleteMnemonicJob, &DeletePasswordJob::finished, this, &ClientSideEncryption::handleMnemonicDeleted);
+    connect(deletePublicKeyJob, &DeletePasswordJob::finished, this, &ClientSideEncryption::handlePublicKeyDeleted);
     deletePrivateKeyJob->start();
     deleteCertJob->start();
     deleteMnemonicJob->start();
@@ -1245,6 +1247,20 @@ void ClientSideEncryption::handleMnemonicDeleted(const QKeychain::Job* const inc
     checkAllSensitiveDataDeleted();
 }
 
+void ClientSideEncryption::handlePublicKeyDeleted(const QKeychain::Job * const incoming)
+{
+    const auto error = incoming->error();
+    if (error != QKeychain::NoError && error != QKeychain::EntryNotFound) {
+        qCWarning(lcCse) << "Public key could not be deleted:" << incoming->errorString();
+        return;
+    }
+
+    qCDebug(lcCse) << "Public key successfully deleted from keychain. Clearing.";
+    _publicKey = QByteArray();
+    Q_EMIT publicKeyDeleted();
+    checkAllSensitiveDataDeleted();
+}
+
 bool ClientSideEncryption::sensitiveDataRemaining() const
 {
     return !_privateKey.isEmpty() || !_certificate.isNull() || !_mnemonic.isEmpty();
@@ -1478,19 +1494,9 @@ void ClientSideEncryption::writeKeyPair(AccountPtr account,
 void ClientSideEncryption::checkServerHasSavedKeys(AccountPtr account)
 {
     const auto keyIsNotOnServer = [account, this] () {
-        qCInfo(lcCse) << "server is missing keys. upload is necessary";
-
-        Bio publicKeyBio;
-        const auto publicKeyData = _publicKey.toPem();
-        BIO_write(publicKeyBio, publicKeyData.constData(), publicKeyData.size());
-        auto publicKey = PKey::readPublicKey(publicKeyBio);
-
-        Bio privateKeyBio;
-        BIO_write(privateKeyBio, _privateKey.constData(), _privateKey.size());
-        auto privateKey = PKey::readPrivateKey(privateKeyBio);
+        qCInfo(lcCse) << "server is missing keys. deleting local keys";
 
-        auto csrData = generateCSR(account, std::move(publicKey), std::move(privateKey));
-        sendSignRequestCSR(account, std::move(csrData.second), std::move(csrData.first));
+        forgetSensitiveData(account);
     };
 
     const auto privateKeyOnServerIsValid = [this] () {

diff --git a/src/libsync/clientsideencryption.h b/src/libsync/clientsideencryption.h
index dffeee3ddd83f676a0ee147278b877cf2b8cde4d..1c3ba01417a2347402696da5581455cd3801f68b 100644 (file)
--- a/src/libsync/clientsideencryption.h
+++ b/src/libsync/clientsideencryption.h
@@ -135,6 +135,7 @@ signals:
     void privateKeyDeleted();
     void certificateDeleted();
     void mnemonicDeleted();
+    void publicKeyDeleted();
 
 public slots:
     void initialize(const OCC::AccountPtr &account);
@@ -152,6 +153,7 @@ private slots:
     void handlePrivateKeyDeleted(const QKeychain::Job* const incoming);
     void handleCertificateDeleted(const QKeychain::Job* const incoming);
     void handleMnemonicDeleted(const QKeychain::Job* const incoming);
+    void handlePublicKeyDeleted(const QKeychain::Job* const incoming);
     void checkAllSensitiveDataDeleted();
 
     void getPrivateKeyFromServer(const OCC::AccountPtr &account);