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

Parsing: Error on duplicate entries 

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

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

@ -30,6 +30,7 @@ extension TunnelConfiguration {
case peerHasInvalidPersistentKeepAlive(String) case peerHasInvalidPersistentKeepAlive(String)
case peerHasUnrecognizedKey(String) case peerHasUnrecognizedKey(String)
case multiplePeersWithSamePublicKey case multiplePeersWithSamePublicKey
case multipleEntriesForKey(String)
} }
//swiftlint:disable:next function_body_length cyclomatic_complexity //swiftlint:disable:next function_body_length cyclomatic_complexity
@ -61,8 +62,12 @@ extension TunnelConfiguration {
let key = keyWithCase.lowercased() let key = keyWithCase.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] {
attributes[key] = presentValue + "," + value if keysWithMultipleEntriesAllowed.contains(key) {
attributes[key] = presentValue + "," + value
} else {
throw ParseError.multipleEntriesForKey(keyWithCase)
}
} else { } else {
attributes[key] = value attributes[key] = value
} }

2
WireGuard/WireGuard/Base.lproj/Localizable.strings
View File

@ -281,3 +281,5 @@
"macAlertUnrecognizedPeerKey (%@)" = "Peer contains unrecognized key '%@'"; "macAlertUnrecognizedPeerKey (%@)" = "Peer contains unrecognized key '%@'";
"macAlertInfoUnrecognizedPeerKey" = "Valid keys are: 'PublicKey', 'PresharedKey', 'AllowedIPs', 'Endpoint' and 'PersistentKeepalive'"; "macAlertInfoUnrecognizedPeerKey" = "Valid keys are: 'PublicKey', 'PresharedKey', 'AllowedIPs', 'Endpoint' and 'PersistentKeepalive'";
"macAlertMultipleEntriesForKey (%@)" = "There should be only one entry per section for key '%@'";

2
WireGuard/WireGuard/UI/macOS/ParseError+WireGuardAppError.swift
View File

@ -45,6 +45,8 @@ extension TunnelConfiguration.ParseError: WireGuardAppError {
return (tr(format: "macAlertUnrecognizedPeerKey (%@)", value), tr("macAlertInfoUnrecognizedPeerKey")) return (tr(format: "macAlertUnrecognizedPeerKey (%@)", value), tr("macAlertInfoUnrecognizedPeerKey"))
case .multiplePeersWithSamePublicKey: case .multiplePeersWithSamePublicKey:
return (tr("alertInvalidPeerMessagePublicKeyDuplicated"), "") return (tr("alertInvalidPeerMessagePublicKeyDuplicated"), "")
case .multipleEntriesForKey(let value):
return (tr(format: "macAlertMultipleEntriesForKey (%@)", value), "")
} }
} }
} }