mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-26 15:06:08 +03:00
Code Issues Projects Releases Packages Wiki Activity

if keys are not on server, also delete local keys

Browse source 
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
This commit is contained in:
Matthieu Gallien 2023-05-09 16:10:04 +02:00 committed by Matthieu Gallien
parent c8e5ac7b5f
commit bef5d1a893
2 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/libsync/clientsideencryption.cpp
View file

@ -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";
qCInfo(lcCse) << "server is missing keys. deleting local keys";
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);
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] () {

2
src/libsync/clientsideencryption.h
View file

@ -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);