[PR #1327] [MERGED] Add allowed DNS list for killswitch #2315

Closed
opened 2026-10-13 21:20:50 +00:00 by bsakaguchi · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/amnezia-vpn/amnezia-client/pull/1327
Author: @outspace
Created: 12/29/2024
Status: ✅ Merged
Merged: 3/13/2025
Merged by: @outspace

Base: feature/killswitch-strict-mode ← Head: feature/allowed-dns-list


📝 Commits (8)

  • f527216 Add allowed DNS list for killswitch
  • d371d49 Merge branch 'dev' into feature/allowed-dns-list
  • 8e6de2d Merge branch 'dev' into feature/allowed-dns-list
  • bb883b4 Merge branch 'feature/killswitch-strict-mode' into feature/allowed-dns-list
  • 0466e71 Implement model, controller and UI for killswitch dns exceptions
  • cafac3a Connect backend part and UI
  • 92b0ea6 Change label text to DNS exceptions
  • a67e4ab Remove HeaderType from PageSettingsApiDevices

📊 Changes

22 files changed (+721 additions, -5 deletions)

View changed files

📝 client/core/controllers/coreController.cpp (+6 -0)
📝 client/core/controllers/coreController.h (+4 -0)
📝 client/daemon/daemon.cpp (+3 -0)
📝 client/daemon/interfaceconfig.cpp (+7 -0)
📝 client/daemon/interfaceconfig.h (+1 -0)
📝 client/mozilla/localsocketcontroller.cpp (+3 -0)
📝 client/platforms/windows/daemon/windowsfirewall.cpp (+8 -0)
📝 client/protocols/protocols_defs.h (+2 -0)
📝 client/resources.qrc (+2 -0)
📝 client/settings.cpp (+10 -0)
📝 client/settings.h (+3 -0)
➕ client/ui/controllers/allowedDnsController.cpp (+101 -0)
➕ client/ui/controllers/allowedDnsController.h (+35 -0)
📝 client/ui/controllers/pageController.h (+2 -1)
➕ client/ui/models/allowed_dns_model.cpp (+86 -0)
➕ client/ui/models/allowed_dns_model.h (+37 -0)
➕ client/ui/qml/Components/AddSitePanel.qml (+73 -0)
📝 client/ui/qml/Pages2/PageSettingsApiDevices.qml (+1 -1)
📝 client/ui/qml/Pages2/PageSettingsKillSwitch.qml (+15 -1)
➕ client/ui/qml/Pages2/PageSettingsKillSwitchExceptions.qml (+296 -0)

...and 2 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/1327 **Author:** [@outspace](https://github.com/outspace) **Created:** 12/29/2024 **Status:** ✅ Merged **Merged:** 3/13/2025 **Merged by:** [@outspace](https://github.com/outspace) **Base:** `feature/killswitch-strict-mode` ← **Head:** `feature/allowed-dns-list` --- ### 📝 Commits (8) - [`f527216`](https://github.com/amnezia-vpn/amnezia-client/commit/f5272168bc36c9c12e03a8dfb06458c340653db9) Add allowed DNS list for killswitch - [`d371d49`](https://github.com/amnezia-vpn/amnezia-client/commit/d371d495a9fd380afd6b279b31bebb2692f96be4) Merge branch 'dev' into feature/allowed-dns-list - [`8e6de2d`](https://github.com/amnezia-vpn/amnezia-client/commit/8e6de2dc34db6dd34ab8d8b985c22de7ff5335e4) Merge branch 'dev' into feature/allowed-dns-list - [`bb883b4`](https://github.com/amnezia-vpn/amnezia-client/commit/bb883b488049575247cb617dc91397f426c71970) Merge branch 'feature/killswitch-strict-mode' into feature/allowed-dns-list - [`0466e71`](https://github.com/amnezia-vpn/amnezia-client/commit/0466e71d49fcd47d8429b826e81b6873b1b734d8) Implement model, controller and UI for killswitch dns exceptions - [`cafac3a`](https://github.com/amnezia-vpn/amnezia-client/commit/cafac3aa6103e240e9bc84f4ad44c13ede7eb5f3) Connect backend part and UI - [`92b0ea6`](https://github.com/amnezia-vpn/amnezia-client/commit/92b0ea6213e4c3427ddbef1a3ed5f338b98d2fbb) Change label text to DNS exceptions - [`a67e4ab`](https://github.com/amnezia-vpn/amnezia-client/commit/a67e4ab8bb7fb4a9bd65abb6c2554fa5c354b53b) Remove HeaderType from PageSettingsApiDevices ### 📊 Changes **22 files changed** (+721 additions, -5 deletions) <details> <summary>View changed files</summary> 📝 `client/core/controllers/coreController.cpp` (+6 -0) 📝 `client/core/controllers/coreController.h` (+4 -0) 📝 `client/daemon/daemon.cpp` (+3 -0) 📝 `client/daemon/interfaceconfig.cpp` (+7 -0) 📝 `client/daemon/interfaceconfig.h` (+1 -0) 📝 `client/mozilla/localsocketcontroller.cpp` (+3 -0) 📝 `client/platforms/windows/daemon/windowsfirewall.cpp` (+8 -0) 📝 `client/protocols/protocols_defs.h` (+2 -0) 📝 `client/resources.qrc` (+2 -0) 📝 `client/settings.cpp` (+10 -0) 📝 `client/settings.h` (+3 -0) ➕ `client/ui/controllers/allowedDnsController.cpp` (+101 -0) ➕ `client/ui/controllers/allowedDnsController.h` (+35 -0) 📝 `client/ui/controllers/pageController.h` (+2 -1) ➕ `client/ui/models/allowed_dns_model.cpp` (+86 -0) ➕ `client/ui/models/allowed_dns_model.h` (+37 -0) ➕ `client/ui/qml/Components/AddSitePanel.qml` (+73 -0) 📝 `client/ui/qml/Pages2/PageSettingsApiDevices.qml` (+1 -1) 📝 `client/ui/qml/Pages2/PageSettingsKillSwitch.qml` (+15 -1) ➕ `client/ui/qml/Pages2/PageSettingsKillSwitchExceptions.qml` (+296 -0) _...and 2 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:20:50 +00:00
Sign in to join this conversation.
No labels
pull-request
No milestone
No project
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
amnezia-vpn/amnezia-client#2315
No description provided.