passepartoutvpn
/
passepartout-apple
mirror of https://github.com/passepartoutvpn/passepartout-apple.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'restrict-unrecognized-options'

This commit is contained in:
Davide De Rosa 2018-10-18 11:07:41 +02:00
parent e0e44c4150 4774c2705f
commit acb57749db
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Passepartout/Sources/VPN/TunnelKitProvider+FileConfiguration.swift
View File

@ -132,6 +132,9 @@ extension TunnelKitProvider.Configuration {
return return
} }
defaultProto = TunnelKitProvider.SocketType(protoString: str) defaultProto = TunnelKitProvider.SocketType(protoString: str)
if defaultProto == nil {
unsupportedError = ApplicationError.unsupportedConfiguration(option: "proto \(str)")
}
} }
Regex.port.enumerateArguments(in: line) { Regex.port.enumerateArguments(in: line) {
guard let str = $0.first else { guard let str = $0.first else {
@ -158,12 +161,18 @@ extension TunnelKitProvider.Configuration {
return return
} }
cipher = SessionProxy.Cipher(rawValue: rawValue.uppercased()) cipher = SessionProxy.Cipher(rawValue: rawValue.uppercased())
if cipher == nil {
unsupportedError = ApplicationError.unsupportedConfiguration(option: "cipher \(rawValue)")
}
} }
Regex.auth.enumerateArguments(in: line) { Regex.auth.enumerateArguments(in: line) {
guard let rawValue = $0.first else { guard let rawValue = $0.first else {
return return
} }
digest = SessionProxy.Digest(rawValue: rawValue.uppercased()) digest = SessionProxy.Digest(rawValue: rawValue.uppercased())
if digest == nil {
unsupportedError = ApplicationError.unsupportedConfiguration(option: "auth \(rawValue)")
}
} }
Regex.compLZO.enumerateComponents(in: line) { _ in Regex.compLZO.enumerateComponents(in: line) { _ in
compressionFraming = .compLZO compressionFraming = .compLZO