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

Parsing: Always error on unrecognized keys 

Signed-off-by: Roopesh Chander <roop@roopc.net>
This commit is contained in:
Roopesh Chander 2019-01-08 23:36:27 +05:30
parent fc03c635c1
commit 94c4922913
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
WireGuard/Shared/Model/TunnelConfiguration+WgQuickConfig.swift
View File

@ -34,7 +34,7 @@ extension TunnelConfiguration {
} }
//swiftlint:disable:next function_body_length cyclomatic_complexity //swiftlint:disable:next function_body_length cyclomatic_complexity
convenience init(fromWgQuickConfig wgQuickConfig: String, called name: String? = nil, ignoreUnrecognizedKeys: Bool = true) throws { convenience init(fromWgQuickConfig wgQuickConfig: String, called name: String? = nil) throws {
var interfaceConfiguration: InterfaceConfiguration? var interfaceConfiguration: InterfaceConfiguration?
var peerConfigurations = [PeerConfiguration]() var peerConfigurations = [PeerConfiguration]()
@ -71,17 +71,15 @@ extension TunnelConfiguration {
} else { } else {
attributes[key] = value attributes[key] = value
} }
if !ignoreUnrecognizedKeys { let interfaceSectionKeys: Set<String> = ["privatekey", "listenport", "address", "dns", "mtu"]
let interfaceSectionKeys: Set<String> = ["privatekey", "listenport", "address", "dns", "mtu"] let peerSectionKeys: Set<String> = ["publickey", "presharedkey", "allowedips", "endpoint", "persistentkeepalive"]
let peerSectionKeys: Set<String> = ["publickey", "presharedkey", "allowedips", "endpoint", "persistentkeepalive"] if parserState == .inInterfaceSection {
if parserState == .inInterfaceSection { guard interfaceSectionKeys.contains(key) else {
guard interfaceSectionKeys.contains(key) else { throw ParseError.interfaceHasUnrecognizedKey(keyWithCase)
throw ParseError.interfaceHasUnrecognizedKey(keyWithCase) }
} } else if parserState == .inPeerSection {
} else if parserState == .inPeerSection { guard peerSectionKeys.contains(key) else {
guard peerSectionKeys.contains(key) else { throw ParseError.peerHasUnrecognizedKey(keyWithCase)
throw ParseError.peerHasUnrecognizedKey(keyWithCase)
}
} }
} }
} else if lowercasedLine != "[interface]" && lowercasedLine != "[peer]" { } else if lowercasedLine != "[interface]" && lowercasedLine != "[peer]" {

2
WireGuard/WireGuard/UI/macOS/ViewController/TunnelEditViewController.swift
View File

@ -128,7 +128,7 @@ class TunnelEditViewController: NSViewController {
return return
} }
do { do {
let tunnelConfiguration = try TunnelConfiguration(fromWgQuickConfig: textView.string, called: nameRow.value, ignoreUnrecognizedKeys: false) let tunnelConfiguration = try TunnelConfiguration(fromWgQuickConfig: textView.string, called: nameRow.value)
let onDemandSetting = ActivateOnDemandSetting.defaultSetting let onDemandSetting = ActivateOnDemandSetting.defaultSetting
tunnelsManager.modify(tunnel: tunnel, tunnelConfiguration: tunnelConfiguration, activateOnDemandSetting: onDemandSetting) { [weak self] error in tunnelsManager.modify(tunnel: tunnel, tunnelConfiguration: tunnelConfiguration, activateOnDemandSetting: onDemandSetting) { [weak self] error in
if let error = error { if let error = error {