ShockVPN/wireguard-apple
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
632 Commits 10 Branches 37 Tags
4e516d6769bd8152e9a846969a17b2a2c7b845f0
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Roopesh Chander 4e516d6769 TunnelsManager: Handle waiting on a stale tunnel 
If we have a stale tunnel on which we don't get status updates we rely
on a timer to update the status (see commit 34a7e5b).  Previously, if
the user tries to activate another tunnel, that resulted in both tunnels
waiting indefinitely. This commit fixes that.

Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-19 12:48:10 +05:30
Roopesh Chander fab7af6f38 Remove buttons and text from LaunchScreen.storyboard 
With state restoration, we're not guaranteed that the
list view will get shown immediately after the launch screen.
So, generalize the launch screen as much as possible.

Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-18 23:00:27 +05:30
Roopesh Chander 3ae9fb538d s/Observervation/Observation/g; 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-18 23:00:27 +05:30
Roopesh Chander 78eaab8b5b Tunnel detail: Update restorationIdentifier when tunnel name changes 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-18 19:27:31 +05:30
Roopesh Chander 20f8abdf04 TunnelsManager: Add periods to end the system error messages 
Because they can be part of a multi-sentence message when displayed
in the alert.

Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-18 15:47:20 +05:30
Roopesh Chander 2582ddd6f6 Error handling: Add info on the underlying system error to error alerts 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-17 19:04:17 +05:30
Roopesh Chander 2a22c0f2d6 Provide mock tunnels for the Simulator 
To help in generation of screenshots for the App Store

Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-16 01:15:10 +05:30
Roopesh Chander c4263da231 Fix tunnel remaining in 'Activating' state 
It uses to remain in 'Activating' state when we don't get a status
update notification, for example, when turning on the tunnel repeatedly
without Internet connectivity.

Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-14 17:33:56 +05:30
Roopesh Chander 1eb3fd4de0 Fix status switch weird state after an error occurs 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-14 16:50:36 +05:30
Roopesh Chander 48552d2663 NE: Communicate last error to app through a shared file 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-14 02:24:53 +05:30
Roopesh Chander 501e412b84 TunnelsManager: startActivation() need not take a tunnelConfiguration 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-14 00:40:18 +05:30
Roopesh Chander b256acc372 TunnelsManager: Remove mentions of 'internal error' 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-13 23:53:17 +05:30
Roopesh Chander 7e093575a4 TunnelsManager: Ask to check Internet connectivity in error alert 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-13 23:49:42 +05:30
Roopesh Chander 740ffd68b6 Remove unused code: InternetReachability 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-13 23:45:21 +05:30
Roopesh Chander f67e1d8fc4 TunnelsManager: Remove unused variable 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-13 23:44:13 +05:30
Roopesh Chander 33af8845b6 TunnelsManager: Remove assert 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-13 23:43:15 +05:30
Roopesh Chander 3bddab8a9e TunnelsManager: Fix race between multiple startActivation() calls 
After startActivate() is called on a waiting tunnel, user might turn
on a different tunnel before the waiting tunnel's status gets updated.
This fix prevents that from happening.

Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-13 23:34:00 +05:30
Roopesh Chander f9239dae75 TunnelsManager: Reintroduce waiting for another tunnel to deactivate 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-13 23:21:49 +05:30
Roopesh Chander bf58159d99 TunnelsManager: Report activation errors through the activationDelegate 
Don't report activation errors through completion handlers

Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-13 18:56:07 +05:30
Roopesh Chander efd4b28a0d Logging: Write versions from both app and extension 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-13 18:09:38 +05:30
Roopesh Chander ae565db371 Logging: file_log doesn't need the message type 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-13 18:06:57 +05:30
Roopesh Chander e199ed0d6c Logging: Tag the entries in the merged log 
So we know which entry is from the app and which is from the network
extension.

Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-13 18:00:32 +05:30
Roopesh Chander ba1d0c05be Logging: Use ringlogger for logging from the app 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-13 17:37:20 +05:30
Roopesh Chander 12503ae51d Logging: ringlogger.c: Trim trailing newlines 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-13 17:37:14 +05:30
Roopesh Chander ae7fb7323f Logging: Use ringlogger for logging from the extension 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-13 17:37:14 +05:30
Roopesh Chander 5ae9eec555 Avoid using 'VPN' in code where possible 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-13 12:20:10 +05:30
Roopesh Chander 6528a581de mv WireGuard/WireGuard/VPN/ WireGuard/WireGuard/Tunnel/ 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-13 12:14:21 +05:30
Roopesh Chander af78fa9a1c Zip importing: importFromFile should take a completionHandler 
Deletion of the being-imported file should be done in the
completionHandler.

Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-12 19:24:18 +05:30
Roopesh Chander 7ef12d93a7 ErrorPresenter: Support onPresented for showErrorAlert(title:,message:) 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-12 19:17:06 +05:30
Roopesh Chander 8259145f85 Zip importing: Handle spaces in filenames correctly 
Previously, if a filename of a .conf file inside the zip file
contained spaces, it was not imported.

Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-12 16:57:17 +05:30
Roopesh Chander bde984625c State restoration: Don't create duplicate mainVC and tunnelsListVC 
This creates a duplicate tunnels manager, leading to problems tracking
tunnel statuses.

To reproduce the bug that this commit fixes, you can do the following:
1. Remove all tunnels
2. Run in Xcode
3. Import zip with ~10 tunnels
4. Stop app in Xcode
5. Run in Xcode
6. Turn on 1st tunnel, after it's on, turn off
Turn on 2nd tunnel, after it's on, turn off
...
After 6-8 tunnels, the spinner doesn't show up, indicating that the
status is not being tracked.

Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-11 17:52:54 +05:30
Roopesh Chander 1ded24f0e0 TunnelsManager: Error out only on no-internet scenario 
The other scenario happens even during reloading of a tunnel for activation.

Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-11 03:48:28 +05:30
Roopesh Chander 1fd0c56f08 Remove the feature of waiting for another tunnel to deactivate 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-11 03:47:23 +05:30
Roopesh Chander e59dbe6364 TunnelsManager: Deactivate only when the status becomes 'connected' 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-11 02:42:21 +05:30
Roopesh Chander 4d63a3e9bd Allow turning off the status switch of a waiting tunnel 
It just means the waiting should be cancelled

Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-11 02:01:54 +05:30
Roopesh Chander 9946d8f989 TunnelsManager: Handle status change in TunnelsManager 
Rather than in TunnelContainer.

Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-11 02:01:49 +05:30
Roopesh Chander 15b6cf5412 Error handling: alertText() can be nil 
Indicating that no alert is to be shown for that error.

Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-11 00:34:22 +05:30
Roopesh Chander 851bd8102d TunnelsManager: Don't act on status change on tunnelProviders we don't have 
That causes errors we don't want, and duplicate notifications.

Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-10 17:03:23 +05:30
Roopesh Chander 0d7a585bf7 TunnelsManager: Always call the completion handler before returning 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-10 17:01:53 +05:30
Roopesh Chander 663bb02c68 TunnelsManager: Debugging helpers for tunnel status 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-10 16:31:36 +05:30
Roopesh Chander b491b9c371 TunnelsManager: Handle deactivation of a waiting tunnel 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-10 16:28:41 +05:30
Roopesh Chander 707f292e4e Tunnels list: Fix AutoLayout error during deletion of a tunnel 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-10 12:59:31 +05:30
Roopesh Chander aa41bd7d6c Settings: Dynamic Type support 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-10 01:45:34 +05:30
Roopesh Chander ec5be76d06 Tunnel edit: Dynamic Type support 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-10 01:45:34 +05:30
Roopesh Chander 692b0c6519 Tunnel detail: Dynamic Type support 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-10 01:45:34 +05:30
Roopesh Chander bb836b8fdc Tunnels list: Dynamic Type support for the add button at the center 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-09 18:13:37 +05:30
Roopesh Chander 8eda4641ca Tunnels list: Dynamic Type support for the table view 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-09 18:13:04 +05:30
Roopesh Chander 60e13ddbf6 Model: Declare keyLength constant and use that wherever applicable 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-09 14:07:03 +05:30
Roopesh Chander 0dcb285b67 TunnelsManager: Observe status for all tunnels in one block 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-08 18:43:24 +05:30
Roopesh Chander 6838dc3a74 TunnelsManager: Remove unused variables 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-08 15:00:26 +05:30
Roopesh Chander 46f4be6087 Zip: Fix comment 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-08 13:43:00 +05:30
Roopesh Chander aa0b288436 Zip: Increase size of buffer used to read data from the archive 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-08 02:17:55 +05:30
Roopesh Chander 71568d1899 Settings: Export log: Perform file operations in a background thread 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-08 02:17:55 +05:30
Roopesh Chander 06a783f50a On-Demand: TunnelViewModel: Make activate-on-demand methods static 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-08 02:17:23 +05:30
Roopesh Chander 465c22f769 On-Demand: Move detail text to TunnelViewModel 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-08 02:17:15 +05:30
Roopesh Chander 105eca7adc State restoration: Restore tunnel detail view 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-07 19:05:08 +05:30
Roopesh Chander e3801308cb Main VC: No need to refresh statuses if the tunnelsManager isn't initialized yet 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-07 15:52:47 +05:30
Roopesh Chander 05d0429c50 Tunnels list: Deselect rows correctly 
Do it like UITableViewController.clearsSelectionOnViewWillAppear would.

Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-07 12:36:23 +05:30
Roopesh Chander fa9a4921a8 Settings: Exporting configs as zip should open document picker 
Because:
- Exporting UI should be consistent with importing UI
- UIActivityVC takes a long time to open

Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-07 12:36:19 +05:30
Roopesh Chander c827a00307 Error handling: Use ErrorPresenter.showErrorAlert() instead of per-VC showErrorAlert() methods 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-07 12:36:19 +05:30
Roopesh Chander dcfa9473e9 Error handling: Use WireGuardAppError and WireGuardResult throughout the app 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-07 12:36:19 +05:30
Roopesh Chander 782dd2ea4e Error handling: Introduce a WireGuardResult type to handle errors in callbacks across the app 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-07 12:36:19 +05:30
Roopesh Chander c9267ba634 Error handling: Introduce a WireGuardAppError protocol to manage errors 
The alert strings shall be located next to where the errors are declared.

Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-07 12:36:19 +05:30
Roopesh Chander 8d26a3c536 Error handling: Cleanup Tunnels Manager errors 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-07 12:36:19 +05:30
Roopesh Chander 7631844fbe Error presenter: Always handle the passed error 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-07 12:36:19 +05:30
Roopesh Chander 046b540e53 Tunnel detail: Cell status switch should be toggled only after the alert presentation completes 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-07 12:36:19 +05:30
Roopesh Chander f6faffa4c1 Refactoring: Consolidate file deletion into a separate function 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-07 12:36:19 +05:30
Roopesh Chander 290bd192a0 NE: Logging: Log file should begin with version numbers and tunnel name 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-07 12:36:19 +05:30
Roopesh Chander bf86731879 NE: Logging: Make it clear which calls to wg_log use String and which use StaticString 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-04 15:58:53 +05:30
Roopesh Chander 4e386e85e4 Settings: Add timestamp to exported log 
And remove the exported log afterwards.

Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-04 14:12:53 +05:30
Roopesh Chander 046d1413ec Refactor out VPN-handling stuff from tunnels list VC to the main VC 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-03 18:51:51 +05:30
Roopesh Chander e1b258353c VPN: Error out when tunnel activation fails because there's no internet 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-03 18:51:42 +05:30
Roopesh Chander cdd132d7d0 Settings: Export log file 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-02 13:26:53 +05:30
Roopesh Chander 679d63294d NE: Write log to file 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-11-30 00:36:33 +05:30
Roopesh Chander d01d46fde8 Info.plist: Add app group id for accessing from both the app and the network extension 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-11-29 14:05:27 +05:30
Roopesh Chander a3bc306b6e Xcode: Add app groups capability 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-11-29 12:01:45 +05:30
Roopesh Chander 3e1772ccd0 It's 'WiFi', not 'Wifi' 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-11-28 12:41:35 +05:30
Roopesh Chander b946cbc0f3 NE: All DNS queries must first go through the VPN's DNS servers 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-11-23 13:04:55 +05:30
Roopesh Chander 8590a8804a Tunnel view model: Invalidate the configuration object when updating allowedIPs using the 'Exclude private IPs' switch 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-11-19 15:22:27 +05:30
Roopesh Chander a117e3ae3e Config file parser: Be case-insensitive to attribute keys in the config file 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-11-19 12:37:54 +05:30
Roopesh Chander ef2012330f Config file parser: Fix typo 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-11-17 22:52:37 +05:30
Roopesh Chander 6bb25782c1 Exporting: Export to zip in a background thread 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-11-15 13:39:56 +05:30
Roopesh Chander 1dac181803 Exporting: Refactor out zip exporting into a separate class 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-11-15 13:39:56 +05:30
Roopesh Chander d556729705 Exporting: No need to check for duplicate names - we disallow it at creation time itself 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-11-15 13:39:56 +05:30
Roopesh Chander b1ae13652c Importing: Import from zip in a background thread 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-11-15 13:39:56 +05:30
Roopesh Chander 203d6b4596 Importing: Refactor out zip importing into a separate class 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-11-14 18:52:10 +05:30
Roopesh Chander 2676ee0169 Tunnels manager: After saving after activating on-demand, reload tunnel 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-11-14 13:02:53 +05:30
Roopesh Chander c60c29b93c Tunnels manager: Need to keep VPN-on-demand tunnels's status under observation 
Because they can turn on automatically, even while the app is in the foreground.

Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-11-12 19:24:13 +05:30
Roopesh Chander bdb2411ebc Tunnel detail: Show VPN-on-demand information 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-11-12 19:24:13 +05:30
Roopesh Chander 923d039a78 Tunnels manager: Keep track of NETunnelProviderManager's isOnDemandEnabled property 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-11-12 19:24:13 +05:30
Roopesh Chander abb0312d38 Tunnel edit: Update for VPN-on-demand changes 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-11-12 19:24:13 +05:30
Roopesh Chander f1b8de7312 Tunnel view model: VPN-on-demand stuff shouldn't be part of the tunnel model 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-11-12 19:24:13 +05:30
Roopesh Chander cc122d7463 Model, Tunnels manager: Rewrite the model for VPN-on-demand 
The VPN-on-demand settings should not be part of the tunnel
configuration. Rather, the onDemandRules stored in the
tunnel provider configuration serve as the one place
where the VPN-on-demand settings are stored.

Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-11-12 19:24:13 +05:30
Roopesh Chander 39a067cb96 TunnelsManager: Support for on-demand rules 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-11-11 01:31:38 +05:30
Roopesh Chander c5e8b05e8b Tunnel edit, Tunnel view model: UI for providing On-Demand activation options 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-11-11 01:18:36 +05:30
Roopesh Chander 4b7094d652 Model: Add activationType to tunnel configuration 
We make sure existing tunnel serializations can be deserialized correctly.

We also bump up the tunnelConfigurationVersion, because the tunnel
configuration contents have changed.

Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-11-11 01:17:36 +05:30
Roopesh Chander 0f03ffc920 Model: ActivityType enum to represent VPN-on-demand options 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-11-10 19:17:24 +05:30
Roopesh Chander 1502bd42d3 Model: TunnelConfiguration: Add explicit conformance to Decodable 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-11-10 19:01:34 +05:30
Roopesh Chander 290f83d5ef Model: Ensure that a TunnelConfiguration always has a valid array of peers 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-11-10 17:02:30 +05:30
Roopesh Chander e8d68396ca VPN: When activating while another tunnel is active, deactivate the other tunnel 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-11-10 16:44:28 +05:30