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
246 lines
7.4 KiB
C++
246 lines
7.4 KiB
C++
#include "ipSplitTunnelingController.h"
|
|
#include "core/utils/networkUtilities.h"
|
|
#include <QJsonObject>
|
|
|
|
IpSplitTunnelingController::IpSplitTunnelingController(SecureAppSettingsRepository* appSettingsRepository, QObject* parent)
|
|
: QObject(parent),
|
|
m_appSettingsRepository(appSettingsRepository)
|
|
{
|
|
m_currentRouteMode = m_appSettingsRepository->routeMode();
|
|
if (m_currentRouteMode == RouteMode::VpnAllSites) { // for old split tunneling configs
|
|
m_appSettingsRepository->setRouteMode(RouteMode::VpnOnlyForwardSites);
|
|
m_currentRouteMode = RouteMode::VpnOnlyForwardSites;
|
|
}
|
|
fillSites();
|
|
}
|
|
|
|
bool IpSplitTunnelingController::addSiteInternal(const QString &hostname, const QString &ip)
|
|
{
|
|
QVariantMap existing = m_appSettingsRepository->vpnSites(m_currentRouteMode);
|
|
if (existing.contains(hostname) && ip.isEmpty()) {
|
|
return false;
|
|
}
|
|
|
|
for (int i = 0; i < m_sites.size(); i++) {
|
|
if (m_sites[i].first == hostname && (m_sites[i].second.isEmpty() && !ip.isEmpty())) {
|
|
m_sites[i].second = ip;
|
|
m_appSettingsRepository->addVpnSite(m_currentRouteMode, hostname, ip);
|
|
return true;
|
|
} else if (m_sites[i].first == hostname && (m_sites[i].second == ip)) {
|
|
return false;
|
|
}
|
|
}
|
|
m_sites.append(qMakePair(hostname, ip));
|
|
m_appSettingsRepository->addVpnSite(m_currentRouteMode, hostname, ip);
|
|
return true;
|
|
}
|
|
|
|
void IpSplitTunnelingController::addSites(const QMap<QString, QString> &sites, bool replaceExisting)
|
|
{
|
|
if (replaceExisting) {
|
|
m_sites.clear();
|
|
}
|
|
for (auto it = sites.constBegin(); it != sites.constEnd(); ++it) {
|
|
const QString &hostname = it.key();
|
|
const QString &ip = it.value();
|
|
bool found = false;
|
|
for (int i = 0; i < m_sites.size(); i++) {
|
|
if (m_sites[i].first == hostname) {
|
|
if (!ip.isEmpty()) {
|
|
m_sites[i].second = ip;
|
|
}
|
|
found = true;
|
|
break;
|
|
}
|
|
}
|
|
if (!found) {
|
|
m_sites.append(qMakePair(hostname, ip));
|
|
}
|
|
}
|
|
if (replaceExisting) {
|
|
m_appSettingsRepository->removeAllVpnSites(m_currentRouteMode);
|
|
}
|
|
m_appSettingsRepository->addVpnSites(m_currentRouteMode, sites);
|
|
}
|
|
|
|
bool IpSplitTunnelingController::addSite(const QString &hostname)
|
|
{
|
|
QString normalizedHostname = normalizeHostname(hostname);
|
|
|
|
if (!validateHostname(normalizedHostname)) {
|
|
return false;
|
|
}
|
|
|
|
if (NetworkUtilities::ipAddressWithSubnetRegExp().exactMatch(normalizedHostname)) {
|
|
processSite(normalizedHostname, "");
|
|
return true;
|
|
}
|
|
|
|
if (addSiteInternal(normalizedHostname, "")) {
|
|
QHostInfo::lookupHost(normalizedHostname, this, SLOT(onHostResolved(QHostInfo)));
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
bool IpSplitTunnelingController::removeSite(const QString &hostname)
|
|
{
|
|
for (int i = 0; i < m_sites.size(); i++) {
|
|
if (m_sites[i].first == hostname) {
|
|
m_sites.removeAt(i);
|
|
m_appSettingsRepository->removeVpnSite(m_currentRouteMode, hostname);
|
|
return true;
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
void IpSplitTunnelingController::removeSites()
|
|
{
|
|
m_sites.clear();
|
|
m_appSettingsRepository->removeAllVpnSites(m_currentRouteMode);
|
|
}
|
|
|
|
void IpSplitTunnelingController::setRouteMode(RouteMode routeMode)
|
|
{
|
|
m_currentRouteMode = routeMode;
|
|
fillSites();
|
|
m_appSettingsRepository->setRouteMode(routeMode);
|
|
}
|
|
|
|
void IpSplitTunnelingController::toggleSplitTunneling(bool enabled)
|
|
{
|
|
m_appSettingsRepository->setSitesSplitTunnelingEnabled(enabled);
|
|
}
|
|
|
|
RouteMode IpSplitTunnelingController::getRouteMode() const
|
|
{
|
|
return m_currentRouteMode;
|
|
}
|
|
|
|
bool IpSplitTunnelingController::isSplitTunnelingEnabled() const
|
|
{
|
|
return m_appSettingsRepository->isSitesSplitTunnelingEnabled();
|
|
}
|
|
|
|
QVector<QPair<QString, QString>> IpSplitTunnelingController::getCurrentSites() const
|
|
{
|
|
return m_sites;
|
|
}
|
|
|
|
void IpSplitTunnelingController::fillSites()
|
|
{
|
|
QVariantMap sitesMap = m_appSettingsRepository->vpnSites(m_currentRouteMode);
|
|
m_sites.clear();
|
|
for (auto it = sitesMap.begin(); it != sitesMap.end(); ++it) {
|
|
m_sites.append(qMakePair(it.key(), it.value().toString()));
|
|
}
|
|
}
|
|
|
|
QString IpSplitTunnelingController::normalizeHostname(const QString &hostname) const
|
|
{
|
|
QString normalized = hostname;
|
|
normalized.replace("https://", "");
|
|
normalized.replace("http://", "");
|
|
normalized.replace("ftp://", "");
|
|
normalized = normalized.split("/", Qt::SkipEmptyParts).first();
|
|
return normalized;
|
|
}
|
|
|
|
bool IpSplitTunnelingController::validateHostname(const QString &hostname) const
|
|
{
|
|
if (hostname.isEmpty()) {
|
|
return false;
|
|
}
|
|
if (!hostname.contains(".") && !NetworkUtilities::ipAddressWithSubnetRegExp().exactMatch(hostname)) {
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
|
|
void IpSplitTunnelingController::onHostResolved(const QHostInfo &hostInfo)
|
|
{
|
|
const QList<QHostAddress> &addresses = hostInfo.addresses();
|
|
QString hostname = hostInfo.hostName();
|
|
|
|
for (const QHostAddress &addr : addresses) {
|
|
if (addr.protocol() == QAbstractSocket::NetworkLayerProtocol::IPv4Protocol) {
|
|
processSiteAfterResolve(hostname, addr.toString());
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
void IpSplitTunnelingController::processSiteAfterResolve(const QString &hostname, const QString &ip)
|
|
{
|
|
for (int i = 0; i < m_sites.size(); i++) {
|
|
if (m_sites[i].first == hostname && m_sites[i].second.isEmpty()) {
|
|
m_sites[i].second = ip;
|
|
m_appSettingsRepository->addVpnSite(m_currentRouteMode, hostname, ip);
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
void IpSplitTunnelingController::processSite(const QString &hostname, const QString &ip)
|
|
{
|
|
addSiteInternal(hostname, ip);
|
|
}
|
|
|
|
bool IpSplitTunnelingController::importSitesFromJson(const QByteArray& jsonData, bool replaceExisting, QString &errorMessage)
|
|
{
|
|
QJsonParseError parseError;
|
|
QJsonDocument jsonDocument = QJsonDocument::fromJson(jsonData, &parseError);
|
|
|
|
if (parseError.error != QJsonParseError::NoError) {
|
|
errorMessage = tr("Failed to parse JSON data: %1").arg(parseError.errorString());
|
|
return false;
|
|
}
|
|
|
|
if (!jsonDocument.isArray()) {
|
|
errorMessage = tr("The JSON data is not an array");
|
|
return false;
|
|
}
|
|
|
|
QJsonArray jsonArray = jsonDocument.array();
|
|
QMap<QString, QString> sites;
|
|
|
|
for (auto jsonValue : jsonArray) {
|
|
QJsonObject jsonObject = jsonValue.toObject();
|
|
QString hostname = jsonObject.value("hostname").toString("");
|
|
QString ip = jsonObject.value("ip").toString("");
|
|
|
|
QString normalizedHostname = normalizeHostname(hostname);
|
|
|
|
if (!validateHostname(normalizedHostname)) {
|
|
qDebug() << normalizedHostname << " not look like ip adress or domain name";
|
|
continue;
|
|
}
|
|
|
|
sites.insert(normalizedHostname, ip);
|
|
}
|
|
|
|
addSites(sites, replaceExisting);
|
|
|
|
return true;
|
|
}
|
|
|
|
QByteArray IpSplitTunnelingController::exportSitesToJson() const
|
|
{
|
|
QVector<QPair<QString, QString>> sites = getCurrentSites();
|
|
QJsonArray jsonArray;
|
|
|
|
for (const auto &site : sites) {
|
|
QJsonObject jsonObject;
|
|
jsonObject["hostname"] = site.first;
|
|
jsonObject["ip"] = site.second;
|
|
jsonArray.append(jsonObject);
|
|
}
|
|
|
|
QJsonDocument jsonDocument(jsonArray);
|
|
return jsonDocument.toJson();
|
|
}
|
|
|