passepartoutvpn/passepartout-apple
1
0
Fork 0
mirror of https://github.com/passepartoutvpn/passepartout-apple.git synced 2025-02-15 20:32:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

OpenVPN: Fix regression in default routes (#1145)

Browse Source 
Similarly to #1136, inject IPModule into OpenVPN .routingPolicies
because NetworkSettingsBuilder relies on it.
This commit is contained in:
Davide 2025-02-07 01:15:21 +01:00 committed by GitHub
parent e8ffca9d50
commit 98160c24c2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
Packages/PassepartoutOpenVPNOpenSSL/Sources/PassepartoutOpenVPNOpenSSL/OpenVPNConnection.swift
View File

@ -66,7 +66,8 @@ public actor OpenVPNConnection {
!endpoints.isEmpty else {
fatalError("No OpenVPN remotes defined?")
}
self.configuration = configuration
self.configuration = try configuration.withModules(from: parameters.controller.profile)
backend = CyclingConnection(
factory: parameters.factory,
@ -234,6 +235,47 @@ extension OpenVPNConnection: OpenVPNSessionDelegate {
// MARK: - Helpers
private extension OpenVPN.Configuration {
func withModules(from profile: Profile) throws -> Self {
var newBuilder = builder()
let ipModules = profile.activeModules
.compactMap {
$0 as? IPModule
}
let defaultRoute = Route(defaultWithGateway: nil)
ipModules.forEach { ipModule in
var policies = newBuilder.routingPolicies ?? []
if !policies.contains(.IPv4), ipModule.shouldAddIPv4Policy {
policies.append(.IPv4)
}
if !policies.contains(.IPv6), ipModule.shouldAddIPv6Policy {
policies.append(.IPv6)
}
newBuilder.routingPolicies = policies
}
return try newBuilder.tryBuild(isClient: true)
}
}
private extension IPModule {
var shouldAddIPv4Policy: Bool {
guard let ipv4 else {
return false
}
let defaultRoute = Route(defaultWithGateway: nil)
return ipv4.includedRoutes.contains(defaultRoute) && !ipv4.excludedRoutes.contains(defaultRoute)
}
var shouldAddIPv6Policy: Bool {
guard let ipv6 else {
return false
}
let defaultRoute = Route(defaultWithGateway: nil)
return ipv6.includedRoutes.contains(defaultRoute) && !ipv6.excludedRoutes.contains(defaultRoute)
}
}
private extension OpenVPNConnection {
nonisolated func onStatus(_ connectionStatus: ConnectionStatus) {
switch connectionStatus {