Merge pull request #185 from jamesmcm/vopono102

vopono 0.10.2
jamesmcm · Aug 21, 2022 · d41fcbe · d41fcbe
2 parents a5baaa2 + fa4e6ce
commit d41fcbe
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 8 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "vopono"
 description = "Launch applications via VPN tunnels using temporary network namespaces"
-version = "0.10.1"
+version = "0.10.2"
 authors = ["James McMurray <jamesmcm03@gmail.com>"]
 edition = "2021"
 license = "GPL-3.0-or-later"
@@ -26,7 +26,7 @@ signal-hook = "0.3"
 walkdir = "2"
 chrono = "0.4"
 bs58 = "0.4"
-nix = "0.24"
+nix = "0.25"
 config = "0.13"
 basic_tcp_proxy = "0.3"
 strum = "0.24"

diff --git a/README.md b/README.md
@@ -28,7 +28,7 @@ lynx all running through different VPN connections:
 | Mullvad               | ✅              | ✅                |
 | AzireVPN              | ✅              | ✅                |
 | iVPN                  | ✅              | ✅                |
-| PrivateInternetAccess | ✅              | ❌                |
+| PrivateInternetAccess | ✅              | ✅                |
 | TigerVPN              | ✅              | ❌                |
 | ProtonVPN             | ✅              | ❌                |
 | MozillaVPN            | ❌              | ✅                |

diff --git a/USERGUIDE.md b/USERGUIDE.md
@@ -445,6 +445,14 @@ via AzireVPN though (Wireguard works correctly).
 
 ### VPN Provider limitations
 
+#### PrivateInternetAccess
+
+Wireguard support for PrivateInternetAccess (PIA) requires the use of a
+user token to get the latest servers at time of use. See [issue 9](https://github.com/jamesmcm/vopono/issues/9) for details,
+and PIA's [official script for Wireguard access](https://github.com/pia-foss/manual-connections/blob/master/connect_to_wireguard_with_token.sh).
+
+So if you encounter connection issues, first try re-running `vopono sync`.
+
 #### MozillaVPN
 
 There is no easy way to delete MozillaVPN devices (Wireguard keypairs),

diff --git a/vopono_core/Cargo.toml b/vopono_core/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "vopono_core"
 description = "Library code for running VPN connections in network namespaces"
-version = "0.1.1"
+version = "0.1.2"
 edition = "2021"
 authors = ["James McMurray <jamesmcm03@gmail.com>"]
 license = "GPL-3.0-or-later"
@@ -16,11 +16,11 @@ directories-next = "2"
 log = "0.4"
 which = "4"
 users = "0.11"
-nix = "0.24"
+nix = "0.25"
 serde = { version = "1", features = ["derive", "std"] }
 csv = "1"
 regex = "1"
-ron = "0.7"
+ron = "0.8"
 walkdir = "2"
 # Must use rand 0.7 for compatibility with x25519-dalek for now
 rand = "0.7"
@@ -31,7 +31,7 @@ reqwest = { default-features = false, version = "0.11", features = [
     "json",
     "rustls-tls",
 ] } # TODO: Can we remove Tokio dependency?
-sysinfo = "0.24"
+sysinfo = "0.25"
 base64 = "0.13"
 x25519-dalek = "1"
 strum = "0.24"

diff --git a/vopono_core/src/config/providers/mullvad/wireguard.rs b/vopono_core/src/config/providers/mullvad/wireguard.rs
@@ -45,7 +45,7 @@ impl WireguardProvider for Mullvad {
         let relays: Vec<WireguardRelay> = client
             .get("https://api.mullvad.net/www/relays/wireguard/")
             .send()?
-            .json()?;
+            .json().with_context(|| "Failed to parse Mullvad relays response - try again after a few minutes or report an issue if it is persistent")?;
 
         let username = self.request_mullvad_username(uiclient)?;
         let auth: AuthToken = client