Merge branch 'master' into an/shortcuts-integration

Remove backward compatibility of GetPeers with SiriKit version

Signed-off-by: Alessio Nossa <alessio.nossa@gmail.com>

Add backwards compatibility of GetPeers wit SiriKit version

Signed-off-by: Alessio Nossa <alessio.nossa@gmail.com>

Update AppIntents Strings

Signed-off-by: Alessio Nossa <alessio.nossa@gmail.com>

Rename constant to satisfy SwiftLint

Signed-off-by: Alessio Nossa <alessio.nossa@gmail.com>

Remove missing peers error in UpdateTunnelConfiguration Intent

Signed-off-by: Alessio Nossa <alessio.nossa@gmail.com>

Fix return value of AppIntents in iOS 17

Signed-off-by: Alessio Nossa <alessio.nossa@gmail.com>

WireguardApp: macOS: Add App Intents to macOS app

Signed-off-by: Alessio Nossa <alessio.nossa@gmail.com>

Implement UpdateTunnelConfiguration App Intent

Signed-off-by: Alessio Nossa <alessio.nossa@gmail.com>

Implement BuildPeerConfigurationUpdate App Intent

Signed-off-by: Alessio Nossa <alessio.nossa@gmail.com>

Remove UpdateConfiguration Intent with Dictionary input

Signed-off-by: Alessio Nossa <alessio.nossa@gmail.com>

Implement UpdateConfiguration AppIntent with Dictionary as input

Signed-off-by: Alessio Nossa <alessio.nossa@gmail.com>

WireguardApp: Add async variant of modify tunnel function

Signed-off-by: Alessio Nossa <alessio.nossa@gmail.com>

WireguardApp: iOS: Cleanup after SiriKit Intents removal

Signed-off-by: Alessio Nossa <alessio.nossa@gmail.com>

Remove WireGuardIntentsExtension

Signed-off-by: Alessio Nossa <alessio.nossa@gmail.com>

Removed UpdateConfigurationIntent SiriKit Intent

Signed-off-by: Alessio Nossa <alessio.nossa@gmail.com>

Implement GetPeers AppIntent

Signed-off-by: Alessio Nossa <alessio.nossa@gmail.com>

Remove GetPeers SiriKit Intent

Signed-off-by: Alessio Nossa <alessio.nossa@gmail.com>

Complete cleanup after SetTunnelStatus Intent removal

Signed-off-by: Alessio Nossa <alessio.nossa@gmail.com>

Removed SetTunnelStatus

Signed-off-by: Alessio Nossa <alessio.nossa@gmail.com>

App: version bump

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

App: bump copyright

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

App: bump minimum OS versions

This allows us to remove a good deal of legacy cruft.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

WireGuardKitGo: bump

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

WireGuardKit: fix incorrect IP address allocation size

According to [1], the `capacity` parameter is specified as "the number
of instances of T in the re-bound region" and not the total size of the
rebound struct.

Without this patch, there are crashes in the extension with the
following error:

  Fatal error: self must be a properly aligned pointer for types Pointee and T`

Since the subsequent line in the code only reads `sizeof(in_addr)` or
`sizeof(in6_addr)` anyway, change the `capacity` parameter to just be a
count of 1.

[1] https://developer.apple.com/documentation/swift/unsafepointer/withmemoryrebound(to:capacity:_:)

Signed-off-by: John Biggs <john.biggs@proton.ch>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

global: apply MIT more consistently

People keep asking.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

WireguardApp: iOS: Added Siri shortcuts donations for SetTunnelStatus intent

Signed-off-by: Alessio Nossa <alessio.nossa@gmail.com>

Implemented SetTunnelStatus intent

Signed-off-by: Alessio Nossa <alessio.nossa@gmail.com>

Implemented UpdateConfiguration intent

Signed-off-by: Alessio Nossa <alessio.nossa@gmail.com>

WireguardApp: iOS: Moved tunnelsManager initialization to AppDelegate

Signed-off-by: Alessio Nossa <alessio.nossa@gmail.com>

Implemented GetPeers intent

Signed-off-by: Alessio Nossa <alessio.nossa@gmail.com>

project: Added sources to WireGuardIntentsExtensioniOS

Signed-off-by: Alessio Nossa <alessio.nossa@gmail.com>

project: Added WireGuardIntentsExtensioniOS target and Siri capability

Signed-off-by: Alessio Nossa <alessio.nossa@gmail.com>

Automatic configuration files changes by Xcode

Signed-off-by: Alessio Nossa <alessio.nossa@gmail.com>

UI: When saving on-demand rules, deactivate if reqd and then save

Signed-off-by: Roopesh Chander <roop@roopc.net>

UI: When saving on-demand rules on a config, enable on-demand if active

When a user saves on-demand rules on the configuration, set
onDemandEnabled to true if the tunnel is active, and false if it isn't.
Then deactivate the tunnel.

Signed-off-by: Roopesh Chander <roop@roopc.net>

App: version bump

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

UI: macOS: increase login detector file timeout

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

Model: migrate iOS 14 keychain references to iOS 15 format

Keychain references used to be bijective, but with the change in format,
Apple tried to be too clever, and references are no longer bijective.
This lead to us deleting keychain entries, which in turn emptied out
people's configs upon upgrading to iOS 15. Disaster!

Fix this by detecting the change in format and saving the new password
reference. We still rely on this being bijective moving forward;
hopefully this bug won't repeat itself. It would be nice to not rely on
that property, but doing so without grinding startup to a halt isn't
obviously done, given how slow the keychain accesses are and how limited
the API is.

Reported-by: Eddie <stunnel@attglobal.net>
Reported-by: Anatoli <me@anatoli.ws>
Reported-by: Alan Graham <alan@meshify.app>
Reported-by: Jacob Wilder <oss@jacobwilder.org>
Reported-by: Miguel Arroz <miguel.arroz@gmail.com>
Reported-by: Reid Rankin <reidrankin@gmail.com>
Reported-by: Fabien <patate.cosmique@pm.me>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

UI: iOS: remove list pinking when no config

This reverts commit 86afd1a46a83038a787176272a7c486b7269e1a3.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

WireGuardApp: restore old keychain consistency behavior

This reverts commit adcbd17ebeedaf6fa8106c8835ebf43667170878.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

App: version bump

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

UI: iOS: disable list rows when no config

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

WireGuardApp: use file to communicate launch-by-login-helper

Apple event params are broken on recent macOS versions.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

Keychain: remove class constraint when copying

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

WireGuardApp: do not delete unverifying profiles ever

The Keychain code is much too fragile, and it's better to err on the
safe side. Instead just log an error when this happens.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

WireGuardKitGo: bump wireguard-go version

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

MacAppStoreUpdateDetector: Detect StoreAEService correctly

In macOS 10.15 and macOS 11, the quit Apple event is sent by:
  com.apple.AppStoreDaemon.StoreAEService

In some earlier macOS release, the quit Apple event was sent by:
  com.apple.CommerceKit.StoreAEService

Signed-off-by: Roopesh Chander <roop@roopc.net>

MacAppStoreUpdateDetector: Add pid to the log

Signed-off-by: Roopesh Chander <roop@roopc.net>

WireGuardKitGo: include new homebrew location in PATH

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

build: Fix swiftlint warnings

Signed-off-by: Roopesh Chander <roop@roopc.net>

build: Fix swift warnings

Use 'AnyObject' instead of 'class' to restrict protocol inheritance

Signed-off-by: Roopesh Chander <roop@roopc.net>

build: Include 'swiftlint' location in the PATH before invoking it

In macOS 11, HomeBrew installs swiftlint under /opt/homebrew, which is not
in the default path that Xcode seems to use. So we include the PATH
to contain:

  - /usr/local/bin:

    Where HomeBrew installs 'swiftlint' in macOS 10.15 and earlier

  - /opt/homebrew/bin:

    Where HomeBrew installs 'swiftlint' in macOS 11

Signed-off-by: Roopesh Chander <roop@roopc.net>

UI: Use 'On-Demand', with hyphen, consistently

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

UI: macOS: do on-demand ritual for clicking list item too

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

UI: Consider on-demand to be enabled iff the tunnel provider is enabled

Signed-off-by: Roopesh Chander <roop@roopc.net>

UI: When setting on-demand, avoid a second saveToPreferences() call

Signed-off-by: Roopesh Chander <roop@roopc.net>

UI: When saving on-demand rules, don't set isOnDemandEnabled

When adding or modifying a config, when on-demand options are set by a
user, the rules are saved, but isOnDemandEnabled is left unset (and can
be set by the appropriate control in the detail view (switch in iOS /
button in macOS)).

Signed-off-by: Roopesh Chander <roop@roopc.net>

UI: macOS: Incorporate on-demand-ness in status menu

Signed-off-by: Roopesh Chander <roop@roopc.net>

UI: macOS: Tunnel detail: Incorporate on-demand-ness in toggle button

Signed-off-by: Roopesh Chander <roop@roopc.net>

UI: macOS: Tunnel detail: Incorporate on-demand-ness in the status row

Signed-off-by: Roopesh Chander <roop@roopc.net>

UI: macOS: Tunnel list: Incorporate on-demand-ness in the status circle

Signed-off-by: Roopesh Chander <roop@roopc.net>

UI: macOS: Add yellow circle image

Signed-off-by: Roopesh Chander <roop@roopc.net>

UI: Localizations: Remove alertTunnelActivationFailureOnDemandAddendum

It's not used anymore.

Signed-off-by: Roopesh Chander <roop@roopc.net>

UI: Remove addendum on on-demand from error on tunnel activation

Signed-off-by: Roopesh Chander <roop@roopc.net>

UI: When setting on-demand, enable the tunnel if required

Signed-off-by: Roopesh Chander <roop@roopc.net>

UI: iOS: Tunnels list: Move the "On Demand" label to the right

Having that at the bottom makes it harder for iOS to get
the row height correctly.

Signed-off-by: Roopesh Chander <roop@roopc.net>

UI: iOS: Show on-demand state in 'Status' if there are on-demand rules

Signed-off-by: Roopesh Chander <roop@roopc.net>

UI: When reloading tunnels, preserve '.waiting' state

Signed-off-by: Roopesh Chander <roop@roopc.net>

UI: When deactivating for activating another tunnel, disable on-demand

Signed-off-by: Roopesh Chander <roop@roopc.net>

UI: Keep on-demand rules even if on-demand is disabled

Signed-off-by: Roopesh Chander <roop@roopc.net>

UI: iOS: Tunnel detail: Incorporate on-demand-ness in 'Status'

Signed-off-by: Roopesh Chander <roop@roopc.net>

UI: iOS: Show "on-demand is active" for tunnels with the active on-demand

Signed-off-by: Andrej Mihajlov <and@mullvad.net>
Signed-off-by: Roopesh Chander <roop@roopc.net>

UI: iOS: Tunnels list: Incorporate on-demand-ness in the switch

Signed-off-by: Roopesh Chander <roop@roopc.net>

UI: TunnelsManager: Add setOnDemandEnabled() instance method

Signed-off-by: Roopesh Chander <roop@roopc.net>

UI: TunnelsManager: Add TunnelContainer.hasOnDemandRules

Signed-off-by: Roopesh Chander <roop@roopc.net>

Global: bump copyright year

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

Kit: add missing import for WireGuardKitC

Signed-off-by: Andrej Mihajlov <and@mullvad.net>

App: version bump

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

Kit: Go: mod bump

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

Kit: Adapter: use more reliable utun detection technique

Rather than hoping that the AF_SYSTEM fd is of type utun, and then
calling "2" on it to get the name -- which could be defined as something
else for a different AF_SYSTEM socket type -- instead simply query the
AF_SYSTEM control socket ID with getpeername. This has one catch, which
is that the ID is dynamically allocated, so we resolve it using the
qualified name. Normally we'd make a new AF_SYSTEM socket for this, but
since that's not allowed in the sandbox, we reuse the AF_SYSTEM socket
that we're checking. At this point in the flow, we know that it's a
proper AF_SYSTEM one, based on the first sockaddr member; we just don't
know that it's a utun variety.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

Kit: Adapter: iterate through all FDs to find UTUN

This is a bit of a kludge, until I find something better. We simply
iterate through all FDs, and call getsockopt on each one until we find
the utun FD. This works, and completes rather quickly (fd is usually 6
or 7). Rather than maintain the old path for older kernels, just use
this for all versions, to get more coverage. Other techniques involve
undocumented APIs; this one has the advantage of using nothing
undocumented.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

SPM: update exclude rules

Fixes missing excluded file warning in Xcode. api-ios.go was renamed to api-apple.go.

Signed-off-by: Andrej Mihajlov <and@mullvad.net>

UI: iOS: asynchronously load from NEHotspotNetwork on iOS 14

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

UI: iOS: clean up visuals in SSID editor

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

README: account for funky xcode paths

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

Kit: Go: bump to latest API

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

UI: iOS: Disable "copy" action on on-demand cells

Signed-off-by: Andrej Mihajlov <and@mullvad.net>

Kit: netcfg: add explicit IP mask routes

macOS will use the wrong source address unless we add explicit routes
that mention the self-pointing gateway. Actually, it won't add any
implicit routes on its own, so in order to route the masks of the
addresses, we have to add our own routes explicitly.

However, this still doesn't fix the problem while inside of the network
extension, even though it works outside it.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

Kit: Go: mod bump

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

UI: iOS: Remove duplicate call to addSubview

Signed-off-by: Andrej Mihajlov <and@mullvad.net>

UI: iOS: Fix placeholder label alignment in text fields.

Signed-off-by: Andrej Mihajlov <and@mullvad.net>

App: version bump

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

project: sync translations and improve id generation again

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

UI: macOS: Group more than 10 tunnels into submenu

Signed-off-by: Andrej Mihajlov <and@mullvad.net>

UI: Avoid force unwrap when checking for errors

Signed-off-by: Andrej Mihajlov <and@mullvad.net>

Kit: do not crash on [abcd::] with missing port

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

Kit: Go: bump module and simplify API

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

UI: pause VPN configurations observer while adding or removing multiple tunnels

Signed-off-by: Andrej Mihajlov <and@mullvad.net>

UI: use NotificationToken to properly clean up observers

When the variable goes out of scope, the observer isn't removed unless
an explicit call is made to the token.

Signed-off-by: Andrej Mihajlov <and@mullvad.net>