passepartoutvpn
/
tunnelkit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refine linter rules excepting a few

This commit is contained in:
Davide De Rosa 2023-04-20 21:56:22 +02:00
parent 0c77062add
commit d8563e7f15
6 changed files with 71 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Demo/.swiftlint.yml Normal file
View File

@ -0,0 +1,12 @@
analyzer_rules:
- unused_declaration
- unused_import
disabled_rules:
- cyclomatic_complexity
- file_length
- force_cast
- function_body_length
- identifier_name
- line_length
- nesting
- todo

63
Demo/Demo/Configuration.swift
View File

@ -88,20 +88,32 @@ aeb893d9a96d1f15519bb3c4dcb40ee3
-----END OpenVPN Static key V1-----
""", direction: .client)!
static func make(_ title: String, appGroup: String, hostname: String, port: UInt16, socketType: SocketType) -> OpenVPN.ProviderConfiguration {
struct Parameters {
let title: String
let appGroup: String
let hostname: String
let port: UInt16
let socketType: SocketType
}
static func make(params: Parameters) -> OpenVPN.ProviderConfiguration {
var builder = OpenVPN.ConfigurationBuilder()
builder.ca = ca
builder.cipher = .aes256cbc
builder.digest = .sha512
builder.compressionFraming = .compLZO
builder.renegotiatesAfter = nil
builder.remotes = [Endpoint(hostname, EndpointProtocol(socketType, port))]
builder.remotes = [Endpoint(params.hostname, EndpointProtocol(params.socketType, params.port))]
builder.tlsWrap = TLSWrap(strategy: .auth, key: tlsKey)
builder.mtu = 1350
builder.routingPolicies = [.IPv4, .IPv6]
let cfg = builder.build()
var providerConfiguration = OpenVPN.ProviderConfiguration(title, appGroup: appGroup, configuration: cfg)
var providerConfiguration = OpenVPN.ProviderConfiguration(params.title, appGroup: params.appGroup, configuration: cfg)
providerConfiguration.shouldDebug = true
providerConfiguration.masksPrivateData = false
return providerConfiguration
@ -110,24 +122,43 @@ aeb893d9a96d1f15519bb3c4dcb40ee3
}
extension WireGuard {
struct Parameters {
let title: String
let appGroup: String
let clientPrivateKey: String
let clientAddress: String
let serverPublicKey: String
let serverAddress: String
let serverPort: String
}
struct DemoConfiguration {
static func make(
_ title: String,
appGroup: String,
clientPrivateKey: String,
clientAddress: String,
serverPublicKey: String,
serverAddress: String,
serverPort: String
) -> WireGuard.ProviderConfiguration? {
var builder = try! WireGuard.ConfigurationBuilder(clientPrivateKey)
builder.addresses = [clientAddress]
static func make(params: Parameters) -> WireGuard.ProviderConfiguration? {
var builder: WireGuard.ConfigurationBuilder
do {
builder = try WireGuard.ConfigurationBuilder(params.clientPrivateKey)
} catch {
print(">>> \(error)")
return nil
}
builder.addresses = [params.clientAddress]
builder.dnsServers = ["1.1.1.1", "1.0.0.1"]
try! builder.addPeer(serverPublicKey, endpoint: "\(serverAddress):\(serverPort)")
do {
try builder.addPeer(params.serverPublicKey, endpoint: "\(params.serverAddress):\(params.serverPort)")
} catch {
print(">>> \(error)")
return nil
}
builder.addDefaultGatewayIPv4(toPeer: 0)
let cfg = builder.build()
return WireGuard.ProviderConfiguration(title, appGroup: appGroup, configuration: cfg)
return WireGuard.ProviderConfiguration(params.title, appGroup: params.appGroup, configuration: cfg)
}
}
}

6
Demo/Demo/iOS/OpenVPNViewController.swift
View File

@ -108,13 +108,13 @@ class OpenVPNViewController: UIViewController {
let socketType: SocketType = switchTCP.isOn ? .tcp : .udp
let credentials = OpenVPN.Credentials(textUsername.text!, textPassword.text!)
cfg = OpenVPN.DemoConfiguration.make(
"TunnelKit.OpenVPN",
cfg = OpenVPN.DemoConfiguration.make(params: .init(
title: "TunnelKit.OpenVPN",
appGroup: appGroup,
hostname: hostname,
port: port,
socketType: socketType
)
))
cfg?.username = credentials.username
let passwordReference: Data

6
Demo/Demo/iOS/WireGuardViewController.swift
View File

@ -94,15 +94,15 @@ class WireGuardViewController: UIViewController {
let serverAddress = textServerAddress.text!
let serverPort = textServerPort.text!
guard let cfg = WireGuard.DemoConfiguration.make(
"TunnelKit.WireGuard",
guard let cfg = WireGuard.DemoConfiguration.make(params: .init(
title: "TunnelKit.WireGuard",
appGroup: appGroup,
clientPrivateKey: clientPrivateKey,
clientAddress: clientAddress,
serverPublicKey: serverPublicKey,
serverAddress: serverAddress,
serverPort: serverPort
) else {
)) else {
print("Configuration incomplete")
return
}

6
Demo/Demo/macOS/OpenVPNViewController.swift
View File

@ -99,13 +99,13 @@ class OpenVPNViewController: NSViewController {
let port = UInt16(textPort.stringValue)!
let credentials = OpenVPN.Credentials(textUsername.stringValue, textPassword.stringValue)
cfg = OpenVPN.DemoConfiguration.make(
"TunnelKit.OpenVPN",
cfg = OpenVPN.DemoConfiguration.make(params: .init(
title: "TunnelKit.OpenVPN",
appGroup: appGroup,
hostname: hostname,
port: port,
socketType: .udp
)
))
cfg?.username = credentials.username
let passwordReference: Data

6
Demo/Demo/macOS/WireGuardViewController.swift
View File

@ -94,15 +94,15 @@ class WireGuardViewController: NSViewController {
let serverAddress = textServerAddress.stringValue
let serverPort = textServerPort.stringValue
guard let cfg = WireGuard.DemoConfiguration.make(
"TunnelKit.WireGuard",
guard let cfg = WireGuard.DemoConfiguration.make(params: .init(
title: "TunnelKit.WireGuard",
appGroup: appGroup,
clientPrivateKey: clientPrivateKey,
clientAddress: clientAddress,
serverPublicKey: serverPublicKey,
serverAddress: serverAddress,
serverPort: serverPort
) else {
)) else {
print("Configuration incomplete")
return
}