[PR #444] [MERGED] Kill Switch for desktop client #1829

New issue

Closed

opened 2026-10-13 21:15:53 +00:00 by bsakaguchi · 0 comments

bsakaguchi commented

2026-10-13 21:15:53 +00:00

Owner

📋 Pull Request Information

Original PR: https://github.com/amnezia-vpn/amnezia-client/pull/444
Author: @pokamest
Created: 11/30/2023
Status: ✅ Merged
Merged: 1/29/2024
Merged by: @pokamest

Base: dev ← Head: feature/killswitch

📝 Commits (10+)

c3fdd97 Windows OpenVPN/OpenVPN+Cloak killswitch feature
d94e27b Linux killswitch
1a17f29 Fix build action
3d2174d MacOS WG/AWG killswitch
a4f3d08 Fix PF config path
a8f5e95 MacOS OpenVPN/OpenVPN over Cloak killswitch
65a0479 Merge branch 'dev' into feature/killswitch
3702d69 Merge branch 'dev' into feature/killswitch
874de74 Add exclusion for VPN Server host (MacOS/OpenVPN)
5c9d45a Use MacOS logic for LinuxFirewall

📊 Changes

31 files changed (+1294 additions, -110 deletions)

View changed files

➕ client/platforms/linux/daemon/linuxfirewall.cpp (+518 -0)
➕ client/platforms/linux/daemon/linuxfirewall.h (+107 -0)
📝 client/platforms/linux/daemon/wireguardutilslinux.cpp (+50 -0)
📝 client/platforms/linux/daemon/wireguardutilslinux.h (+4 -1)
➕ client/platforms/macos/daemon/macosfirewall.cpp (+199 -0)
➕ client/platforms/macos/daemon/macosfirewall.h (+90 -0)
📝 client/platforms/macos/daemon/wireguardutilsmacos.cpp (+50 -0)
📝 client/platforms/macos/daemon/wireguardutilsmacos.h (+2 -0)
📝 client/protocols/openvpnovercloakprotocol.cpp (+1 -1)
📝 client/protocols/openvpnprotocol.cpp (+36 -10)
📝 client/protocols/openvpnprotocol.h (+1 -0)
📝 client/protocols/wireguardprotocol.cpp (+0 -39)
📝 client/protocols/wireguardprotocol.h (+0 -9)
📝 client/ui/models/protocols/ikev2ConfigModel.cpp (+1 -1)
➕ deploy/data/macos/pf/amn.000.allowLoopback.conf (+3 -0)
➕ deploy/data/macos/pf/amn.100.blockAll.conf (+3 -0)
➕ deploy/data/macos/pf/amn.110.allowNets.conf (+2 -0)
➕ deploy/data/macos/pf/amn.120.blockNets.conf (+2 -0)
➕ deploy/data/macos/pf/amn.150.allowExcludedApps.conf (+2 -0)
➕ deploy/data/macos/pf/amn.200.allowVPN.conf (+9 -0)

...and 11 more files

📄 Description

No description provided

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/amnezia-vpn/amnezia-client/pull/444 **Author:** [@pokamest](https://github.com/pokamest) **Created:** 11/30/2023 **Status:** ✅ Merged **Merged:** 1/29/2024 **Merged by:** [@pokamest](https://github.com/pokamest) **Base:** `dev` ← **Head:** `feature/killswitch` --- ### 📝 Commits (10+) - [`c3fdd97`](https://github.com/amnezia-vpn/amnezia-client/commit/c3fdd977b1aaa5d4c803530e5d6f41ef87b93645) Windows OpenVPN/OpenVPN+Cloak killswitch feature - [`d94e27b`](https://github.com/amnezia-vpn/amnezia-client/commit/d94e27bfa9df98a9795530731ad4e0fddda1d904) Linux killswitch - [`1a17f29`](https://github.com/amnezia-vpn/amnezia-client/commit/1a17f2956a6bf7235a6136c6e36a2b4893c935f8) Fix build action - [`3d2174d`](https://github.com/amnezia-vpn/amnezia-client/commit/3d2174d84efeff3f39093d75716dd4a6af5d2c44) MacOS WG/AWG killswitch - [`a4f3d08`](https://github.com/amnezia-vpn/amnezia-client/commit/a4f3d08c029ee23df638d8187660639ca2fd89cd) Fix PF config path - [`a8f5e95`](https://github.com/amnezia-vpn/amnezia-client/commit/a8f5e95fb17710115eb2eeb0df9dfcafdd208f66) MacOS OpenVPN/OpenVPN over Cloak killswitch - [`65a0479`](https://github.com/amnezia-vpn/amnezia-client/commit/65a04799ef4d917d2e0985d021b2dc13ce188989) Merge branch 'dev' into feature/killswitch - [`3702d69`](https://github.com/amnezia-vpn/amnezia-client/commit/3702d69b9d5a7b738b133f9b93f3aeebd6e3c783) Merge branch 'dev' into feature/killswitch - [`874de74`](https://github.com/amnezia-vpn/amnezia-client/commit/874de74ac85b7f3c1e715d836327146421dd9e8e) Add exclusion for VPN Server host (MacOS/OpenVPN) - [`5c9d45a`](https://github.com/amnezia-vpn/amnezia-client/commit/5c9d45a8a83f078a23193808b114850861dcbd95) Use MacOS logic for LinuxFirewall ### 📊 Changes **31 files changed** (+1294 additions, -110 deletions) <details> <summary>View changed files</summary> ➕ `client/platforms/linux/daemon/linuxfirewall.cpp` (+518 -0) ➕ `client/platforms/linux/daemon/linuxfirewall.h` (+107 -0) 📝 `client/platforms/linux/daemon/wireguardutilslinux.cpp` (+50 -0) 📝 `client/platforms/linux/daemon/wireguardutilslinux.h` (+4 -1) ➕ `client/platforms/macos/daemon/macosfirewall.cpp` (+199 -0) ➕ `client/platforms/macos/daemon/macosfirewall.h` (+90 -0) 📝 `client/platforms/macos/daemon/wireguardutilsmacos.cpp` (+50 -0) 📝 `client/platforms/macos/daemon/wireguardutilsmacos.h` (+2 -0) 📝 `client/protocols/openvpnovercloakprotocol.cpp` (+1 -1) 📝 `client/protocols/openvpnprotocol.cpp` (+36 -10) 📝 `client/protocols/openvpnprotocol.h` (+1 -0) 📝 `client/protocols/wireguardprotocol.cpp` (+0 -39) 📝 `client/protocols/wireguardprotocol.h` (+0 -9) 📝 `client/ui/models/protocols/ikev2ConfigModel.cpp` (+1 -1) ➕ `deploy/data/macos/pf/amn.000.allowLoopback.conf` (+3 -0) ➕ `deploy/data/macos/pf/amn.100.blockAll.conf` (+3 -0) ➕ `deploy/data/macos/pf/amn.110.allowNets.conf` (+2 -0) ➕ `deploy/data/macos/pf/amn.120.blockNets.conf` (+2 -0) ➕ `deploy/data/macos/pf/amn.150.allowExcludedApps.conf` (+2 -0) ➕ `deploy/data/macos/pf/amn.200.allowVPN.conf` (+9 -0) _...and 11 more files_ </details> ### 📄 Description _No description provided_ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

bsakaguchi

2026-10-13 21:15:53 +00:00