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
148 lines
5.7 KiB
C++
148 lines
5.7 KiB
C++
#include <QTest>
|
|
#include <QJsonDocument>
|
|
#include <QJsonObject>
|
|
#include <QJsonArray>
|
|
#include <QFile>
|
|
#include <QDebug>
|
|
#include <QUuid>
|
|
#include <QSignalSpy>
|
|
|
|
#include "core/controllers/coreController.h"
|
|
#include "core/models/serverConfig.h"
|
|
#include "vpnConnection.h"
|
|
#include "secureQSettings.h"
|
|
|
|
class TestAdminSelfHostedExport : public QObject
|
|
{
|
|
Q_OBJECT
|
|
|
|
private:
|
|
CoreController* m_coreController;
|
|
SecureQSettings* m_settings;
|
|
|
|
QJsonObject decodeVpnKey(const QString &vpnKey) {
|
|
QString key = vpnKey;
|
|
key.replace("vpn://", "");
|
|
|
|
QByteArray ba = QByteArray::fromBase64(
|
|
key.toUtf8(),
|
|
QByteArray::Base64UrlEncoding | QByteArray::OmitTrailingEquals
|
|
);
|
|
|
|
qDebug() << "Base64 decoded size:" << ba.size();
|
|
|
|
QJsonDocument testDoc = QJsonDocument::fromJson(ba);
|
|
if (!testDoc.isNull()) {
|
|
qDebug() << "Data is not compressed, using as-is";
|
|
return testDoc.object();
|
|
}
|
|
|
|
QByteArray baUncompressed = qUncompress(ba);
|
|
if (!baUncompressed.isEmpty()) {
|
|
qDebug() << "Data was compressed, uncompressed size:" << baUncompressed.size();
|
|
ba = baUncompressed;
|
|
} else {
|
|
qDebug() << "qUncompress failed or data is not compressed";
|
|
}
|
|
|
|
return QJsonDocument::fromJson(ba).object();
|
|
}
|
|
|
|
QJsonObject sortContainers(const QJsonObject &config) {
|
|
QJsonObject sorted = config;
|
|
|
|
if (!config.contains("containers")) {
|
|
return sorted;
|
|
}
|
|
|
|
QJsonArray containers = config["containers"].toArray();
|
|
QVector<QJsonObject> containerVec;
|
|
|
|
for (const QJsonValue &val : containers) {
|
|
containerVec.append(val.toObject());
|
|
}
|
|
|
|
std::sort(containerVec.begin(), containerVec.end(), [](const QJsonObject &a, const QJsonObject &b) {
|
|
return a["container"].toString() < b["container"].toString();
|
|
});
|
|
|
|
QJsonArray sortedContainers;
|
|
for (const QJsonObject &obj : containerVec) {
|
|
sortedContainers.append(obj);
|
|
}
|
|
|
|
sorted["containers"] = sortedContainers;
|
|
return sorted;
|
|
}
|
|
|
|
|
|
private slots:
|
|
void initTestCase() {
|
|
QString testOrg = "AmneziaVPN-Test-" + QUuid::createUuid().toString();
|
|
m_settings = new SecureQSettings(testOrg, "amnezia-client", nullptr, false);
|
|
|
|
auto vpnConnection = QSharedPointer<VpnConnection>::create(nullptr, nullptr);
|
|
|
|
m_coreController = new CoreController(vpnConnection, m_settings, nullptr, this);
|
|
}
|
|
|
|
void cleanupTestCase() {
|
|
m_settings->clearSettings();
|
|
delete m_coreController;
|
|
delete m_settings;
|
|
}
|
|
|
|
void init() {
|
|
m_settings->clearSettings();
|
|
}
|
|
|
|
void testAdminSelfHostedExport() {
|
|
QString vpnKey = "vpn://AAABTXjarZIxT8MwEIX_Cro5jbDjQunKUhhYyoZQZZKjRGpsy3baQtT_zp2bJh3oACLLPfvz3bOe00FpTdS1QR9g_tKB3q1h3sFCwBzEdf9N5ElBBgtJqBiQOkcFoemAbs6RInQ7oNkZemAvrrKvRV9VX6fH-lhSVSwavU9GSdcmXZX0UqSbseJRMqlioDxuSsJZH1mKWTrhvI22tJvVljKoLU-TtB3aN4NxpavKYwhpSD7LRc4t0WsTeMwqNRNsKweHbAyTtnRj8KvWE0pUEut-hNah2TpDM0-Kwu8vKMSd-ttFLrntao_rVvuKWkc9OnIk4n8t915_Ulcqo5FSxa9tYsk2rxlU-K7bTby_lDWfCKWvXTy-5jOGeLVET-9L7MOG-KQbJEBx57jXjdtgXtqG_wUdws5yJhCpa1iefhopM2gD-n4An-ElHL4BvzD6nw";
|
|
|
|
QSignalSpy importFinishedSpy(m_coreController->m_importCoreController, &ImportController::importFinished);
|
|
QSignalSpy defaultServerChangedSpy(m_coreController->m_serversRepository, &SecureServersRepository::defaultServerChanged);
|
|
|
|
qDebug() << "IMPORTED KEY:" << vpnKey;
|
|
|
|
auto importResult = m_coreController->m_importCoreController->extractConfigFromData(vpnKey);
|
|
|
|
QVERIFY2(importResult.errorCode == ErrorCode::NoError, "Import should succeed");
|
|
QVERIFY2(!importResult.config.isEmpty(), "Config should not be empty");
|
|
|
|
QJsonObject importedConfig = importResult.config;
|
|
|
|
m_coreController->m_importCoreController->importConfig(importedConfig);
|
|
|
|
QVERIFY2(importFinishedSpy.count() == 1, "importFinished signal should be emitted");
|
|
QVERIFY2(defaultServerChangedSpy.count() == 0, "defaultServerChanged signal should NOT be emitted (default is already 0)");
|
|
QVERIFY2(m_coreController->m_serversRepository->serversCount() > 0, "Server should be added");
|
|
|
|
int serverIndex = m_coreController->m_serversRepository->defaultServerIndex();
|
|
auto exportResult = m_coreController->m_exportController->generateFullAccessConfig(serverIndex);
|
|
|
|
QVERIFY2(exportResult.errorCode == ErrorCode::NoError, "Export should succeed");
|
|
QVERIFY2(!exportResult.config.isEmpty(), "Exported config should not be empty");
|
|
|
|
qDebug() << "EXPORTED KEY:" << exportResult.config;
|
|
|
|
QJsonObject exportedConfig = decodeVpnKey(exportResult.config);
|
|
|
|
auto importResult2 = m_coreController->m_importCoreController->extractConfigFromData(exportResult.config);
|
|
QVERIFY2(importResult2.errorCode == ErrorCode::NoError, "Re-import should succeed");
|
|
|
|
QJsonObject sortedImported = sortContainers(importedConfig);
|
|
QJsonObject sortedExported = sortContainers(importResult2.config);
|
|
|
|
QString importedJson = QJsonDocument(sortedImported).toJson(QJsonDocument::Compact);
|
|
QString exportedJson = QJsonDocument(sortedExported).toJson(QJsonDocument::Compact);
|
|
|
|
qDebug() << "IMPORTED JSON:" << importedJson;
|
|
qDebug() << "EXPORTED JSON:" << exportedJson;
|
|
|
|
QCOMPARE(exportedJson, importedJson);
|
|
}
|
|
};
|
|
|
|
QTEST_MAIN(TestAdminSelfHostedExport)
|
|
#include "testAdminSelfHostedExport.moc"
|