chore: add network extension manager #18
+415
−48
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -23,7 +23,7 @@ struct PreviewClient: Client { | ||
| roles: [] | ||
| ) | ||
| } catch { | ||
| throw .reqError(.explicitlyCancelled) | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| import NetworkExtension | ||
| import os | ||
|
|
||
| // swiftlint:disable:next function_body_length | ||
| public func convertNetworkSettingsRequest(_ req: Vpn_NetworkSettingsRequest) -> NEPacketTunnelNetworkSettings { | ||
| let networkSettings = NEPacketTunnelNetworkSettings(tunnelRemoteAddress: req.tunnelRemoteAddress) | ||
| networkSettings.tunnelOverheadBytes = NSNumber(value: req.tunnelOverheadBytes) | ||
| networkSettings.mtu = NSNumber(value: req.mtu) | ||
|
|
||
| if req.hasDnsSettings { | ||
| let dnsSettings = NEDNSSettings(servers: req.dnsSettings.servers) | ||
| dnsSettings.searchDomains = req.dnsSettings.searchDomains | ||
| dnsSettings.domainName = req.dnsSettings.domainName | ||
| dnsSettings.matchDomains = req.dnsSettings.matchDomains | ||
| dnsSettings.matchDomainsNoSearch = req.dnsSettings.matchDomainsNoSearch | ||
| networkSettings.dnsSettings = dnsSettings | ||
| } | ||
|
|
||
| if req.hasIpv4Settings { | ||
| let ipv4Settings = NEIPv4Settings(addresses: req.ipv4Settings.addrs, subnetMasks: req.ipv4Settings.subnetMasks) | ||
| ipv4Settings.router = req.ipv4Settings.router | ||
| ipv4Settings.includedRoutes = req.ipv4Settings.includedRoutes.map { | ||
| let route = NEIPv4Route(destinationAddress: $0.destination, subnetMask: $0.mask) | ||
| route.gatewayAddress = $0.router | ||
| return route | ||
| } | ||
| ipv4Settings.excludedRoutes = req.ipv4Settings.excludedRoutes.map { | ||
| let route = NEIPv4Route(destinationAddress: $0.destination, subnetMask: $0.mask) | ||
| route.gatewayAddress = $0.router | ||
| return route | ||
| } | ||
| networkSettings.ipv4Settings = ipv4Settings | ||
| } | ||
|
|
||
| if req.hasIpv6Settings { | ||
| let ipv6Settings = NEIPv6Settings( | ||
| addresses: req.ipv6Settings.addrs, | ||
| networkPrefixLengths: req.ipv6Settings.prefixLengths.map { NSNumber(value: $0) | ||
| } | ||
| ) | ||
| ipv6Settings.includedRoutes = req.ipv6Settings.includedRoutes.map { | ||
| let route = NEIPv6Route( | ||
| destinationAddress: $0.destination, | ||
| networkPrefixLength: NSNumber(value: $0.prefixLength) | ||
| ) | ||
| route.gatewayAddress = $0.router | ||
| return route | ||
| } | ||
| ipv6Settings.excludedRoutes = req.ipv6Settings.excludedRoutes.map { | ||
| let route = NEIPv6Route( | ||
| destinationAddress: $0.destination, | ||
| networkPrefixLength: NSNumber(value: $0.prefixLength) | ||
| ) | ||
| route.gatewayAddress = $0.router | ||
| return route | ||
| } | ||
| networkSettings.ipv6Settings = ipv6Settings | ||
| } | ||
| return networkSettings | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| import Testing | ||
| @testable import VPNLib | ||
|
|
||
| @Suite(.timeLimit(.minutes(1))) | ||
| struct ConvertTests { | ||
| @Test | ||
| // swiftlint:disable:next function_body_length | ||
| func convertProtoNetworkSettingsRequest() async throws { | ||
| let req: Vpn_NetworkSettingsRequest = .with { req in | ||
| req.tunnelRemoteAddress = "10.0.0.1" | ||
| req.tunnelOverheadBytes = 20 | ||
| req.mtu = 1400 | ||
|
|
||
| req.dnsSettings = .with { dns in | ||
| dns.servers = ["8.8.8.8"] | ||
| dns.searchDomains = ["example.com"] | ||
| dns.domainName = "example.com" | ||
| dns.matchDomains = ["example.com"] | ||
| dns.matchDomainsNoSearch = false | ||
| } | ||
|
|
||
| req.ipv4Settings = .with { ipv4 in | ||
| ipv4.addrs = ["192.168.1.1"] | ||
| ipv4.subnetMasks = ["255.255.255.0"] | ||
| ipv4.router = "192.168.1.254" | ||
| ipv4.includedRoutes = [ | ||
| .with { route in | ||
| route.destination = "10.0.0.0" | ||
| route.mask = "255.0.0.0" | ||
| route.router = "192.168.1.254" | ||
| }, | ||
| ] | ||
| ipv4.excludedRoutes = [ | ||
| .with { route in | ||
| route.destination = "172.16.0.0" | ||
| route.mask = "255.240.0.0" | ||
| route.router = "192.168.1.254" | ||
| }, | ||
| ] | ||
| } | ||
|
|
||
| req.ipv6Settings = .with { ipv6 in | ||
| ipv6.addrs = ["2001:db8::1"] | ||
| ipv6.prefixLengths = [64] | ||
| ipv6.includedRoutes = [ | ||
| .with { route in | ||
| route.destination = "2001:db8::" | ||
| route.router = "2001:db8::1" | ||
| route.prefixLength = 64 | ||
| }, | ||
| ] | ||
| ipv6.excludedRoutes = [ | ||
| .with { route in | ||
| route.destination = "2001:0db8:85a3::" | ||
| route.router = "2001:db8::1" | ||
| route.prefixLength = 128 | ||
| }, | ||
| ] | ||
| } | ||
| } | ||
|
|
||
| let result = convertNetworkSettingsRequest(req) | ||
| #expect(result.tunnelRemoteAddress == req.tunnelRemoteAddress) | ||
| #expect(result.dnsSettings!.servers == req.dnsSettings.servers) | ||
| #expect(result.dnsSettings!.domainName == req.dnsSettings.domainName) | ||
| #expect(result.ipv4Settings!.addresses == req.ipv4Settings.addrs) | ||
| #expect(result.ipv4Settings!.subnetMasks == req.ipv4Settings.subnetMasks) | ||
| #expect(result.ipv6Settings!.addresses == req.ipv6Settings.addrs) | ||
| #expect(result.ipv6Settings!.networkPrefixLengths == [64]) | ||
|
|
||
| try #require(result.ipv4Settings!.includedRoutes?.count == req.ipv4Settings.includedRoutes.count) | ||
| let ipv4IncludedRoute = result.ipv4Settings!.includedRoutes![0] | ||
| let expectedIpv4IncludedRoute = req.ipv4Settings.includedRoutes[0] | ||
| #expect(ipv4IncludedRoute.destinationAddress == expectedIpv4IncludedRoute.destination) | ||
| #expect(ipv4IncludedRoute.destinationSubnetMask == expectedIpv4IncludedRoute.mask) | ||
| #expect(ipv4IncludedRoute.gatewayAddress == expectedIpv4IncludedRoute.router) | ||
|
|
||
| try #require(result.ipv4Settings!.excludedRoutes?.count == req.ipv4Settings.excludedRoutes.count) | ||
| let ipv4ExcludedRoute = result.ipv4Settings!.excludedRoutes![0] | ||
| let expectedIpv4ExcludedRoute = req.ipv4Settings.excludedRoutes[0] | ||
| #expect(ipv4ExcludedRoute.destinationAddress == expectedIpv4ExcludedRoute.destination) | ||
| #expect(ipv4ExcludedRoute.destinationSubnetMask == expectedIpv4ExcludedRoute.mask) | ||
| #expect(ipv4ExcludedRoute.gatewayAddress == expectedIpv4ExcludedRoute.router) | ||
|
|
||
| try #require(result.ipv6Settings!.includedRoutes?.count == req.ipv6Settings.includedRoutes.count) | ||
| let ipv6IncludedRoute = result.ipv6Settings!.includedRoutes![0] | ||
| let expectedIpv6IncludedRoute = req.ipv6Settings.includedRoutes[0] | ||
| #expect(ipv6IncludedRoute.destinationAddress == expectedIpv6IncludedRoute.destination) | ||
| #expect(ipv6IncludedRoute.destinationNetworkPrefixLength == 64) | ||
| #expect(ipv6IncludedRoute.gatewayAddress == expectedIpv6IncludedRoute.router) | ||
|
|
||
| try #require(result.ipv6Settings!.excludedRoutes?.count == req.ipv6Settings.excludedRoutes.count) | ||
| let ipv6ExcludedRoute = result.ipv6Settings!.excludedRoutes![0] | ||
| let expectedIpv6ExcludedRoute = req.ipv6Settings.excludedRoutes[0] | ||
| #expect(ipv6ExcludedRoute.destinationAddress == expectedIpv6ExcludedRoute.destination) | ||
| #expect(ipv6ExcludedRoute.destinationNetworkPrefixLength == 128) | ||
| #expect(ipv6ExcludedRoute.gatewayAddress == expectedIpv6ExcludedRoute.router) | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think this is worth unit testing, at least right now. We'd need to mock the PTP, the TunnelHandle, the validator, and eventually the XPC speaker, all for a relatively simple abstraction that's mostly error handling.