passepartoutvpn
/
wireguard-apple
mirror of https://github.com/passepartoutvpn/wireguard-apple.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
705 Commits 9 Branches 42 Tags 6.1 MiB
Commit Graph

602 Commits

Author SHA1 Message Date
Jason A. Donenfeld ec031b1f19 Get rid of superflous isActivateOnDemandEnabled key 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-12-21 18:50:32 +01:00
Eric Kuck 8553723e04 Updated NETunnelProvider save format 
Signed-off-by: Eric Kuck <eric@bluelinelabs.com>
 2018-12-21 16:42:16 +01:00
Jason A. Donenfeld 38445114e0 NE: simplify logic 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-12-21 15:56:03 +01:00
Roopesh Chander a21c569e9f NE: Simplify DNS resolution 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-21 19:24:22 +05:30
Roopesh Chander 0552d75aa1 Localize all the things 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-21 18:34:09 +05:30
Roopesh Chander e47a8232d8 Tunnel detail: iPad: Handle deletion of tunnel correctly 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-21 18:02:18 +05:30
Roopesh Chander f818cdd963 NE: Update listen port only when first interface changes 
When handling network path changes, change the listen port
only when the first interface has changed.

Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-21 17:32:44 +05:30
Roopesh Chander 28ce4d5164 NE: Change handling of bad domain names and Activate On Demand 
The solution implemented in commit b8c331c causes the tunnel to
remain in 'Activating' state, without the ability to cancel that.

So, in this commit, instead of retrying DNS silently on
Activated-On-Demand tunnels, we fail the startTunnel() silently.

To summarize, if activate-on-demand is on:
- If started from the WireGuard app, show error using lastErrorFile
mechanism, suggesting a way to turn off Activate On Demand
- If not started from WireGuard app, don't call displayMessage()
(don't show error to user) and silently fail starting the tunnel

Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-21 15:52:47 +05:30
Eric Kuck c2131cb757 Added missing param in MockTunnels 
Signed-off-by: Eric Kuck <eric@bluelinelabs.com>
 2018-12-20 13:51:44 -06:00
Eric Kuck a89ad95901 Enabled more swiftlint rules 
Signed-off-by: Eric Kuck <eric@bluelinelabs.com>
 2018-12-20 11:22:37 -06:00
Eric Kuck 5618c465a2 Added a String->[String] helper 
Signed-off-by: Eric Kuck <eric@bluelinelabs.com>
 2018-12-20 10:46:26 -06:00
Roopesh Chander de08978a80 TunnelErrors: Remove unused error 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-20 19:44:57 +05:30
Roopesh Chander 9268c0c4bc Tunnel edit: init() need not take a tunnelConfiguration argument 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-19 18:35:53 +05:30
Roopesh Chander 5c501ac9a6 NE: Log whether tunnel was activated from the app or not 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-19 18:35:53 +05:30
Roopesh Chander 35450bf407 Remove non-helpful comments 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-19 18:35:53 +05:30
Roopesh Chander f93c9797ea Tunnel edit: Fix comment 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-19 18:35:53 +05:30
Roopesh Chander bba6d2f919 TunnelsManager: If only Activate On Demand has changed, don't restart tunnel 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-19 18:35:53 +05:30
Roopesh Chander fa51e3f1d1 NE: Handle bad domain names and Activate On Demand 
This combination causes iOS to keep trying to bring up the tunnel,
leading to a lot of displayMessage() alerts.

In this fix, if we get a DNS resolution error in an Activate On Demand
enabled tunnel, we silently retry 9 times (with a 4-second delay before
each retry) and then show the displayMessage() alert.

Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-19 15:38:00 +05:30
Roopesh Chander 04a8c2ff5a NE: No need for two startTunnel() methods 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-19 13:10:42 +05:30
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
Jason A. Donenfeld 9556901a33 Version bump 
This is our first release to the real app store.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-12-17 14:08:17 +01:00
Eric Kuck ed9b4c85ed Got TunnelsManager back under the max file length by splitting out NEVPNStatus+CustomStringConvertible 
Signed-off-by: Eric Kuck <eric@bluelinelabs.com>
 2018-12-16 23:51:25 -06:00
Eric Kuck fc452753a7 Potential fix for insertRowAtIndexPath crash 
Signed-off-by: Eric Kuck <eric@bluelinelabs.com>
 2018-12-16 21:11:33 -06:00
Jason A. Donenfeld 727992f5d2 Improve mock tunnels generation 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-12-16 01:51:14 +01:00
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
Jason A. Donenfeld b3f5635f4e Nuke duplicate file 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-12-15 06:21:49 +01:00
Jason A. Donenfeld 1450538846 Version bump 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-12-15 05:08:31 +01:00
Eric Kuck 5a08c67f33 Fixed editable KeyValueCells being copyable 
Fixed DNS servers not saving

Signed-off-by: Eric Kuck <eric@bluelinelabs.com>
 2018-12-14 21:48:48 -06:00
Jason A. Donenfeld 1e9c806614 Fix confusing indentation 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-12-15 04:42:46 +01:00
Eric Kuck ccd8cfe478 KeyValueCells now share code 
Signed-off-by: Eric Kuck <eric@bluelinelabs.com>
 2018-12-14 20:02:37 -06:00
Eric Kuck cb051f695d Reorganized project structure 
Signed-off-by: Eric Kuck <eric@bluelinelabs.com>
 2018-12-14 17:27:11 -06:00
Eric Kuck 7a24f18eb7 Most similar views now shared between ViewControllers 
Signed-off-by: Eric Kuck <eric@bluelinelabs.com>
 2018-12-14 17:15:22 -06:00
Jason A. Donenfeld 83c95dc26d Prettier log time format 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-12-15 00:08:54 +01:00
Jason A. Donenfeld e0bc5e12b3 Simplify logging tags 
This was roop's initial idea, and it turns out to be the better one, now
that we can pass cstrings more easily.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-12-14 22:53:42 +01:00
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
Jason A. Donenfeld 73be704b01 Deduplicate functions 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-12-14 00:01:50 +01:00
Jason A. Donenfeld 2699c613bd Simplify filemanager extension 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-12-13 23:25:18 +01:00
Jason A. Donenfeld 74e983ea6f Can't -> cannot 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-12-13 23:17:05 +01:00
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
Jason A. Donenfeld 77a26e4cd2 Localize swiftlint 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-12-13 20:06:37 +01:00
Eric Kuck 05d750539b Reorganized ViewControllers (split out UIViews and UITableViewCells into their own classes) 
All swiftlint warnings except one fixed up

Signed-off-by: Eric Kuck <eric@bluelinelabs.com>
 2018-12-13 12:58:50 -06:00
Jason A. Donenfeld 7323a00612 Avoid escaping heap allocation 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-12-13 19:43:12 +01:00
Jason A. Donenfeld a6912ca7a2 Tidy up str to gostr conversion 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-12-13 19:36:51 +01:00
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
Jason A. Donenfeld 154774ada2 Simplify C strings 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-12-13 19:08:38 +01:00
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
Jason A. Donenfeld 642b627d27 Rewrite Logger 
This reverts all of Roop's changes to the C code, and then rewrites the
logger logic to be cleaner.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-12-13 18:06:37 +01:00
Eric Kuck 38accad27d More reliable logo sizing 
Signed-off-by: Eric Kuck <eric@bluelinelabs.com>
 2018-12-13 09:30:13 -06:00
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
Jason A. Donenfeld e11224f394 Commit untested ringlogger code 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-12-13 06:14:24 +01:00
Jason A. Donenfeld 5971c197bd Remove useless whitespace 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-12-13 05:26:04 +01:00
Jason A. Donenfeld ecbab37e0e Settings: better padding calculation 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-12-13 05:22:13 +01:00
Eric Kuck 4eec53d6d3 Fixed hacky logo display for settings 
Signed-off-by: Eric Kuck <eric@bluelinelabs.com>
 2018-12-12 21:16:28 -06:00
Eric Kuck 8a916beb38 More formatting nits and cyclomatic complexity fixes 
Signed-off-by: Eric Kuck <eric@bluelinelabs.com>
 2018-12-12 21:09:52 -06:00
Eric Kuck e4ac48bc75 More linter warnings fixed, enabled more swiftlint rules, project cleanup 
Signed-off-by: Eric Kuck <eric@bluelinelabs.com>
 2018-12-12 15:33:14 -06:00
Eric Kuck d06cff2a36 Tons more swiftlint warnings fixed. Still a few remaining. 
Signed-off-by: Eric Kuck <eric@bluelinelabs.com>
 2018-12-12 12:28:27 -06:00
Eric Kuck de14b76b4d Added swiftlint and fixed all errors (and a bunch, but not all, warnings) 
Signed-off-by: Eric Kuck <eric@bluelinelabs.com>
 2018-12-12 11:40:57 -06:00
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
Jason A. Donenfeld 034a1a12f7 Supply missing pieces of path change 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-12-12 01:11:43 +01:00
Eric Kuck 9bc7e58487 Fixed a potential race condition, better naming on PacketTunnelSettingsGenerator methods 
Signed-off-by: Eric Kuck <eric@bluelinelabs.com>
 2018-12-11 16:59:15 -06:00
Eric Kuck 27265fc222 Added an (unfinished) NWPathMonitor implementation for reconnecting on network changes 
Signed-off-by: Eric Kuck <eric@bluelinelabs.com>
 2018-12-11 16:12:04 -06:00
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