bugfix: empty split tunneling list (#1520)
* Disable split tunneling with empty list * Fix bug with Amnezia DNS in split tunneling list * update ubuntu version for linux deploy pipeline * Fix deploy script
This commit is contained in:
parent
b3b0fec2e1
commit
c245318339
2 changed files with 10 additions and 4 deletions
4
.github/workflows/deploy.yml
vendored
4
.github/workflows/deploy.yml
vendored
|
|
@ -10,7 +10,7 @@ env:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
Build-Linux-Ubuntu:
|
Build-Linux-Ubuntu:
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-24.04
|
||||||
|
|
||||||
env:
|
env:
|
||||||
QT_VERSION: 6.6.2
|
QT_VERSION: 6.6.2
|
||||||
|
|
@ -47,7 +47,7 @@ jobs:
|
||||||
|
|
||||||
- name: 'Build project'
|
- name: 'Build project'
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get install libxkbcommon-x11-0
|
sudo apt-get install libxkbcommon-x11-0 libsecret-1-dev
|
||||||
export QT_BIN_DIR=${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/gcc_64/bin
|
export QT_BIN_DIR=${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/gcc_64/bin
|
||||||
export QIF_BIN_DIR=${{ runner.temp }}/Qt/Tools/QtInstallerFramework/${{ env.QIF_VERSION }}/bin
|
export QIF_BIN_DIR=${{ runner.temp }}/Qt/Tools/QtInstallerFramework/${{ env.QIF_VERSION }}/bin
|
||||||
bash deploy/build_linux.sh
|
bash deploy/build_linux.sh
|
||||||
|
|
|
||||||
|
|
@ -351,8 +351,10 @@ void VpnConnection::appendSplitTunnelingConfig()
|
||||||
sitesJsonArray.append(site);
|
sitesJsonArray.append(site);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (sitesJsonArray.isEmpty()) {
|
||||||
|
sitesRouteMode = Settings::RouteMode::VpnAllSites;
|
||||||
|
} else if (sitesRouteMode == Settings::VpnOnlyForwardSites) {
|
||||||
// Allow traffic to Amnezia DNS
|
// Allow traffic to Amnezia DNS
|
||||||
if (sitesRouteMode == Settings::VpnOnlyForwardSites) {
|
|
||||||
sitesJsonArray.append(m_vpnConfiguration.value(config_key::dns1).toString());
|
sitesJsonArray.append(m_vpnConfiguration.value(config_key::dns1).toString());
|
||||||
sitesJsonArray.append(m_vpnConfiguration.value(config_key::dns2).toString());
|
sitesJsonArray.append(m_vpnConfiguration.value(config_key::dns2).toString());
|
||||||
}
|
}
|
||||||
|
|
@ -371,6 +373,10 @@ void VpnConnection::appendSplitTunnelingConfig()
|
||||||
for (const auto &app : apps) {
|
for (const auto &app : apps) {
|
||||||
appsJsonArray.append(app.appPath.isEmpty() ? app.packageName : app.appPath);
|
appsJsonArray.append(app.appPath.isEmpty() ? app.packageName : app.appPath);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (appsJsonArray.isEmpty()) {
|
||||||
|
appsRouteMode = Settings::AppsRouteMode::VpnAllApps;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
m_vpnConfiguration.insert(config_key::appSplitTunnelType, appsRouteMode);
|
m_vpnConfiguration.insert(config_key::appSplitTunnelType, appsRouteMode);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue