Commit remaining Burrow platform work

tun/tests/configure.rs

@@ -3,17 +3,33 @@ use std::{io::Error, net::Ipv4Addr};
 use fehler::throws;
 use tun::TunInterface;
 
+fn open_tun() -> Result<Option<TunInterface>, Error> {
+    match TunInterface::new() {
+        Ok(tun) => Ok(Some(tun)),
+        Err(err)
+            if err.kind() == std::io::ErrorKind::PermissionDenied
+                || matches!(err.raw_os_error(), Some(1 | 13)) =>
+        {
+            eprintln!("skipping tun test without tunnel privileges: {err}");
+            Ok(None)
+        }
+        Err(err) => Err(err),
+    }
+}
+
 #[test]
 #[throws]
 fn test_create() {
-    TunInterface::new()?;
+    let _ = open_tun()?;
 }
 
 #[test]
 #[throws]
 #[cfg(not(any(target_os = "windows", target_vendor = "apple")))]
 fn test_set_get_broadcast_addr() {
-    let tun = TunInterface::new()?;
+    let Some(tun) = open_tun()? else {
+        return Ok(());
+    };
     let addr = Ipv4Addr::new(10, 0, 0, 1);
     tun.set_ipv4_addr(addr)?;
 
@@ -28,7 +44,9 @@ fn test_set_get_broadcast_addr() {
 #[throws]
 #[cfg(not(target_os = "windows"))]
 fn test_set_get_ipv4() {
-    let tun = TunInterface::new()?;
+    let Some(tun) = open_tun()? else {
+        return Ok(());
+    };
 
     let addr = Ipv4Addr::new(10, 0, 0, 1);
     tun.set_ipv4_addr(addr)?;
@@ -43,7 +61,9 @@ fn test_set_get_ipv4() {
 fn test_set_get_ipv6() {
     use std::net::Ipv6Addr;
 
-    let tun = TunInterface::new()?;
+    let Some(tun) = open_tun()? else {
+        return Ok(());
+    };
 
     let addr = Ipv6Addr::new(1, 1, 1, 1, 1, 1, 1, 1);
     tun.add_ipv6_addr(addr, 128)?;
@@ -56,7 +76,9 @@ fn test_set_get_ipv6() {
 #[throws]
 #[cfg(not(target_os = "windows"))]
 fn test_set_get_mtu() {
-    let interf = TunInterface::new()?;
+    let Some(interf) = open_tun()? else {
+        return Ok(());
+    };
 
     interf.set_mtu(500)?;
 
@@ -67,7 +89,9 @@ fn test_set_get_mtu() {
 #[throws]
 #[cfg(not(target_os = "windows"))]
 fn test_set_get_netmask() {
-    let interf = TunInterface::new()?;
+    let Some(interf) = open_tun()? else {
+        return Ok(());
+    };
 
     let netmask = Ipv4Addr::new(255, 0, 0, 0);
     let addr = Ipv4Addr::new(192, 168, 1, 1);

tun/tests/tokio.rs

@@ -1,10 +1,27 @@
 #[cfg(all(feature = "tokio", not(target_os = "windows")))]
 use std::net::Ipv4Addr;
 
+#[cfg(all(feature = "tokio", not(target_os = "windows")))]
+fn open_tun() -> Option<tun::TunInterface> {
+    match tun::TunInterface::new() {
+        Ok(tun) => Some(tun),
+        Err(err)
+            if err.kind() == std::io::ErrorKind::PermissionDenied
+                || matches!(err.raw_os_error(), Some(1 | 13)) =>
+        {
+            eprintln!("skipping tokio tun test without tunnel privileges: {err}");
+            None
+        }
+        Err(err) => panic!("failed to create tun interface: {err}"),
+    }
+}
+
 #[tokio::test]
 #[cfg(all(feature = "tokio", not(target_os = "windows")))]
 async fn test_create() {
-    let tun = tun::TunInterface::new().unwrap();
+    let Some(tun) = open_tun() else {
+        return;
+    };
     let _ = tun::tokio::TunInterface::new(tun).unwrap();
 }
 
@@ -12,7 +29,9 @@ async fn test_create() {
 #[ignore = "requires interactivity"]
 #[cfg(all(feature = "tokio", not(target_os = "windows")))]
 async fn test_write() {
-    let tun = tun::TunInterface::new().unwrap();
+    let Some(tun) = open_tun() else {
+        return;
+    };
     tun.set_ipv4_addr(Ipv4Addr::from([192, 168, 1, 10]))
         .unwrap();
     let async_tun = tun::tokio::TunInterface::new(tun).unwrap();