mirror of
https://github.com/amnezia-vpn/amnezia-client.git
synced 2026-05-08 14:33:23 +00:00
* refactor: move business logic from servers model * refactor: move containersModel initialization * refactor: added protocol ui controller and removed settings class from protocols model * refactor: moved cli management to separate controller * refactor: moved app split to separate controller * refactor: moved site split to separate controller * refactor: moved allowed dns to separate controller * refactor: moved language logic to separate ui controller * refactor: removed Settings from devices model * refactor: moved configs and services api logit to separate core controller * refactor: added a layer with a repository between the storage and controllers * refactor: use child parent system instead of smart pointers for controllers and models initialization * refactor: moved install functions from server controller to install controller * refactor: install controller refactoring * chore: renamed exportController to exportUiController * refactor: separate export controller * refactor: removed VpnConfigurationsController * chore: renamed ServerController to SshSession * refactor: replaced ServerController to SshSession * chore: moved qml controllers to separate folder * chore: include fixes * chore: moved utils from core root to core/utils * chore: include fixes * chore: rename core/utils files to camelCase foramt * chore: include fixes * chore: moved some utils to api and selfhosted folders * chore: include fixes * chore: remove unused file * chore: moved serialization folder to core/utils * chore: include fixes * chore: moved some files from client root to core/utils * chore: include fixes * chore: moved ui utils to ui/utils folder * chore: include fixes * chore: move utils from root to ui/utils * chore: include fixes * chore: moved configurators to core/configurators * chore: include fixes * refactor: moved iap logic from ui controller to core * refactor: moved remaining core logic from ApiConfigsController to SubscriptionController * chore: rename apiNewsController to apiNewsUiController * refactor: moved core logic from news ui controller to core * chore: renamed apiConfigsController to subscriptionUiController * chore: include fixes * refactor: merge ApiSettingsController with SubscriptionUiController * chore: moved ui selfhosted controllers to separate folder * chore: include fixes * chore: rename connectionController to connectiomUiController * refactor: moved core logic from connectionUiController * chore: rename settingsController to settingsUiController * refactor: move core logic from settingsUiController * refactor: moved core controller signal/slot connections to separate class * fix: newsController fixes after refactoring * chore: rename model to camelCase * chore: include fixes * chore: remove unused code * chore: move selfhosted core to separate folder * chore: include fixes * chore: rename importController to importUiController * refactor: move core logic from importUiController * chore: minor fixes * chore: remove prem v1 migration * refactor: remove openvpn over cloak and openvpn over shadowsocks * refactor: removed protocolsForContainer function * refactor: add core models * refactor: replace json with c++ structs for server config * refactor: move getDnsPair to ServerConfigUtils * feat: add admin selfhosted config export test * feat: add multi import test * refactor: use coreController for tests * feat: add few simple tests * chore: qrepos in all core controllers * feat: add test for settings * refactor: remove repo dependency from configurators * chore: moved protocols to core folder * chore: include fixes * refactor: moved containersDefs, defs, apiDefs, protocolsDefs to different places * chore: include fixes * chore: build fixes * chore: build fixes * refactor: remove q repo and interface repo * feat: add test for ui servers model and controller * chore: renamed to camelCase * chore: include fixes * refactor: moved core logic from sites ui controller * fix: fixed api config processing * fix: fixed processed server index processing * refactor: protocol models now use c++ structs instead of json configs * refactor: servers model now use c++ struct instead of json config * fix: fixed default server index processing * fix: fix logs init * fix: fix secure settings load keys * chore: build fixes * fix: fixed clear settings * fix: fixed restore backup * fix: sshSession usage * fix: fixed export functions signatures * fix: return missing part from buildContainerWorker * fix: fixed server description on page home * refactor: add container config helpers functions * refactor: c++ structs instead of json * chore: add dns protocol config struct * refactor: move config utils functions to config structs * feat: add test for selfhosted server setup * refactor: separate resources.qrc * fix: fixed server rename * chore: return nameOverriddenByUser * fix: build fixes * fix: fixed models init * refactor: cleanup models usage * fix: fixed models init * chore: cleanup connections and functions signatures * chore: cleanup updateModel calls * feat: added cache to servers repo * chore: cleanup unused functions * chore: ssxray processing * chore: remove transportProtoWithDefault and portWithDefault functions * chore: removed proto types any and l2tp * refactor: moved some constants * fix: fixed native configs export * refactor: remove json from processConfigWith functions * fix: fixed processed server index usage * fix: qml warning fixes * chore: merge fixes * chore: update tests * fix: fixed xray config processing * fix: fixed split tunneling processing * chore: rename sites controllers and model * chore: rename fixes * chore: minor fixes * chore: remove ability to load backup from "file with connection settings" button * fix: fixed api device revoke * fix: remove full model update when renaming a user * fix: fixed premium/free server rename * fix: fixed selfhosted new server install * fix: fixed updateContainer function * fix: fixed revoke for external premium configs * feat: add native configs qr processing * chore: codestyle fixes * fix: fixed admin config create * chore: again remove ability to load backup from "file with connection settings" button * chore: minor fixes * fix: fixed variables initialization * fix: fixed qml imports * fix: minor fixes * fix: fix vpnConnection function calls * feat: add buckup error handling * fix: fixed admin config revok * fix: fixed selfhosted awg installation * fix: ad visability * feat: add empty check for primary dns * chore: minor fixes
308 lines
8.6 KiB
C++
308 lines
8.6 KiB
C++
#include "secureQSettings.h"
|
|
|
|
#include "../client/3rd/QSimpleCrypto/src/include/QAead.h"
|
|
#include "../client/3rd/QSimpleCrypto/src/include/QBlockCipher.h"
|
|
#include "core/utils/utilities.h"
|
|
#include <QDataStream>
|
|
#include <QDebug>
|
|
#include <QEventLoop>
|
|
#include <QIODevice>
|
|
#include <QJsonDocument>
|
|
#include <QJsonObject>
|
|
#include <QRandomGenerator>
|
|
#include <QSharedPointer>
|
|
#include <QTimer>
|
|
|
|
using namespace QKeychain;
|
|
|
|
namespace {
|
|
constexpr const char *settingsKeyTag = "settingsKeyTag";
|
|
constexpr const char *settingsIvTag = "settingsIvTag";
|
|
constexpr const char *keyChainName = "AmneziaVPN-Keychain";
|
|
}
|
|
|
|
SecureQSettings::SecureQSettings(const QString &organization, const QString &application, QObject *parent, bool enableEncryption)
|
|
: QObject { parent }, m_settings(organization, application, parent), encryptedKeys({ "Servers/serversList" }), m_encryptionEnabled(enableEncryption)
|
|
{
|
|
bool encrypted = m_settings.value("Conf/encrypted").toBool();
|
|
|
|
// convert settings to encrypted for if updated to >= 2.1.0
|
|
if (encryptionRequired() && !encrypted) {
|
|
for (const QString &key : m_settings.allKeys()) {
|
|
if (encryptedKeys.contains(key)) {
|
|
const QVariant &val = value(key);
|
|
setValue(key, val);
|
|
}
|
|
}
|
|
m_settings.setValue("Conf/encrypted", true);
|
|
}
|
|
}
|
|
|
|
QVariant SecureQSettings::value(const QString &key, const QVariant &defaultValue) const
|
|
{
|
|
QMutexLocker locker(&m_mutex);
|
|
|
|
if (m_cache.contains(key)) {
|
|
return m_cache.value(key);
|
|
}
|
|
|
|
if (!m_settings.contains(key))
|
|
return defaultValue;
|
|
|
|
QVariant retVal;
|
|
|
|
// check if value is not encrypted, v. < 2.0.x
|
|
retVal = m_settings.value(key);
|
|
if (retVal.isValid()) {
|
|
if (retVal.userType() == QMetaType::QByteArray && retVal.toByteArray().mid(0, magicString.size()) == magicString) {
|
|
|
|
if (getEncKey().isEmpty() || getEncIv().isEmpty()) {
|
|
qCritical() << "SecureQSettings::setValue Decryption requested, but key is empty";
|
|
return {};
|
|
}
|
|
|
|
QByteArray encryptedValue = retVal.toByteArray().mid(magicString.size());
|
|
|
|
QByteArray decryptedValue = decryptText(encryptedValue);
|
|
QDataStream ds(&decryptedValue, QIODevice::ReadOnly);
|
|
|
|
ds >> retVal;
|
|
|
|
if (!retVal.isValid()) {
|
|
qWarning() << "SecureQSettings::value settings decryption failed";
|
|
retVal = QVariant();
|
|
}
|
|
}
|
|
} else {
|
|
qWarning() << "SecureQSettings::value invalid QVariant value";
|
|
retVal = QVariant();
|
|
}
|
|
|
|
m_cache.insert(key, retVal);
|
|
return retVal;
|
|
}
|
|
|
|
void SecureQSettings::setValue(const QString &key, const QVariant &value)
|
|
{
|
|
QMutexLocker locker(&m_mutex);
|
|
|
|
if (encryptionRequired() && encryptedKeys.contains(key)) {
|
|
if (!getEncKey().isEmpty() && !getEncIv().isEmpty()) {
|
|
QByteArray decryptedValue;
|
|
{
|
|
QDataStream ds(&decryptedValue, QIODevice::WriteOnly);
|
|
ds << value;
|
|
}
|
|
|
|
QByteArray encryptedValue = encryptText(decryptedValue);
|
|
m_settings.setValue(key, magicString + encryptedValue);
|
|
} else {
|
|
qCritical() << "SecureQSettings::setValue Encryption required, but key is empty";
|
|
return;
|
|
}
|
|
|
|
} else {
|
|
m_settings.setValue(key, value);
|
|
}
|
|
|
|
m_cache.insert(key, value);
|
|
}
|
|
|
|
void SecureQSettings::remove(const QString &key)
|
|
{
|
|
QMutexLocker locker(&m_mutex);
|
|
|
|
m_settings.remove(key);
|
|
m_cache.remove(key);
|
|
}
|
|
|
|
QByteArray SecureQSettings::backupAppConfig() const
|
|
{
|
|
QMutexLocker locker(&m_mutex);
|
|
|
|
QJsonObject cfg;
|
|
|
|
const auto needToBackup = [this](const auto &key) {
|
|
for (const auto &item : m_fieldsToBackup)
|
|
{
|
|
if (key == "Conf/installationUuid")
|
|
{
|
|
return false;
|
|
}
|
|
|
|
if (key.startsWith(item))
|
|
{
|
|
return true;
|
|
}
|
|
}
|
|
|
|
return false;
|
|
};
|
|
|
|
for (const QString &key : m_settings.allKeys()) {
|
|
|
|
if (!needToBackup(key))
|
|
{
|
|
continue;
|
|
}
|
|
|
|
cfg.insert(key, QJsonValue::fromVariant(value(key)));
|
|
}
|
|
|
|
return QJsonDocument(cfg).toJson();
|
|
}
|
|
|
|
bool SecureQSettings::restoreAppConfig(const QByteArray &json)
|
|
{
|
|
QMutexLocker locker(&m_mutex);
|
|
|
|
QJsonObject cfg = QJsonDocument::fromJson(json).object();
|
|
if (cfg.isEmpty())
|
|
return false;
|
|
|
|
for (const QString &key : cfg.keys()) {
|
|
if (key == "Conf/installationUuid") {
|
|
continue;
|
|
}
|
|
|
|
setValue(key, cfg.value(key).toVariant());
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
void SecureQSettings::clearSettings()
|
|
{
|
|
QMutexLocker locker(&m_mutex);
|
|
m_settings.clear();
|
|
m_cache.clear();
|
|
}
|
|
|
|
QByteArray SecureQSettings::encryptText(const QByteArray &value) const
|
|
{
|
|
QSimpleCrypto::QBlockCipher cipher;
|
|
QByteArray result;
|
|
try {
|
|
result = cipher.encryptAesBlockCipher(value, getEncKey(), getEncIv());
|
|
} catch (...) { // todo change error handling in QSimpleCrypto?
|
|
qCritical() << "error when encrypting the settings value";
|
|
}
|
|
return result;
|
|
}
|
|
|
|
QByteArray SecureQSettings::decryptText(const QByteArray &ba) const
|
|
{
|
|
QSimpleCrypto::QBlockCipher cipher;
|
|
QByteArray result;
|
|
try {
|
|
result = cipher.decryptAesBlockCipher(ba, getEncKey(), getEncIv());
|
|
} catch (...) { // todo change error handling in QSimpleCrypto?
|
|
qCritical() << "error when decrypting the settings value";
|
|
}
|
|
return result;
|
|
}
|
|
|
|
bool SecureQSettings::encryptionRequired() const
|
|
{
|
|
if (!m_encryptionEnabled) {
|
|
return false;
|
|
}
|
|
#if defined(Q_OS_LINUX) && !defined(Q_OS_ANDROID)
|
|
// QtKeyChain failing on Linux
|
|
return false;
|
|
#endif
|
|
return true;
|
|
}
|
|
|
|
QByteArray SecureQSettings::getEncKey() const
|
|
{
|
|
|
|
if (!m_key.isEmpty()) {
|
|
return m_key;
|
|
}
|
|
// load keys from system key storage
|
|
m_key = getSecTag(settingsKeyTag);
|
|
|
|
if (m_key.isEmpty()) {
|
|
// Create new key
|
|
QSimpleCrypto::QBlockCipher cipher;
|
|
QByteArray key = cipher.generatePrivateSalt(32);
|
|
if (key.isEmpty()) {
|
|
qCritical() << "SecureQSettings::getEncKey Unable to generate new enc key";
|
|
}
|
|
|
|
setSecTag(settingsKeyTag, key);
|
|
|
|
// check
|
|
m_key = getSecTag(settingsKeyTag);
|
|
if (key != m_key) {
|
|
qCritical() << "SecureQSettings::getEncKey Unable to store key in keychain" << key.size() << m_key.size();
|
|
return {};
|
|
}
|
|
}
|
|
|
|
return m_key;
|
|
}
|
|
|
|
QByteArray SecureQSettings::getEncIv() const
|
|
{
|
|
if (!m_iv.isEmpty()) {
|
|
return m_iv;
|
|
}
|
|
// load keys from system key storage
|
|
m_iv = getSecTag(settingsIvTag);
|
|
|
|
if (m_iv.isEmpty()) {
|
|
// Create new IV
|
|
QSimpleCrypto::QBlockCipher cipher;
|
|
QByteArray iv = cipher.generatePrivateSalt(32);
|
|
if (iv.isEmpty()) {
|
|
qCritical() << "SecureQSettings::getEncIv Unable to generate new enc IV";
|
|
}
|
|
setSecTag(settingsIvTag, iv);
|
|
|
|
// check
|
|
m_iv = getSecTag(settingsIvTag);
|
|
if (iv != m_iv) {
|
|
qCritical() << "SecureQSettings::getEncIv Unable to store IV in keychain" << iv.size() << m_iv.size();
|
|
return {};
|
|
}
|
|
}
|
|
|
|
return m_iv;
|
|
}
|
|
|
|
QByteArray SecureQSettings::getSecTag(const QString &tag)
|
|
{
|
|
auto job = QSharedPointer<ReadPasswordJob>(new ReadPasswordJob(keyChainName), &QObject::deleteLater);
|
|
job->setAutoDelete(false);
|
|
job->setKey(tag);
|
|
QEventLoop loop;
|
|
job->connect(job.data(), &ReadPasswordJob::finished, job.data(), [&loop]() { loop.quit(); });
|
|
job->start();
|
|
loop.exec();
|
|
|
|
if (job->error()) {
|
|
qCritical() << "SecureQSettings::getSecTag Error:" << job->errorString();
|
|
}
|
|
|
|
return job->binaryData();
|
|
}
|
|
|
|
void SecureQSettings::setSecTag(const QString &tag, const QByteArray &data)
|
|
{
|
|
auto job = QSharedPointer<WritePasswordJob>(new WritePasswordJob(keyChainName), &QObject::deleteLater);
|
|
job->setAutoDelete(false);
|
|
job->setKey(tag);
|
|
job->setBinaryData(data);
|
|
QEventLoop loop;
|
|
QTimer::singleShot(1000, &loop, SLOT(quit()));
|
|
job->connect(job.data(), &WritePasswordJob::finished, job.data(), [&loop]() { loop.quit(); });
|
|
job->start();
|
|
loop.exec();
|
|
|
|
if (job->error()) {
|
|
qCritical() << "SecureQSettings::setSecTag Error:" << job->errorString();
|
|
}
|
|
}
|