summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorEmīls Piņķis <emils@mullvad.net>2022-09-21 15:26:57 +0200
committerEmīls Piņķis <emils@mullvad.net>2022-09-21 15:26:57 +0200
commit2b6debc4b7743b5baafcecebce8b633526069e55 (patch)
tree65ac6106f250f00b615ceab4d201affef77b772b
parent38dbbabc416076456ff9c80f5d5e62c573a13f0d (diff)
parent00da6a3a23f317bc0a2487d47f7f8dff59853cb8 (diff)
downloadmullvadvpn-2b6debc4b7743b5baafcecebce8b633526069e55.tar.xz
mullvadvpn-2b6debc4b7743b5baafcecebce8b633526069e55.zip
Merge branch 'macos-stop-late-leak'
-rw-r--r--CHANGELOG.md8
-rw-r--r--mullvad-daemon/src/shutdown.rs2
2 files changed, 7 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b1ed1e7d4b..93597ae2df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -74,14 +74,16 @@ Line wrap the file at 100 chars. Th
- Don't fail install if the device tree contains nameless callout driver devices.
### Security
-- Added traffic blocking during early boot, before the daemon starts, to prevent leaks in the case
- that the system service starts after a networking daemon has already configured a network
- interface.
- When the system process is being shut down and the target state is _secured_, maintain the
blocking firewall rules unless it's possible to deduce that the system isn't shutting down and the
system service is being stopped by the user intentionally. This is to prevent leaks that might
occur during system shutdown.
+#### Linux
+- Added traffic blocking during early boot, before the daemon starts, to prevent leaks in the case
+ that the system service starts after a networking daemon has already configured a network
+ interface.
+
## [android/2022.2-beta2] - 2022-09-09
### Changed
diff --git a/mullvad-daemon/src/shutdown.rs b/mullvad-daemon/src/shutdown.rs
index a3f04a0c49..920648ffe4 100644
--- a/mullvad-daemon/src/shutdown.rs
+++ b/mullvad-daemon/src/shutdown.rs
@@ -47,6 +47,8 @@ pub fn is_shutdown_user_initiated() -> bool {
}
}
+/// Currently returns false all of the time to ensure that no leaks occur during shutdown.
+// TODO: implement shutdown detection
#[cfg(target_os = "macos")]
pub fn is_shutdown_user_initiated() -> bool {
false