mirror of
https://github.com/amnezia-vpn/amnezia-client.git
synced 2026-06-22 02:01:08 +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
490 lines
15 KiB
QML
490 lines
15 KiB
QML
import QtQuick
|
|
import QtQuick.Controls
|
|
import QtQuick.Layouts
|
|
import QtQuick.Dialogs
|
|
|
|
import QtCore
|
|
|
|
import SortFilterProxyModel 0.2
|
|
|
|
import PageEnum 1.0
|
|
import ContainerProps 1.0
|
|
import Style 1.0
|
|
|
|
import "./"
|
|
import "../Controls2"
|
|
import "../Controls2/TextTypes"
|
|
import "../Config"
|
|
import "../Components"
|
|
|
|
PageType {
|
|
id: root
|
|
|
|
property var isServerFromTelegramApi: ServersModel.getDefaultServerData("isServerFromTelegramApi")
|
|
|
|
property bool pageEnabled
|
|
|
|
Component.onCompleted: {
|
|
if (ConnectionController.isConnected) {
|
|
PageController.showNotificationMessage(qsTr("Cannot change split tunneling settings during active connection"))
|
|
root.pageEnabled = false
|
|
} else if (ServersUiController.isDefaultServerDefaultContainerHasSplitTunneling) {
|
|
PageController.showNotificationMessage(qsTr("Default server does not support split tunneling function"))
|
|
root.pageEnabled = false
|
|
} else {
|
|
root.pageEnabled = true
|
|
}
|
|
}
|
|
|
|
Connections {
|
|
target: IpSplitTunnelingController
|
|
|
|
function onFinished(message) {
|
|
PageController.showNotificationMessage(message)
|
|
}
|
|
|
|
function onErrorOccurred(errorMessage) {
|
|
PageController.showErrorMessage(errorMessage)
|
|
}
|
|
}
|
|
|
|
QtObject {
|
|
id: routeMode
|
|
property int allSites: 0
|
|
property int onlyForwardSites: 1
|
|
property int allExceptSites: 2
|
|
}
|
|
|
|
property list<QtObject> routeModesModel: [
|
|
onlyForwardSites,
|
|
allExceptSites
|
|
]
|
|
|
|
QtObject {
|
|
id: onlyForwardSites
|
|
property string name: qsTr("Only the sites listed here will be accessed through the VPN")
|
|
property int type: routeMode.onlyForwardSites
|
|
}
|
|
QtObject {
|
|
id: allExceptSites
|
|
property string name: qsTr("Addresses from the list should not be accessed via VPN")
|
|
property int type: routeMode.allExceptSites
|
|
}
|
|
|
|
function getRouteModesModelIndex() {
|
|
var currentRouteMode = IpSplitTunnelingController.routeMode
|
|
if ((routeMode.onlyForwardSites === currentRouteMode) || (routeMode.allSites === currentRouteMode)) {
|
|
return 0
|
|
} else if (routeMode.allExceptSites === currentRouteMode) {
|
|
return 1
|
|
}
|
|
}
|
|
|
|
ColumnLayout {
|
|
id: header
|
|
|
|
anchors.top: parent.top
|
|
anchors.left: parent.left
|
|
anchors.right: parent.right
|
|
|
|
anchors.topMargin: 20 + PageController.safeAreaTopMargin
|
|
|
|
BackButtonType {
|
|
id: backButton
|
|
}
|
|
|
|
HeaderTypeWithSwitcher {
|
|
Layout.fillWidth: true
|
|
Layout.leftMargin: 16
|
|
Layout.rightMargin: 16
|
|
|
|
headerText: qsTr("Split tunneling")
|
|
|
|
enabled: root.pageEnabled
|
|
showSwitcher: true
|
|
switcher {
|
|
checked: IpSplitTunnelingController.isSplitTunnelingEnabled
|
|
enabled: root.pageEnabled
|
|
}
|
|
switcherFunction: function(checked) {
|
|
IpSplitTunnelingController.toggleSplitTunneling(checked)
|
|
selector.text = root.routeModesModel[getRouteModesModelIndex()].name
|
|
}
|
|
}
|
|
|
|
DropDownType {
|
|
id: selector
|
|
|
|
Layout.fillWidth: true
|
|
Layout.topMargin: 32
|
|
Layout.leftMargin: 16
|
|
Layout.rightMargin: 16
|
|
|
|
drawerHeight: 0.4375
|
|
drawerParent: root
|
|
|
|
enabled: root.pageEnabled
|
|
|
|
headerText: qsTr("Mode")
|
|
|
|
listView: ListViewWithRadioButtonType {
|
|
rootWidth: root.width
|
|
|
|
model: root.routeModesModel
|
|
|
|
selectedIndex: getRouteModesModelIndex()
|
|
|
|
clickedFunction: function() {
|
|
selector.text = selectedText
|
|
selector.closeTriggered()
|
|
if (IpSplitTunnelingController.routeMode !== root.routeModesModel[selectedIndex].type) {
|
|
IpSplitTunnelingController.routeMode = root.routeModesModel[selectedIndex].type
|
|
}
|
|
}
|
|
|
|
Component.onCompleted: {
|
|
if (root.routeModesModel[selectedIndex].type === IpSplitTunnelingController.routeMode) {
|
|
selector.text = selectedText
|
|
} else {
|
|
selector.text = root.routeModesModel[0].name
|
|
}
|
|
}
|
|
|
|
Connections {
|
|
target: IpSplitTunnelingController
|
|
function onRouteModeChanged() {
|
|
selectedIndex = getRouteModesModelIndex()
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
ListViewType {
|
|
id: listView
|
|
|
|
ScrollBar.vertical: ScrollBarType { policy: ScrollBar.AlwaysOn }
|
|
|
|
anchors.top: header.bottom
|
|
anchors.topMargin: 16
|
|
anchors.bottom: parent.bottom
|
|
anchors.bottomMargin: addSiteButton.implicitHeight + 48 + (searchField.textField.activeFocus ? 0 : PageController.imeHeight)
|
|
|
|
width: parent.width
|
|
|
|
enabled: root.pageEnabled
|
|
clip: true
|
|
|
|
model: SortFilterProxyModel {
|
|
id: proxyIpSplitTunnelingModel
|
|
sourceModel: IpSplitTunnelingModel
|
|
filters: [
|
|
AnyOf {
|
|
RegExpFilter {
|
|
roleName: "url"
|
|
pattern: ".*" + searchField.textField.text + ".*"
|
|
caseSensitivity: Qt.CaseInsensitive
|
|
}
|
|
RegExpFilter {
|
|
roleName: "ip"
|
|
pattern: ".*" + searchField.textField.text + ".*"
|
|
caseSensitivity: Qt.CaseInsensitive
|
|
}
|
|
}
|
|
]
|
|
}
|
|
|
|
delegate: ColumnLayout {
|
|
width: listView.width
|
|
|
|
LabelWithButtonType {
|
|
id: site
|
|
Layout.fillWidth: true
|
|
|
|
text: url
|
|
descriptionText: ip
|
|
rightImageSource: "qrc:/images/controls/trash.svg"
|
|
rightImageColor: AmneziaStyle.color.paleGray
|
|
|
|
clickedFunction: function() {
|
|
var headerText = qsTr("Remove ") + url + "?"
|
|
var yesButtonText = qsTr("Continue")
|
|
var noButtonText = qsTr("Cancel")
|
|
|
|
var yesButtonFunction = function() {
|
|
IpSplitTunnelingController.removeSite(proxyIpSplitTunnelingModel.mapToSource(index))
|
|
if (!GC.isMobile()) {
|
|
site.rightButton.forceActiveFocus()
|
|
}
|
|
}
|
|
var noButtonFunction = function() {
|
|
if (!GC.isMobile()) {
|
|
site.rightButton.forceActiveFocus()
|
|
}
|
|
}
|
|
|
|
showQuestionDrawer(headerText, "", yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
|
|
}
|
|
}
|
|
|
|
DividerType {}
|
|
}
|
|
}
|
|
|
|
Rectangle {
|
|
anchors.left: parent.left
|
|
anchors.right: parent.right
|
|
anchors.bottom: parent.bottom
|
|
|
|
height: addSiteButton.implicitHeight + 48
|
|
|
|
color: AmneziaStyle.color.midnightBlack
|
|
|
|
RowLayout {
|
|
id: addSiteButton
|
|
|
|
enabled: root.pageEnabled
|
|
|
|
anchors.bottom: parent.bottom
|
|
anchors.left: parent.left
|
|
anchors.right: parent.right
|
|
anchors.topMargin: 24
|
|
anchors.rightMargin: 16
|
|
anchors.leftMargin: 16
|
|
anchors.bottomMargin: 24
|
|
|
|
TextFieldWithHeaderType {
|
|
id: searchField
|
|
|
|
Layout.fillWidth: true
|
|
rightButtonClickedOnEnter: true
|
|
|
|
textField.placeholderText: qsTr("website or IP")
|
|
buttonImageSource: "qrc:/images/controls/plus.svg"
|
|
|
|
clickedFunc: function() {
|
|
PageController.showBusyIndicator(true)
|
|
IpSplitTunnelingController.addSite(textField.text)
|
|
textField.text = ""
|
|
PageController.showBusyIndicator(false)
|
|
}
|
|
}
|
|
|
|
ImageButtonType {
|
|
id: addSiteButtonImage
|
|
implicitWidth: 56
|
|
implicitHeight: 56
|
|
|
|
image: "qrc:/images/controls/more-vertical.svg"
|
|
imageColor: AmneziaStyle.color.paleGray
|
|
|
|
onClicked: function () {
|
|
moreActionsDrawer.openTriggered()
|
|
}
|
|
|
|
Keys.onReturnPressed: addSiteButtonImage.clicked()
|
|
Keys.onEnterPressed: addSiteButtonImage.clicked()
|
|
}
|
|
}
|
|
}
|
|
|
|
DrawerType2 {
|
|
id: moreActionsDrawer
|
|
|
|
anchors.fill: parent
|
|
expandedHeight: parent.height * 0.4375
|
|
|
|
expandedStateContent: ColumnLayout {
|
|
id: moreActionsDrawerContent
|
|
|
|
anchors.top: parent.top
|
|
anchors.left: parent.left
|
|
anchors.right: parent.right
|
|
|
|
Header2Type {
|
|
Layout.fillWidth: true
|
|
Layout.margins: 16
|
|
|
|
headerText: qsTr("Additional options")
|
|
}
|
|
|
|
LabelWithButtonType {
|
|
id: importSitesButton
|
|
Layout.fillWidth: true
|
|
|
|
text: qsTr("Import")
|
|
rightImageSource: "qrc:/images/controls/chevron-right.svg"
|
|
|
|
clickedFunction: function() {
|
|
importSitesDrawer.openTriggered()
|
|
}
|
|
}
|
|
|
|
DividerType {}
|
|
|
|
LabelWithButtonType {
|
|
id: exportSitesButton
|
|
Layout.fillWidth: true
|
|
text: qsTr("Save site list")
|
|
|
|
clickedFunction: function() {
|
|
var fileName = ""
|
|
if (GC.isMobile()) {
|
|
fileName = "amnezia_sites.json"
|
|
} else {
|
|
fileName = SystemController.getFileName(qsTr("Save sites"),
|
|
qsTr("Sites files (*.json)"),
|
|
StandardPaths.standardLocations(StandardPaths.DocumentsLocation) + "/amnezia_sites",
|
|
true,
|
|
".json")
|
|
}
|
|
if (fileName !== "") {
|
|
PageController.showBusyIndicator(true)
|
|
IpSplitTunnelingController.exportSites(fileName)
|
|
moreActionsDrawer.closeTriggered()
|
|
PageController.showBusyIndicator(false)
|
|
}
|
|
}
|
|
}
|
|
|
|
DividerType {}
|
|
|
|
LabelWithButtonType {
|
|
id: clearSitesButton
|
|
Layout.fillWidth: true
|
|
|
|
text: qsTr("Clear site list")
|
|
|
|
clickedFunction: function() {
|
|
var headerText = qsTr("Clear site list?")
|
|
var descriptionText = qsTr("All sites will be removed from list.")
|
|
var yesButtonText = qsTr("Continue")
|
|
var noButtonText = qsTr("Cancel")
|
|
|
|
var yesButtonFunction = function() {
|
|
PageController.showBusyIndicator(true)
|
|
IpSplitTunnelingController.removeSites()
|
|
PageController.showBusyIndicator(false)
|
|
}
|
|
var noButtonFunction = function() {
|
|
|
|
}
|
|
|
|
showQuestionDrawer(headerText, descriptionText, yesButtonText, noButtonText, yesButtonFunction, noButtonFunction)
|
|
}
|
|
}
|
|
|
|
DividerType {}
|
|
}
|
|
}
|
|
|
|
DrawerType2 {
|
|
id: importSitesDrawer
|
|
|
|
anchors.fill: parent
|
|
expandedHeight: parent.height * 0.4375
|
|
|
|
expandedStateContent: Item {
|
|
implicitHeight: importSitesDrawer.expandedHeight
|
|
|
|
BackButtonType {
|
|
id: importSitesDrawerBackButton
|
|
|
|
anchors.top: parent.top
|
|
anchors.left: parent.left
|
|
anchors.right: parent.right
|
|
anchors.topMargin: 16
|
|
|
|
backButtonFunction: function() {
|
|
importSitesDrawer.closeTriggered()
|
|
}
|
|
|
|
onFocusChanged: {
|
|
if (this.activeFocus) {
|
|
importSitesDrawerListView.positionViewAtBeginning()
|
|
}
|
|
}
|
|
}
|
|
|
|
ListViewType {
|
|
id: importSitesDrawerListView
|
|
|
|
anchors.top: importSitesDrawerBackButton.bottom
|
|
anchors.left: parent.left
|
|
anchors.right: parent.right
|
|
anchors.bottom: parent.bottom
|
|
|
|
header: ColumnLayout {
|
|
width: importSitesDrawerListView.width
|
|
|
|
Header2Type {
|
|
Layout.fillWidth: true
|
|
Layout.margins: 16
|
|
|
|
headerText: qsTr("Import a list of sites")
|
|
}
|
|
}
|
|
|
|
model: importOptions
|
|
|
|
delegate: ColumnLayout {
|
|
width: importSitesDrawerListView.width
|
|
|
|
LabelWithButtonType {
|
|
Layout.fillWidth: true
|
|
Layout.leftMargin: 16
|
|
Layout.rightMargin: 16
|
|
|
|
text: title
|
|
|
|
clickedFunction: function() {
|
|
clickedHandler()
|
|
}
|
|
}
|
|
|
|
DividerType {}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
property list<QtObject> importOptions: [
|
|
replaceOption,
|
|
addOption,
|
|
]
|
|
|
|
QtObject {
|
|
id: replaceOption
|
|
|
|
readonly property string title: qsTr("Replace site list")
|
|
readonly property var clickedHandler: function() {
|
|
var fileName = SystemController.getFileName(qsTr("Open sites file"),
|
|
qsTr("Sites files (*.json)"))
|
|
if (fileName !== "") {
|
|
root.importSites(fileName, true)
|
|
}
|
|
}
|
|
}
|
|
|
|
QtObject {
|
|
id: addOption
|
|
|
|
readonly property string title: qsTr("Add imported sites to existing ones")
|
|
readonly property var clickedHandler: function() {
|
|
var fileName = SystemController.getFileName(qsTr("Open sites file"),
|
|
qsTr("Sites files (*.json)"))
|
|
if (fileName !== "") {
|
|
root.importSites(fileName, false)
|
|
}
|
|
}
|
|
}
|
|
|
|
function importSites(fileName, replaceExistingSites) {
|
|
PageController.showBusyIndicator(true)
|
|
IpSplitTunnelingController.importSites(fileName, replaceExistingSites)
|
|
PageController.showBusyIndicator(false)
|
|
importSitesDrawer.closeTriggered()
|
|
moreActionsDrawer.closeTriggered()
|
|
}
|
|
}
|