Merge branch 'macos-add-split-tunnel-error-info'

mullvad · May 29, 2024 · 596286d · 596286d
2 parents 2b04fed + 6289b4c
commit 596286d
Show file tree

Hide file tree

Showing 12 changed files with 218 additions and 57 deletions.
diff --git a/gui/locales/messages.pot b/gui/locales/messages.pot
@@ -1086,6 +1086,10 @@ msgctxt "notifications"
 msgid "Disconnected and unsecure"
 msgstr ""
 
+msgctxt "notifications"
+msgid "Failed to enable split tunneling. Please try again or disable it."
+msgstr ""
+
 msgctxt "notifications"
 msgid "Lockdown mode active, connection blocked"
 msgstr ""

diff --git a/gui/src/main/daemon-rpc.ts b/gui/src/main/daemon-rpc.ts
@@ -1046,6 +1046,12 @@ function convertFromTunnelStateError(state: grpcTypes.ErrorState.AsObject): Erro
         ...baseError,
         cause: ErrorStateCause.splitTunnelError,
       };
+    case grpcTypes.ErrorState.Cause.NEED_FULL_DISK_PERMISSIONS:
+      // TODO: handle correctly
+      return {
+        ...baseError,
+        cause: ErrorStateCause.splitTunnelError,
+      };
     case grpcTypes.ErrorState.Cause.VPN_PERMISSION_DENIED:
       // VPN_PERMISSION_DENIED is only ever created on Android
       throw invalidErrorStateCause;

diff --git a/gui/src/shared/notifications/error.ts b/gui/src/shared/notifications/error.ts
@@ -183,10 +183,18 @@ function getMessage(errorState: ErrorState): string {
           'Your device is offline. The tunnel will automatically connect once your device is back online.',
         );
       case ErrorStateCause.splitTunnelError:
-        return messages.pgettext(
-          'notifications',
-          'Unable to communicate with Mullvad kernel driver. Try reconnecting or send a problem report.',
-        );
+        switch (process.platform ?? window.env.platform) {
+          case 'darwin':
+            return messages.pgettext(
+              'notifications',
+              'Failed to enable split tunneling. Please try again or disable it.',
+            );
+          default:
+            return messages.pgettext(
+              'notifications',
+              'Unable to communicate with Mullvad kernel driver. Try reconnecting or send a problem report.',
+            );
+        }
     }
   }
 }
@@ -265,6 +273,7 @@ function getActions(errorState: ErrorState): InAppNotificationAction | void {
       },
     };
   } else if (errorState.cause === ErrorStateCause.splitTunnelError) {
+    // TODO: macos: handle this and full disk access error
     return {
       type: 'troubleshoot-dialog',
       troubleshoot: {

diff --git a/mullvad-management-interface/proto/management_interface.proto b/mullvad-management-interface/proto/management_interface.proto
@@ -142,6 +142,7 @@ message ErrorState {
     IS_OFFLINE = 7;
     VPN_PERMISSION_DENIED = 8;
     SPLIT_TUNNEL_ERROR = 9;
+    NEED_FULL_DISK_PERMISSIONS = 10;
   }
 
   enum AuthFailedError {

diff --git a/mullvad-management-interface/src/types/conversions/states.rs b/mullvad-management-interface/src/types/conversions/states.rs
@@ -107,6 +107,10 @@ impl From<mullvad_types::states::TunnelState> for proto::TunnelState {
                             talpid_tunnel::ErrorStateCause::SplitTunnelError => {
                                 i32::from(Cause::SplitTunnelError)
                             }
+                            #[cfg(target_os = "macos")]
+                            talpid_tunnel::ErrorStateCause::NeedFullDiskPermissions => {
+                                i32::from(Cause::NeedFullDiskPermissions)
+                            }
                         },
                         blocking_error: error_state.block_failure().map(map_firewall_error),
                         auth_failed_error: mullvad_types::auth_failed::AuthFailed::try_from(
@@ -325,10 +329,14 @@ impl TryFrom<proto::TunnelState> for mullvad_types::states::TunnelState {
                     Ok(proto::error_state::Cause::VpnPermissionDenied) => {
                         talpid_tunnel::ErrorStateCause::VpnPermissionDenied
                     }
-                    #[cfg(target_os = "windows")]
+                    #[cfg(any(target_os = "windows", target_os = "macos"))]
                     Ok(proto::error_state::Cause::SplitTunnelError) => {
                         talpid_tunnel::ErrorStateCause::SplitTunnelError
                     }
+                    #[cfg(target_os = "macos")]
+                    Ok(proto::error_state::Cause::NeedFullDiskPermissions) => {
+                        talpid_tunnel::ErrorStateCause::NeedFullDiskPermissions
+                    }
                     _ => {
                         return Err(FromProtobufTypeError::InvalidArgument(
                             "invalid error cause",