Backup/restore config
This commit is contained in:
parent
71b57bfed1
commit
1e85b25438
12 changed files with 155 additions and 105 deletions
|
|
@ -2,34 +2,52 @@
|
|||
#include "secureformat.h"
|
||||
|
||||
#include <QDataStream>
|
||||
#include <QDebug>
|
||||
|
||||
SecureQSettings::SecureQSettings(const QString &organization, const QString &application, QObject *parent)
|
||||
: QObject{parent},
|
||||
m_setting(organization, application, parent)
|
||||
m_setting(organization, application, parent),
|
||||
encryptedKeys({"Servers/serversList"})
|
||||
{
|
||||
encrypted = m_setting.value("encrypted").toBool();
|
||||
encrypted = m_setting.value("Conf/encrypted").toBool();
|
||||
|
||||
// convert settings to encrypted
|
||||
if (! encrypted) {
|
||||
// TODO: convert
|
||||
// m_setting.sync();
|
||||
for (const QString &key : m_setting.allKeys()) {
|
||||
if (encryptedKeys.contains(key)) {
|
||||
const QVariant &val = value(key);
|
||||
setValue(key, val);
|
||||
}
|
||||
}
|
||||
m_setting.setValue("Conf/encrypted", true);
|
||||
m_setting.sync();
|
||||
encrypted = true;
|
||||
}
|
||||
}
|
||||
|
||||
QVariant SecureQSettings::value(const QString &key, const QVariant &defaultValue) const
|
||||
{
|
||||
if (encrypted) {
|
||||
QByteArray encryptedValue = m_setting.value(key, defaultValue).toByteArray();
|
||||
if (m_cache.contains(key)) {
|
||||
return m_cache.value(key);
|
||||
}
|
||||
|
||||
QVariant retVal;
|
||||
if (encrypted && encryptedKeys.contains(key)) {
|
||||
if (!m_setting.contains(key)) return defaultValue;
|
||||
|
||||
QByteArray encryptedValue = m_setting.value(key).toByteArray();
|
||||
QByteArray decryptedValue = decryptText(encryptedValue);
|
||||
|
||||
QDataStream ds(&decryptedValue, QIODevice::ReadOnly);
|
||||
QVariant v;
|
||||
ds >> v;
|
||||
return v;
|
||||
ds >> retVal;
|
||||
}
|
||||
else {
|
||||
return m_setting.value(key, defaultValue);
|
||||
retVal = m_setting.value(key, defaultValue);
|
||||
}
|
||||
|
||||
m_cache.insert(key, retVal);
|
||||
|
||||
return retVal;
|
||||
}
|
||||
|
||||
void SecureQSettings::setValue(const QString &key, const QVariant &value)
|
||||
|
|
@ -42,6 +60,55 @@ void SecureQSettings::setValue(const QString &key, const QVariant &value)
|
|||
|
||||
QByteArray encryptedValue = encryptText(decryptedValue);
|
||||
m_setting.setValue(key, encryptedValue);
|
||||
m_cache.insert(key, value);
|
||||
|
||||
sync();
|
||||
}
|
||||
|
||||
void SecureQSettings::remove(const QString &key)
|
||||
{
|
||||
m_setting.remove(key);
|
||||
m_cache.remove(key);
|
||||
|
||||
sync();
|
||||
}
|
||||
|
||||
void SecureQSettings::sync()
|
||||
{
|
||||
m_setting.sync();
|
||||
}
|
||||
|
||||
QByteArray SecureQSettings::backupAppConfig() const
|
||||
{
|
||||
QMap<QString, QVariant> cfg;
|
||||
for (const QString &key : m_setting.allKeys()) {
|
||||
cfg.insert(key, value(key));
|
||||
}
|
||||
|
||||
QByteArray ba;
|
||||
{
|
||||
QDataStream ds(&ba, QIODevice::WriteOnly);
|
||||
ds << cfg;
|
||||
}
|
||||
|
||||
return ba.toBase64();
|
||||
}
|
||||
|
||||
void SecureQSettings::restoreAppConfig(const QByteArray &base64Cfg)
|
||||
{
|
||||
QByteArray ba = QByteArray::fromBase64(base64Cfg);
|
||||
QMap<QString, QVariant> cfg;
|
||||
|
||||
{
|
||||
QDataStream ds(&ba, QIODevice::ReadOnly);
|
||||
ds >> cfg;
|
||||
}
|
||||
|
||||
for (const QString &key : cfg.keys()) {
|
||||
setValue(key, cfg.value(key));
|
||||
}
|
||||
|
||||
sync();
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue