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

Config file parser: Be case-insensitive to attribute keys in the config file

This commit is contained in:
Roopesh Chander 2018-11-19 12:34:53 +05:30
parent ccd8e784f3
commit 643e988f74
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
WireGuard/WireGuard/ConfigFile/WgQuickConfigFileParser.swift
View File

@ -26,16 +26,16 @@ class WgQuickConfigFileParser {
func collate(interfaceAttributes attributes: [String: String]) -> InterfaceConfiguration? { func collate(interfaceAttributes attributes: [String: String]) -> InterfaceConfiguration? {
// required wg fields // required wg fields
guard let privateKeyString = attributes["PrivateKey"] else { return nil } guard let privateKeyString = attributes["privatekey"] else { return nil }
guard let privateKey = Data(base64Encoded: privateKeyString), privateKey.count == 32 else { return nil } guard let privateKey = Data(base64Encoded: privateKeyString), privateKey.count == 32 else { return nil }
var interface = InterfaceConfiguration(name: name, privateKey: privateKey) var interface = InterfaceConfiguration(name: name, privateKey: privateKey)
// other wg fields // other wg fields
if let listenPortString = attributes["ListenPort"] { if let listenPortString = attributes["listenport"] {
guard let listenPort = UInt16(listenPortString) else { return nil } guard let listenPort = UInt16(listenPortString) else { return nil }
interface.listenPort = listenPort interface.listenPort = listenPort
} }
// wg-quick fields // wg-quick fields
if let addressesString = attributes["Address"] { if let addressesString = attributes["address"] {
var addresses: [IPAddressRange] = [] var addresses: [IPAddressRange] = []
for addressString in addressesString.split(separator: ",") { for addressString in addressesString.split(separator: ",") {
let trimmedString = addressString.trimmingCharacters(in: .whitespaces) let trimmedString = addressString.trimmingCharacters(in: .whitespaces)
@ -44,7 +44,7 @@ class WgQuickConfigFileParser {
} }
interface.addresses = addresses interface.addresses = addresses
} }
if let dnsString = attributes["DNS"] { if let dnsString = attributes["dns"] {
var dnsServers: [DNSServer] = [] var dnsServers: [DNSServer] = []
for dnsServerString in dnsString.split(separator: ",") { for dnsServerString in dnsString.split(separator: ",") {
let trimmedString = dnsServerString.trimmingCharacters(in: .whitespaces) let trimmedString = dnsServerString.trimmingCharacters(in: .whitespaces)
@ -53,7 +53,7 @@ class WgQuickConfigFileParser {
} }
interface.dns = dnsServers interface.dns = dnsServers
} }
if let mtuString = attributes["MTU"] { if let mtuString = attributes["mtu"] {
guard let mtu = UInt16(mtuString) else { return nil } guard let mtu = UInt16(mtuString) else { return nil }
interface.mtu = mtu interface.mtu = mtu
} }
@ -62,15 +62,15 @@ class WgQuickConfigFileParser {
func collate(peerAttributes attributes: [String: String]) -> PeerConfiguration? { func collate(peerAttributes attributes: [String: String]) -> PeerConfiguration? {
// required wg fields // required wg fields
guard let publicKeyString = attributes["PublicKey"] else { return nil } guard let publicKeyString = attributes["publickey"] else { return nil }
guard let publicKey = Data(base64Encoded: publicKeyString), publicKey.count == 32 else { return nil } guard let publicKey = Data(base64Encoded: publicKeyString), publicKey.count == 32 else { return nil }
var peer = PeerConfiguration(publicKey: publicKey) var peer = PeerConfiguration(publicKey: publicKey)
// wg fields // wg fields
if let preSharedKeyString = attributes["PresharedKey"] { if let preSharedKeyString = attributes["presharedkey"] {
guard let preSharedKey = Data(base64Encoded: preSharedKeyString), preSharedKey.count == 32 else { return nil } guard let preSharedKey = Data(base64Encoded: preSharedKeyString), preSharedKey.count == 32 else { return nil }
peer.preSharedKey = preSharedKey peer.preSharedKey = preSharedKey
} }
if let allowedIPsString = attributes["AllowedIPs"] { if let allowedIPsString = attributes["allowedips"] {
var allowedIPs: [IPAddressRange] = [] var allowedIPs: [IPAddressRange] = []
for allowedIPString in allowedIPsString.split(separator: ",") { for allowedIPString in allowedIPsString.split(separator: ",") {
let trimmedString = allowedIPString.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines) let trimmedString = allowedIPString.trimmingCharacters(in: CharacterSet.whitespacesAndNewlines)
@ -79,11 +79,11 @@ class WgQuickConfigFileParser {
} }
peer.allowedIPs = allowedIPs peer.allowedIPs = allowedIPs
} }
if let endpointString = attributes["Endpoint"] { if let endpointString = attributes["endpoint"] {
guard let endpoint = Endpoint(from: endpointString) else { return nil } guard let endpoint = Endpoint(from: endpointString) else { return nil }
peer.endpoint = endpoint peer.endpoint = endpoint
} }
if let persistentKeepAliveString = attributes["PersistentKeepalive"] { if let persistentKeepAliveString = attributes["persistentkeepalive"] {
guard let persistentKeepAlive = UInt16(persistentKeepAliveString) else { return nil } guard let persistentKeepAlive = UInt16(persistentKeepAliveString) else { return nil }
peer.persistentKeepAlive = persistentKeepAlive peer.persistentKeepAlive = persistentKeepAlive
} }
@ -113,9 +113,9 @@ class WgQuickConfigFileParser {
if let equalsIndex = line.firstIndex(of: "=") { if let equalsIndex = line.firstIndex(of: "=") {
// Line contains an attribute // Line contains an attribute
let key = line[..<equalsIndex].trimmingCharacters(in: .whitespaces) let key = line[..<equalsIndex].trimmingCharacters(in: .whitespaces).lowercased()
let value = line[line.index(equalsIndex, offsetBy: 1)...].trimmingCharacters(in: .whitespaces) let value = line[line.index(equalsIndex, offsetBy: 1)...].trimmingCharacters(in: .whitespaces)
let keysWithMultipleEntriesAllowed: Set<String> = ["Address", "AllowedIPs", "DNS"] let keysWithMultipleEntriesAllowed: Set<String> = ["address", "allowedips", "dns"]
if let presentValue = attributes[key], keysWithMultipleEntriesAllowed.contains(key) { if let presentValue = attributes[key], keysWithMultipleEntriesAllowed.contains(key) {
attributes[key] = presentValue + "," + value attributes[key] = presentValue + "," + value
} else { } else {