mirror of
https://github.com/amnezia-vpn/amnezia-client.git
synced 2026-06-23 02:00:20 +07:00
fix: api configs dns, hostName and containers wont be saved in backup
This commit is contained in:
@@ -3,17 +3,20 @@
|
|||||||
#include "../client/3rd/QSimpleCrypto/src/include/QAead.h"
|
#include "../client/3rd/QSimpleCrypto/src/include/QAead.h"
|
||||||
#include "../client/3rd/QSimpleCrypto/src/include/QBlockCipher.h"
|
#include "../client/3rd/QSimpleCrypto/src/include/QBlockCipher.h"
|
||||||
#include "utilities.h"
|
#include "utilities.h"
|
||||||
|
#include "protocols/protocols_defs.h"
|
||||||
#include <QDataStream>
|
#include <QDataStream>
|
||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
#include <QEventLoop>
|
#include <QEventLoop>
|
||||||
#include <QIODevice>
|
#include <QIODevice>
|
||||||
#include <QJsonDocument>
|
#include <QJsonDocument>
|
||||||
#include <QJsonObject>
|
#include <QJsonObject>
|
||||||
|
#include <QJsonArray>
|
||||||
#include <QRandomGenerator>
|
#include <QRandomGenerator>
|
||||||
#include <QSharedPointer>
|
#include <QSharedPointer>
|
||||||
#include <QTimer>
|
#include <QTimer>
|
||||||
|
|
||||||
using namespace QKeychain;
|
using namespace QKeychain;
|
||||||
|
using namespace amnezia;
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
constexpr const char *settingsKeyTag = "settingsKeyTag";
|
constexpr const char *settingsKeyTag = "settingsKeyTag";
|
||||||
@@ -153,6 +156,31 @@ QByteArray SecureQSettings::backupAppConfig() const
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (key == QLatin1String("Servers/serversList")) {
|
||||||
|
const QVariant rawValue = value(key);
|
||||||
|
const QByteArray rawJson = rawValue.toByteArray();
|
||||||
|
|
||||||
|
QJsonArray serversArray = QJsonDocument::fromJson(rawJson).array();
|
||||||
|
QJsonArray sanitizedServersArray;
|
||||||
|
|
||||||
|
for (const QJsonValue &serverValue : serversArray) {
|
||||||
|
QJsonObject serverObject = serverValue.toObject();
|
||||||
|
|
||||||
|
if (serverObject.contains(QLatin1String("api_config"))) {
|
||||||
|
serverObject.remove(config_key::dns1);
|
||||||
|
serverObject.remove(config_key::dns2);
|
||||||
|
serverObject.remove(config_key::hostName);
|
||||||
|
serverObject.remove(config_key::containers);
|
||||||
|
}
|
||||||
|
|
||||||
|
sanitizedServersArray.append(serverObject);
|
||||||
|
}
|
||||||
|
|
||||||
|
const QByteArray sanitizedJson = QJsonDocument(sanitizedServersArray).toJson(QJsonDocument::Compact);
|
||||||
|
cfg.insert(key, QJsonValue::fromVariant(sanitizedJson));
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
cfg.insert(key, QJsonValue::fromVariant(value(key)));
|
cfg.insert(key, QJsonValue::fromVariant(value(key)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user