Merge branch 'windows-st-fix-removable-drive-issue'

3 files changed, 15 insertions, 9 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b8d1ad2b40..c6cccd59c0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -48,6 +48,7 @@ Line wrap the file at 100 chars.                                              Th
   monitor may have falsely reported the machine to be online due to a race condition.
 - Recover firewall state correctly when restarting the service after a crash. This would fail when
   paths were excluded.
+- Fix daemon not starting when a path is excluded on a drive that has since been removed.
 
 
 ## [2021.4] - 2021-06-30
diff --git a/talpid-core/src/split_tunnel/windows/driver.rs b/talpid-core/src/split_tunnel/windows/driver.rs
index feb60dbc88..7f097f9e54 100644
--- a/talpid-core/src/split_tunnel/windows/driver.rs
+++ b/talpid-core/src/split_tunnel/windows/driver.rs
@@ -19,6 +19,7 @@ use std::{
     ptr,
     time::Duration,
 };
+use talpid_types::ErrorExt;
 use winapi::{
     shared::{
         in6addr::IN6_ADDR,
@@ -265,7 +266,18 @@ impl DeviceHandle {
     pub fn set_config<T: AsRef<OsStr>>(&self, apps: &[T]) -> io::Result<()> {
         let mut device_paths = Vec::with_capacity(apps.len());
         for app in apps.as_ref() {
-            device_paths.push(get_device_path(app.as_ref())?);
+            match get_device_path(app.as_ref()) {
+                Err(error) if error.kind() == io::ErrorKind::NotFound => {
+                    log::warn!(
+                        "{}\nPath: {}",
+                        error
+                            .display_chain_with_msg("Skipping path with non-existent drive letter"),
+                        app.as_ref().to_string_lossy()
+                    );
+                }
+                Err(error) => return Err(error),
+                Ok(path) => device_paths.push(path),
+            }
         }
 
         log::debug!("Excluded device paths:");
diff --git a/talpid-core/src/split_tunnel/windows/windows.rs b/talpid-core/src/split_tunnel/windows/windows.rs
index b706a73203..3163244c5f 100644
--- a/talpid-core/src/split_tunnel/windows/windows.rs
+++ b/talpid-core/src/split_tunnel/windows/windows.rs
@@ -107,20 +107,13 @@ impl Iterator for ProcessSnapshotEntries<'_> {
 
 /// Obtains a device path without resolving links or mount points.
 pub fn get_device_path<T: AsRef<Path>>(path: T) -> Result<OsString, io::Error> {
-    if !path.as_ref().is_absolute() {
-        return Err(io::Error::new(
-            io::ErrorKind::InvalidInput,
-            "path must be absolute",
-        ));
-    }
-
     let drive_comp = path.as_ref().components().next();
     let drive = match drive_comp {
         Some(std::path::Component::Prefix(prefix)) => prefix.as_os_str(),
         _ => {
             return Err(io::Error::new(
                 io::ErrorKind::InvalidInput,
-                "invalid drive label",
+                "path must be absolute",
             ))
         }
     };