ShockVPN/wireguard-apple
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
755 Commits 10 Branches 37 Tags
80977b95dec7224519c0a9b775f4fe4a203f6966
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Roopesh Chander 80977b95de macOS: Edit view: Update public key as you edit 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:35 +05:30
Roopesh Chander bbeb732ef3 Highlighter: Report each key type separately 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:34 +05:30
Roopesh Chander 94c4922913 Parsing: Always error on unrecognized keys 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:34 +05:30
Roopesh Chander fc03c635c1 Parsing: Error on duplicate entries 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:34 +05:30
Roopesh Chander b0612df990 macOS: Edit view: Validate and save 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:34 +05:30
Roopesh Chander c2a6241b5c macOS: Refactor config file parsing 
- To report more fine grained errors
- To make the parse errors conform to WireGuardAppError

Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:34 +05:30
Roopesh Chander c2633987c3 macOS: Tunnel edit view 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:33 +05:30
Roopesh Chander f7b2f73015 macOS: Rename *Cell to *Row 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:33 +05:30
Roopesh Chander c72f7056b3 macOS: On adding the first tunnel, select it 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:33 +05:30
Roopesh Chander cb778fe7e0 macOS: Consolidate presenting of the import panel 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:33 +05:30
Roopesh Chander f3c2904241 macOS: Manage tunnels: Handle the case when there are no tunnels 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:33 +05:30
Roopesh Chander df8b400850 macOS: Present tunnel activation errors from the window when possible 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:33 +05:30
Roopesh Chander 252d940d34 macOS: Present errors as a sheet when applicable 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:32 +05:30
Roopesh Chander efb64b1959 macOS: Manage tunnels: Remove tunnel 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:32 +05:30
Roopesh Chander dfc4b37518 macOS: Manage tunnels: Update tunnels list on changes 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:32 +05:30
Roopesh Chander 60cfceec4f macOS: Manage tunnels: Export log pulldown menu implementation 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:32 +05:30
Roopesh Chander 361830a69e macOS: Manage tunnels: Export tunnels pulldown menu implementation 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:32 +05:30
Roopesh Chander f6ea25573b macOS: Xcode: Add ablity to save files 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:32 +05:30
Roopesh Chander de12c27d5b macOS: Manage tunnels: Select first tunnel on showing the window 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:32 +05:30
Roopesh Chander a221cb566b macOS: Manage tunnels: Set window title 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:32 +05:30
Roopesh Chander f33cd0b6fd macOS: Manage tunnels: Import pulldown menu implementation 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:32 +05:30
Roopesh Chander 38bb0faf86 macOS: Manage tunnels: Localize pulldown menu items 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:32 +05:30
Roopesh Chander 8d9c5e2950 macOS: Show open panel as sheet on manage window 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:32 +05:30
Roopesh Chander 09f4be17de macOS: Manage tunnels: Adjust spacings 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:32 +05:30
Roopesh Chander 60e18dfdd5 macOS: Manage tunnels: Add a box around the detail view 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:31 +05:30
Roopesh Chander 5bc0c5b2b4 macOS: Manage tunnels: Show status checkbox and edit button 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:31 +05:30
Roopesh Chander 4a4eeb4a21 macOS: s/macMenuStatus/macStatus/g; 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:31 +05:30
Roopesh Chander ada7db3dca macOS: Manage tunnels: Tunnel detail view 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:31 +05:30
Roopesh Chander c946c0ea48 macOS: Manage tunnels: Add a filler button 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:31 +05:30
Roopesh Chander 4a4690b5fa macOS: Manage tunnels: Fix list view look 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:31 +05:30
Roopesh Chander 37fce31d16 macOS: Manage tunnels: Add buttons to the bottom of the list view 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:30 +05:30
Roopesh Chander 7934d6b0c7 macOS: Manage tunnels window: Tunnels list 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:30 +05:30
Roopesh Chander 98e9088aba macOS: Capitalize All Rights Reserved 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:30 +05:30
Roopesh Chander 2c81c3a379 macOS: Show status as disabled menu items 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:30 +05:30
Roopesh Chander 04f6ee0f11 macOS: Ability to activate / deactivate a tunnel 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:30 +05:30
Roopesh Chander 545f8c88f4 macOS: Ability to import tunnels from file 
For now, the open panel shows as a separate window.
Later, we'll open it as a sheet on the 'Manage tunnels' window.

Signed-off-by: Roopesh Chander <roop@roopc.net>
 2019-01-14 14:52:30 +05:30
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 1ca5407b85 wireguard-go-bridge: Make CFLAGS_PREFIX work for macOS as well 
For macOS, Xcode doesn't set DEPLOYMENT_TARGET_CLANG_FLAG_PREFIX,
but does set DEPLOYMENT_TARGET_CLANG_FLAG_NAME.

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
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
Roopesh Chander 999b761ed0 Remove more comments 
Signed-off-by: Roopesh Chander <roop@roopc.net>
 2018-12-23 00:31:44 +05:30
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
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
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
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