mirror of
https://github.com/amnezia-vpn/amnezia-client.git
synced 2026-06-21 02:01:03 +07:00
847bb6923b
* 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
165 lines
6.1 KiB
C++
165 lines
6.1 KiB
C++
#include "openvpnConfigModel.h"
|
|
|
|
#include "core/utils/protocolEnum.h"
|
|
#include "core/protocols/protocolUtils.h"
|
|
#include "core/utils/constants/configKeys.h"
|
|
#include "core/utils/constants/protocolConstants.h"
|
|
|
|
using namespace amnezia;
|
|
|
|
OpenVpnConfigModel::OpenVpnConfigModel(QObject *parent) : QAbstractListModel(parent)
|
|
{
|
|
}
|
|
|
|
int OpenVpnConfigModel::rowCount(const QModelIndex &parent) const
|
|
{
|
|
Q_UNUSED(parent);
|
|
return 1;
|
|
}
|
|
|
|
bool OpenVpnConfigModel::setData(const QModelIndex &index, const QVariant &value, int role)
|
|
{
|
|
if (!index.isValid() || index.row() < 0 || index.row() >= ContainerUtils::allContainers().size()) {
|
|
return false;
|
|
}
|
|
|
|
QString strValue = value.toString();
|
|
bool boolValue = value.toBool();
|
|
|
|
switch (role) {
|
|
case Roles::SubnetAddressRole: m_protocolConfig.serverConfig.subnetAddress = strValue; break;
|
|
case Roles::TransportProtoRole: m_protocolConfig.serverConfig.transportProto = strValue; break;
|
|
case Roles::PortRole: m_protocolConfig.serverConfig.port = strValue; break;
|
|
case Roles::AutoNegotiateEncryprionRole: m_protocolConfig.serverConfig.ncpDisable = !boolValue; break;
|
|
case Roles::HashRole: m_protocolConfig.serverConfig.hash = strValue; break;
|
|
case Roles::CipherRole: m_protocolConfig.serverConfig.cipher = strValue; break;
|
|
case Roles::TlsAuthRole: m_protocolConfig.serverConfig.tlsAuth = boolValue; break;
|
|
case Roles::BlockDnsRole: {
|
|
if (!m_protocolConfig.clientConfig.has_value()) {
|
|
m_protocolConfig.clientConfig = amnezia::OpenVpnClientConfig{};
|
|
}
|
|
m_protocolConfig.clientConfig->blockOutsideDns = boolValue;
|
|
break;
|
|
}
|
|
case Roles::AdditionalClientCommandsRole: m_protocolConfig.serverConfig.additionalClientConfig = strValue; break;
|
|
case Roles::AdditionalServerCommandsRole: m_protocolConfig.serverConfig.additionalServerConfig = strValue; break;
|
|
default:
|
|
return false;
|
|
}
|
|
|
|
emit dataChanged(index, index, QList { role });
|
|
return true;
|
|
}
|
|
|
|
QVariant OpenVpnConfigModel::data(const QModelIndex &index, int role) const
|
|
{
|
|
if (!index.isValid() || index.row() < 0 || index.row() >= rowCount()) {
|
|
return QVariant();
|
|
}
|
|
|
|
switch (role) {
|
|
case Roles::SubnetAddressRole: return m_protocolConfig.serverConfig.subnetAddress;
|
|
case Roles::TransportProtoRole: return m_protocolConfig.serverConfig.transportProto;
|
|
case Roles::PortRole: return m_protocolConfig.serverConfig.port;
|
|
case Roles::AutoNegotiateEncryprionRole: return !m_protocolConfig.serverConfig.ncpDisable;
|
|
case Roles::HashRole: return m_protocolConfig.serverConfig.hash;
|
|
case Roles::CipherRole: return m_protocolConfig.serverConfig.cipher;
|
|
case Roles::TlsAuthRole: return m_protocolConfig.serverConfig.tlsAuth;
|
|
case Roles::BlockDnsRole: {
|
|
if (m_protocolConfig.clientConfig.has_value()) {
|
|
return m_protocolConfig.clientConfig->blockOutsideDns;
|
|
}
|
|
return protocols::openvpn::defaultBlockOutsideDns;
|
|
}
|
|
case Roles::AdditionalClientCommandsRole: return m_protocolConfig.serverConfig.additionalClientConfig;
|
|
case Roles::AdditionalServerCommandsRole: return m_protocolConfig.serverConfig.additionalServerConfig;
|
|
case Roles::IsPortEditable: return m_container == DockerContainer::OpenVpn ? true : false;
|
|
case Roles::IsTransportProtoEditable: return m_container == DockerContainer::OpenVpn ? true : false;
|
|
case Roles::HasRemoveButton: return m_container == DockerContainer::OpenVpn ? true : false;
|
|
}
|
|
return QVariant();
|
|
}
|
|
|
|
void OpenVpnConfigModel::updateModel(amnezia::DockerContainer container, const amnezia::OpenVpnProtocolConfig &protocolConfig)
|
|
{
|
|
beginResetModel();
|
|
m_container = container;
|
|
|
|
m_protocolConfig = protocolConfig;
|
|
|
|
applyDefaultsToServerConfig(m_protocolConfig.serverConfig);
|
|
|
|
if (!m_protocolConfig.clientConfig.has_value()) {
|
|
m_protocolConfig.clientConfig = amnezia::OpenVpnClientConfig{};
|
|
}
|
|
applyDefaultsToClientConfig(m_protocolConfig.clientConfig.value());
|
|
|
|
m_originalProtocolConfig = m_protocolConfig;
|
|
|
|
endResetModel();
|
|
}
|
|
|
|
void OpenVpnConfigModel::applyDefaultsToServerConfig(amnezia::OpenVpnServerConfig& config)
|
|
{
|
|
if (config.subnetAddress.isEmpty()) {
|
|
config.subnetAddress = protocols::openvpn::defaultSubnetAddress;
|
|
}
|
|
if (config.port.isEmpty()) {
|
|
config.port = protocols::openvpn::defaultPort;
|
|
}
|
|
if (config.transportProto.isEmpty()) {
|
|
if (m_container == DockerContainer::OpenVpn) {
|
|
config.transportProto = protocols::openvpn::defaultTransportProto;
|
|
} else {
|
|
config.transportProto = "tcp";
|
|
}
|
|
}
|
|
if (config.cipher.isEmpty()) {
|
|
config.cipher = protocols::openvpn::defaultCipher;
|
|
}
|
|
if (config.hash.isEmpty()) {
|
|
config.hash = protocols::openvpn::defaultHash;
|
|
}
|
|
}
|
|
|
|
void OpenVpnConfigModel::applyDefaultsToClientConfig(amnezia::OpenVpnClientConfig& config)
|
|
{
|
|
if (!config.blockOutsideDns && !m_protocolConfig.serverConfig.additionalClientConfig.isEmpty()) {
|
|
config.blockOutsideDns = protocols::openvpn::defaultBlockOutsideDns;
|
|
}
|
|
}
|
|
|
|
amnezia::OpenVpnProtocolConfig OpenVpnConfigModel::getProtocolConfig()
|
|
{
|
|
bool serverSettingsChanged = !m_protocolConfig.serverConfig.hasEqualServerSettings(m_originalProtocolConfig.serverConfig);
|
|
|
|
if (serverSettingsChanged) {
|
|
m_protocolConfig.clearClientConfig();
|
|
}
|
|
|
|
return m_protocolConfig;
|
|
}
|
|
|
|
QHash<int, QByteArray> OpenVpnConfigModel::roleNames() const
|
|
{
|
|
QHash<int, QByteArray> roles;
|
|
|
|
roles[SubnetAddressRole] = "subnetAddress";
|
|
roles[TransportProtoRole] = "transportProto";
|
|
roles[PortRole] = "port";
|
|
roles[AutoNegotiateEncryprionRole] = "autoNegotiateEncryprion";
|
|
roles[HashRole] = "hash";
|
|
roles[CipherRole] = "cipher";
|
|
roles[TlsAuthRole] = "tlsAuth";
|
|
roles[BlockDnsRole] = "blockDns";
|
|
roles[AdditionalClientCommandsRole] = "additionalClientCommands";
|
|
roles[AdditionalServerCommandsRole] = "additionalServerCommands";
|
|
|
|
roles[IsPortEditable] = "isPortEditable";
|
|
roles[IsTransportProtoEditable] = "isTransportProtoEditable";
|
|
|
|
roles[HasRemoveButton] = "hasRemoveButton";
|
|
|
|
return roles;
|
|
}
|