feat: generic VPN support with rich enumeration and UUID-based activation

nmrs/CHANGELOG.md

@@ -13,8 +13,10 @@ All notable changes to the `nmrs` crate will be documented in this file.
 - `WifiInterfaceNotFound` and `NotAWifiDevice` error variants
 - Saved profile enumeration: `SavedConnection`, `SavedConnectionBrief`, `SettingsSummary`, `SettingsPatch`, `WifiSecuritySummary`, `WifiKeyMgmt`, `VpnSecretFlags`; `list_saved_connections()`, `list_saved_connections_brief()`, `list_saved_connection_ids()`, `get_saved_connection()`, `get_saved_connection_raw()`, `delete_saved_connection()`, `update_saved_connection()`, `reload_saved_connections()`; D-Bus proxies `NMSettingsProxy` / `NMSettingsConnectionProxy`; example `saved_list`
 - Connectivity state surface: `ConnectivityState`, `ConnectivityReport`, `connectivity()`, `check_connectivity()`, `connectivity_report()`, `captive_portal_url()`; `ConnectivityCheckDisabled` error variant
+- Generic VPN support: `VpnType` now carries protocol-specific metadata for OpenVPN, OpenConnect, strongSwan, PPTP, L2TP, and a `Generic` catch-all; `VpnKind` (Plugin vs WireGuard); `VpnConnection` enriched with `uuid`, `active`, `user_name`, `password_flags`, `service_type`; `connect_vpn_by_uuid()`, `connect_vpn_by_id()`, `disconnect_vpn_by_uuid()`, `active_vpn_connections()`
 
 ### Changed
+- `VpnType` is now a data-carrying enum; the old tag enum is renamed to `VpnKind`. `VpnConfig::vpn_type()` renamed to `vpn_kind()`. `VpnConnectionInfo.vpn_type` renamed to `vpn_kind`.
 -`list_saved_connections()` now returns `Vec<SavedConnection>` (full decode + summaries). Use `list_saved_connection_ids()` for the previous `Vec<String>` behavior (connection `id` names only).
 -`connect`, `connect_to_bssid`, `disconnect`, `scan_networks`, and `list_networks` now take an `interface: Option<&str>` parameter. Pass `None` to preserve previous behavior, or `Some("wlan1")` to scope to a specific Wi-Fi interface. For an ergonomic per-interface API, use `nm.wifi("wlan1")` to obtain a `WifiScope`.
 -`set_wifi_enabled` now requires an `interface: &str` argument and toggles only that radio (via `Device.Autoconnect` + `Device.Disconnect()`). For the global wireless killswitch use `set_wireless_enabled(bool)`.

nmrs/Cargo.toml

@@ -67,3 +67,7 @@ path = "examples/saved_list.rs"
 [[example]]
 name = "connectivity"
 path = "examples/connectivity.rs"
+
+[[example]]
+name = "vpn_list"
+path = "examples/vpn_list.rs"

nmrs/README.md

@@ -13,7 +13,7 @@ Rust bindings for NetworkManager via D-Bus.
 ## Features
 
 - **WiFi Management**: Connect to WPA-PSK, WPA-EAP, and open networks
-- **VPN Support**: WireGuard VPN connections with full configuration
+- **VPN Support**: WireGuard, OpenVPN, OpenConnect, strongSwan, PPTP, L2TP, and generic plugin VPNs with rich enumeration and UUID-based activation
 - **Ethernet**: Wired network connection management
 - **Network Discovery**: Scan and list available access points with per-BSSID detail and security capabilities
 - **Per-Interface Scoping**: Target specific Wi-Fi radios on multi-NIC systems via `nm.wifi("wlan1")` or `Option<&str>` interface arguments

nmrs/examples/vpn_list.rs

@@ -0,0 +1,45 @@
+use nmrs::NetworkManager;
+
+#[tokio::main]
+async fn main() -> nmrs::Result<()> {
+    let nm = NetworkManager::new().await?;
+    let vpns = nm.list_vpn_connections().await?;
+
+    println!(
+        "{:<20} {:<38} {:<16} {:<12} active",
+        "id", "uuid", "type", "user"
+    );
+    println!("{}", "-".repeat(90));
+
+    for vpn in &vpns {
+        let type_label = match &vpn.vpn_type {
+            nmrs::VpnType::WireGuard { .. } => "wireguard".to_string(),
+            nmrs::VpnType::OpenVpn {
+                connection_type, ..
+            } => {
+                format!(
+                    "openvpn/{}",
+                    connection_type
+                        .map(|ct| format!("{ct:?}"))
+                        .unwrap_or_default()
+                )
+            }
+            nmrs::VpnType::OpenConnect { .. } => "openconnect".to_string(),
+            nmrs::VpnType::StrongSwan { .. } => "strongswan".to_string(),
+            nmrs::VpnType::Pptp { .. } => "pptp".to_string(),
+            nmrs::VpnType::L2tp { .. } => "l2tp".to_string(),
+            nmrs::VpnType::Generic { service_type, .. } => service_type.clone(),
+            _ => "(unknown)".to_string(),
+        };
+
+        let user = vpn.user_name.as_deref().unwrap_or("(n/a)");
+        let active_icon = if vpn.active { "●" } else { "○" };
+
+        println!(
+            "{:<20} {:<38} {:<16} {:<12} {}",
+            vpn.id, vpn.uuid, type_label, user, active_icon
+        );
+    }
+
+    Ok(())
+}

nmrs/src/api/builders/mod.rs

@@ -20,7 +20,7 @@
 //!
 //! ```ignore
 //! use nmrs::builders::{build_wifi_connection, build_wireguard_connection, build_ethernet_connection};
-//! use nmrs::{WifiSecurity, ConnectionOptions, VpnCredentials, VpnType, WireGuardPeer};
+//! use nmrs::{WifiSecurity, ConnectionOptions, VpnCredentials, VpnKind, WireGuardPeer};
 //!
 //! let opts = ConnectionOptions {
 //!     autoconnect: true,
@@ -45,7 +45,7 @@
 //! };
 //!
 //! let creds = VpnCredentials {
-//!     vpn_type: VpnType::WireGuard,
+//!     vpn_type: VpnKind::WireGuard,
 //!     name: "MyVPN".into(),
 //!     gateway: "vpn.example.com:51820".into(),
 //!     private_key: "YBk6X3pP8KjKz7+HFWzVHNqL3qTZq8hX9VxFQJ4zVmM=".into(),

nmrs/src/api/builders/vpn.rs

@@ -41,7 +41,7 @@
 //!
 //! ```rust
 //! use nmrs::builders::build_wireguard_connection;
-//! use nmrs::{VpnCredentials, VpnType, WireGuardPeer, ConnectionOptions};
+//! use nmrs::{VpnCredentials, VpnKind, WireGuardPeer, ConnectionOptions};
 //!
 //! let peer = WireGuardPeer::new(
 //!     "HIgo9xNzJMWLKAShlKl6/bUT1VI9Q0SDBXGtLXkPFXc=",
@@ -50,7 +50,7 @@
 //! ).with_persistent_keepalive(25);
 //!
 //! let creds = VpnCredentials::new(
-//!     VpnType::WireGuard,
+//!     VpnKind::WireGuard,
 //!     "MyVPN",
 //!     "vpn.example.com:51820",
 //!     "YBk6X3pP8KjKz7+HFWzVHNqL3qTZq8hX9VxFQJ4zVmM=",
@@ -398,7 +398,7 @@ pub fn build_openvpn_connection(
 mod tests {
     use super::*;
     use crate::api::models::{
-        OpenVpnCompression, OpenVpnConfig, OpenVpnProxy, VpnType, WireGuardPeer,
+        OpenVpnCompression, OpenVpnConfig, OpenVpnProxy, VpnKind, WireGuardPeer,
     };
 
     fn create_test_credentials() -> VpnCredentials {
@@ -410,7 +410,7 @@ mod tests {
         .with_persistent_keepalive(25);
 
         VpnCredentials::new(
-            VpnType::WireGuard,
+            VpnKind::WireGuard,
             "TestVPN",
             "vpn.example.com:51820",
             "YBk6X3pP8KjKz7+HFWzVHNqL3qTZq8hX9VxFQJ4zVmM=",

nmrs/src/api/models/error.rs

@@ -146,6 +146,14 @@ pub enum ConnectionError {
     #[error("no VPN connection found")]
     NoVpnConnection,
 
+    /// VPN connection not found by UUID or name.
+    #[error("VPN connection '{0}' not found")]
+    VpnNotFound(String),
+
+    /// Multiple VPN connections share the same display name.
+    #[error("multiple VPN connections named '{0}', use UUID")]
+    VpnIdAmbiguous(String),
+
     /// Invalid IP address or CIDR notation
     #[error("invalid address: {0}")]
     InvalidAddress(String),

nmrs/src/api/models/openvpn.rs

@@ -1,6 +1,6 @@
 #![allow(deprecated)]
 
-use super::vpn::{VpnConfig, VpnType};
+use super::vpn::{VpnConfig, VpnKind};
 use crate::api::models::error::ConnectionError;
 use std::convert::TryFrom;
 use std::net::Ipv4Addr;
@@ -612,8 +612,8 @@ impl TryFrom<crate::core::ovpn_parser::parser::OvpnFile> for OpenVpnConfig {
 impl super::vpn::sealed::Sealed for OpenVpnConfig {}
 
 impl VpnConfig for OpenVpnConfig {
-    fn vpn_type(&self) -> VpnType {
-        VpnType::OpenVpn
+    fn vpn_kind(&self) -> VpnKind {
+        VpnKind::Plugin
     }
 
     fn name(&self) -> &str {

nmrs/src/api/models/tests.rs

@@ -607,7 +607,7 @@ fn test_vpn_credentials_builder_basic() {
         .build();
 
     assert_eq!(creds.name, "TestVPN");
-    assert_eq!(creds.vpn_type, VpnType::WireGuard);
+    assert_eq!(creds.vpn_type, VpnKind::WireGuard);
     assert_eq!(creds.gateway, "vpn.example.com:51820");
     assert_eq!(
         creds.private_key,
@@ -667,7 +667,7 @@ fn test_wireguard_config_implements_vpn_config() {
 
     let vpn_config: &dyn VpnConfig = &config;
 
-    assert_eq!(vpn_config.vpn_type(), VpnType::WireGuard);
+    assert_eq!(vpn_config.vpn_kind(), VpnKind::WireGuard);
     assert_eq!(vpn_config.name(), "TestVPN");
     assert_eq!(
         vpn_config.dns(),
@@ -942,7 +942,7 @@ fn test_vpn_credentials_builder_equivalence_to_new() {
     );
 
     let creds_new = VpnCredentials::new(
-        VpnType::WireGuard,
+        VpnKind::WireGuard,
         "TestVPN",
         "vpn.example.com:51820",
         "private_key",