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

763 Commits

Author SHA1 Message Date
Roopesh Chander 6a27626fc0 iOS: Refactor importFromFile 
So that it can be used in macOS as well

Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:29 +05:30
Roopesh Chander fb1607d4a2 macOS: Add tunnel management menu items 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:29 +05:30
Roopesh Chander 51a2c272b9 macOS: Specify app is an 'agent' 
This hides the app from the Dock, while still enabling the app
to come to the foreground if required.

Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:29 +05:30
Roopesh Chander b5751b6321 macOS: Create status bar with tunnel names 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:29 +05:30
Roopesh Chander 110012dbcc macOS: Add status bar icon 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:29 +05:30
Roopesh Chander 5c7a149167 macOS: Remove MainMenu.xib 
When there's no xib, we should explicitly set the app delegate, so we
override NSApplication and set the app delegate in NSApplication.shared

Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:29 +05:30
Roopesh Chander 629009d3be macOS: NE: Add entitlements for making network connections 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:28 +05:30
Roopesh Chander d7d4355f5e Make app groups work on both iOS and macOS 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:28 +05:30
Roopesh Chander 55d6961a2f macOS: Add Network Extensions capability to app 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:28 +05:30
Roopesh Chander c8cd663a05 iOS: Fix WireGuardNetworkExtensioniOS target 
- Rename WireGuardNetworkExtension.entitlements to WireGuardNetworkExtension_iOS.entitlements

Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:28 +05:30
Roopesh Chander a754c4d7ab iOS: Fix WireGuardiOS target 
- Move Info.plist and entitlements to WireGuard/UI/iOS/

Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:28 +05:30
Roopesh Chander 95415cd917 macOS: Fix WireGuardmacOS target 
- Include non-UI code from iOS while building
- Add run scripts
- Move files to WireGuard/UI/macOS
- Set Swift-Obj-C bridging header

Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:28 +05:30
Roopesh Chander b32b897181 macOS: Fix WireGuardNetworkExtensionmacOS target 
- Build using common network extension code
- Add run scripts
- Set Info.plist to common network extension's Info.plist
- Move entitlements to common network extension folder
- Remove Xcode-generated macOS network extension code
- Set Swift-Obj-C bridging header

Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:27 +05:30
Roopesh Chander d5c1acb57e macOS: WireGuardNetworkExtensionmacOS depends on WireGuardGoBridgemacOS 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:27 +05:30
Roopesh Chander 573f9640de macOS: Add WireGuardNetworkExtensionmacOS target 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:27 +05:30
Roopesh Chander f6772dc353 macOS: Add WireGuardmacOS target 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:27 +05:30
Roopesh Chander 0cbe66df99 Xcode: Add WireGuardGoBridgemacOS target 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:27 +05:30
Roopesh Chander 3cd33ebe8f Move iOS images and storyboard into UI/iOS/ folder 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:27 +05:30
Roopesh Chander c7a40d3cb0 Xcode: Rename iOS targets to include an 'iOS' suffix 
But keep the PRODUCT_NAME as 'WireGuard', not 'WireGuardiOS'.

Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:26 +05:30
Roopesh Chander d02b0fd10e xcconfig: Make app id platform-specific 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:26 +05:30
Roopesh Chander 09d7a5229a On-Demand: Add support for macOS-specific values 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:26 +05:30
Roopesh Chander 10982a57ef import Foundation instead of UIKit wherever possible 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:26 +05:30
Jason A. Donenfeld 5f15b664fc Version bump 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2019-01-08 02:13:44 +01:00
Jason A. Donenfeld 49f287439e PacketTunnelSettingsGenerator: use 127.0.0.1 as dummy address 
It turns out that using 0.0.0.0 somehow conflicts with DNS lookups when
CLAT is in use.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2019-01-08 01:51:12 +01:00
Jason A. Donenfeld 150cd119c7 Avoid dynamic MTU calculations for now 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2019-01-07 19:23:39 -05:00
Jason A. Donenfeld e2384e143c Update copyright 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2019-01-07 19:23:39 -05:00
Jason A. Donenfeld 52c59704de Version bump 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-12-28 19:43:11 +01:00
Jason A. Donenfeld 0b828f9b96 Rework DNS and routes in network extension 
The DNS resolver prior had useless comments, awful nesting, converted
bytes into strings and back into bytes, and generally made no sense.
That's been rewritten now.

But more fundumentally, this commit made the DNS resolver actually
accomplish its objective, by passing AI_ALL to it. It turns out, though,
that the Go library isn't actually using GAI in the way we need for
parsing IP addresses, so we actually need to do another round, this time
with hints flag as zero, so that we get the DNS64 address.

Additionally, since we're now binding sockets to interfaces, we can
entirely remove the excludedRoutes logic.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-12-28 19:38:03 +01:00
Jason A. Donenfeld 51a3e5c0b4 Version bump 
A Christmas Special, for TestFlight, and possibly for release if things
go well there.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-12-26 01:41:22 +01:00
Jason A. Donenfeld c9c343cde2 NetworkExtension: rescope socket instead of tearing down socket 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-12-26 01:17:55 +01:00
Roopesh Chander c563a24348 minizip: Remove zip encryption code 
We can now remove -DNOCRYPT cflag while compiling

Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-25 12:48:04 +05:30
Roopesh Chander 808852c547 Tunnel edit: Fix crash 
This fixes a crash that happens when you:

1. Scroll to the end of the Edit screen
2. Delete a peer
3. Toggle the Activate On Demand switch

Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-24 13:01:21 +05:30
Eric Kuck 035055ef0a SwitchCell nits 
Signed-off-by: Eric Kuck <eric@bluelinelabs.com>
 2018-12-22 15:32:29 -06:00
Eric Kuck 508ba44576 Fix typo for simulator builds 
Signed-off-by: Eric Kuck <eric@bluelinelabs.com>
 2018-12-22 14:32:39 -06:00
Roopesh Chander 999b761ed0 Remove more comments 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-23 00:31:44 +05:30
Jason A. Donenfeld 129f94dccd Rely on availability of fd only after setting network settings 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-12-22 18:29:54 +01:00
Jason A. Donenfeld dddbf3b370 Retain aggressive socket reestablishment for now 
This can be reverted once we've done more testing.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-12-22 15:45:09 +01:00
Roopesh Chander d29f47fc9b Don't set username on NETunnelProviderProtocol 
The username corresponds to the Account field in iOS system VPN UI,
but if we don't set it, the field is not shown, so setting it isn't
really required.

Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-22 16:13:31 +05:30
Roopesh Chander e6e1795d08 TunnelErrors: Add alert text for PacketTunnelProviderError 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-22 16:05:43 +05:30
Roopesh Chander fd29cf3402 TunnelStatus: Absorb NEVPNStatus+CustomStringConvertible 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-22 15:46:28 +05:30
Jason A. Donenfeld 56ad5f74e9 Also refresh status 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-12-22 07:07:53 +01:00
Jason A. Donenfeld 49bf55021f Reassign tunnelProvider if it changes from outside the app 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-12-22 06:56:12 +01:00
Eric Kuck 0bec5b04b0 All models now Equatable 
Signed-off-by: Eric Kuck <eric@bluelinelabs.com>
 2018-12-21 22:57:17 -06:00
Jason A. Donenfeld d36e7e27ff Clean up trailing whitespace 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-12-22 05:30:35 +01:00
Jason A. Donenfeld b0b6866c51 Do not crash if we can't get socket.fileDescriptor 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-12-22 05:13:04 +01:00
Eric Kuck 9098cd1161 Removing a tunnel from iOS's settings is now immediately reflected in app 
Signed-off-by: Eric Kuck <eric@bluelinelabs.com>
 2018-12-21 21:59:43 -06:00
Jason A. Donenfeld 8365adf435 Localize remaining strings in network extension 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-12-22 03:42:01 +01:00
Eric Kuck 9d9859248e RTL support 
Signed-off-by: Eric Kuck <eric@bluelinelabs.com>
 2018-12-21 20:37:22 -06:00
Eric Kuck f7e9f4d631 Strongly recommended now appears as placeholder for DNS when needed 
Signed-off-by: Eric Kuck <eric@bluelinelabs.com>
 2018-12-21 19:52:51 -06:00
Jason A. Donenfeld f2000aa1da Combine double log invocations 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-12-22 02:21:07 +01:00
Jason A. Donenfeld 41a4c6362a Attempt to strongly recommend things 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-12-22 01:55:42 +01:00
Jason A. Donenfeld aede9f6e45 Move model helpers to model directory 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-12-22 01:36:42 +01:00
Eric Kuck 1eeed89174 Fixes mock tunnels 
Signed-off-by: Eric Kuck <eric@bluelinelabs.com>
 2018-12-21 18:35:01 -06:00
Jason A. Donenfeld c1c5f7a7c7 Do not set copyable back to true on reuse 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-12-22 01:31:59 +01:00
Jason A. Donenfeld 4ed646973e Move name from interface to tunnel 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-12-22 00:28:18 +01:00
Jason A. Donenfeld 9295895e3a Fix paren typo 
"I am very anti-paren." --Eric

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-12-21 23:45:20 +01:00
Jason A. Donenfeld 7b9d4cb9e3 Nuke trailing spaces 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-12-21 23:34:56 +01:00
Eric Kuck 1fecd8eb6c providerConfiguration is now a WgQuickConfig 
Signed-off-by: Eric Kuck <eric@bluelinelabs.com>
 2018-12-21 16:32:08 -06:00
Jason A. Donenfeld accf60b82f Do not require NetworkExtension to know its own name 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-12-21 22:05:47 +01:00
Eric Kuck f6af9d9ffb All migration stuff moved to one gross file 
Signed-off-by: Eric Kuck <eric@bluelinelabs.com>
 2018-12-21 12:51:14 -06:00
Jason A. Donenfeld 78b38a4eba Simplify versioning of stored data 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-12-21 18:58:06 +01:00
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
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
Jason A. Donenfeld 2fa2f58aad Version bump 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-12-07 23:58:53 +01:00
Jason A. Donenfeld 1eddb2c86d PacketTunnelProvider: Show log timestamp 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-12-07 23:56:26 +01:00
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
Jason A. Donenfeld b7e5638681 Plist: Handle crypto export 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-12-07 18:52:14 +01:00
Jason A. Donenfeld 66b4aedd08 Make strings consistent 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
 2018-12-07 18:52:14 +01:00
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