StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

fix(db): preserve user_version when adding or removing database password

Browse Source
This commit is contained in:
Anthony Bilinski 2019-06-26 17:32:44 -07:00
parent dafb17b5fa
commit 7e07025d3c
No known key found for this signature in database
GPG Key ID: 2AA8E0DA1B31FB3C
1 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/persistence/db/rawdatabase.cpp
View File

@ -227,11 +227,8 @@ bool RawDatabase::updateSavedCipherParameters(const QString& hexKey)
return false; return false;
} }
int64_t user_version; const auto user_version = getUserVersion();
if (!execNow(RawDatabase::Query("PRAGMA user_version", [&](const QVector<QVariant>& row) { if (user_version < 0) {
user_version = row[0].toLongLong();
}))) {
qCritical() << "Failed to read user_version during cipher upgrade";
return false; return false;
} }
if (!execNow("ATTACH DATABASE '" + path + ".tmp' AS sqlcipher4 KEY \"x'" + hexKey + "'\";")) { if (!execNow("ATTACH DATABASE '" + path + ".tmp' AS sqlcipher4 KEY \"x'" + hexKey + "'\";")) {
@ -299,6 +296,18 @@ bool RawDatabase::setKey(const QString& hexKey)
return true; return true;
} }
int RawDatabase::getUserVersion()
{
int64_t user_version;
if (!execNow(RawDatabase::Query("PRAGMA user_version", [&](const QVector<QVariant>& row) {
user_version = row[0].toLongLong();
}))) {
qCritical() << "Failed to read user_version during cipher upgrade";
return -1;
}
return user_version;
}
/** /**
* @brief Close the database and free its associated resources. * @brief Close the database and free its associated resources.
*/ */
@ -476,6 +485,10 @@ bool RawDatabase::setPassword(const QString& password)
bool RawDatabase::encryptDatabase(const QString& newHexKey) bool RawDatabase::encryptDatabase(const QString& newHexKey)
{ {
const auto user_version = getUserVersion();
if (user_version < 0) {
return false;
}
if (!execNow("ATTACH DATABASE '" + path + ".tmp' AS encrypted KEY \"x'" + newHexKey if (!execNow("ATTACH DATABASE '" + path + ".tmp' AS encrypted KEY \"x'" + newHexKey
+ "'\";")) { + "'\";")) {
qWarning() << "Failed to export encrypted database"; qWarning() << "Failed to export encrypted database";
@ -487,6 +500,9 @@ bool RawDatabase::encryptDatabase(const QString& newHexKey)
if (!execNow("SELECT sqlcipher_export('encrypted');")) { if (!execNow("SELECT sqlcipher_export('encrypted');")) {
return false; return false;
} }
if (!execNow(QString("PRAGMA encrypted.user_version = %1;").arg(user_version))) {
return false;
}
if (!execNow("DETACH DATABASE encrypted;")) { if (!execNow("DETACH DATABASE encrypted;")) {
return false; return false;
} }
@ -495,11 +511,18 @@ bool RawDatabase::encryptDatabase(const QString& newHexKey)
bool RawDatabase::decryptDatabase() bool RawDatabase::decryptDatabase()
{ {
const auto user_version = getUserVersion();
if (user_version < 0) {
return false;
}
if (!execNow("ATTACH DATABASE '" + path + ".tmp' AS plaintext KEY '';" if (!execNow("ATTACH DATABASE '" + path + ".tmp' AS plaintext KEY '';"
"SELECT sqlcipher_export('plaintext');")) { "SELECT sqlcipher_export('plaintext');")) {
qWarning() << "Failed to export decrypted database"; qWarning() << "Failed to export decrypted database";
return false; return false;
} }
if (!execNow(QString("PRAGMA plaintext.user_version = %1;").arg(user_version))) {
return false;
}
if (!execNow("DETACH DATABASE plaintext;")) { if (!execNow("DETACH DATABASE plaintext;")) {
return false; return false;
} }