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

Model: Endpoint host should not have invalid characters

This commit is contained in:
Roopesh Chander 2018-10-23 16:14:10 +05:30
parent c8fa6850c2
commit 1b5ab9a72f
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
WireGuard/WireGuard/Model/Endpoint.swift
View File

@ -23,26 +23,29 @@ extension Endpoint {
// Separation of host and port is based on 'parse_endpoint' function in // Separation of host and port is based on 'parse_endpoint' function in
// https://git.zx2c4.com/WireGuard/tree/src/tools/config.c // https://git.zx2c4.com/WireGuard/tree/src/tools/config.c
guard (!string.isEmpty) else { return nil } guard (!string.isEmpty) else { return nil }
let startOfPort: String.Index
let hostString: String
if (string.first! == "[") { if (string.first! == "[") {
// Look for IPv6-style endpoint, like [::1]:80 // Look for IPv6-style endpoint, like [::1]:80
let startOfHost = string.index(after: string.startIndex) let startOfHost = string.index(after: string.startIndex)
guard let endOfHost = string.dropFirst().firstIndex(of: "]") else { return nil } guard let endOfHost = string.dropFirst().firstIndex(of: "]") else { return nil }
let afterEndOfHost = string.index(after: endOfHost) let afterEndOfHost = string.index(after: endOfHost)
guard (string[afterEndOfHost] == ":") else { return nil } guard (string[afterEndOfHost] == ":") else { return nil }
let startOfPort = string.index(after: afterEndOfHost) startOfPort = string.index(after: afterEndOfHost)
let hostString = String(string[startOfHost ..< endOfHost]) hostString = String(string[startOfHost ..< endOfHost])
guard let endpointPort = NWEndpoint.Port(String(string[startOfPort ..< string.endIndex])) else { return nil }
host = NWEndpoint.Host(hostString)
port = endpointPort
} else { } else {
// Look for an IPv4-style endpoint, like 127.0.0.1:80 // Look for an IPv4-style endpoint, like 127.0.0.1:80
guard let endOfHost = string.firstIndex(of: ":") else { return nil } guard let endOfHost = string.firstIndex(of: ":") else { return nil }
let startOfPort = string.index(after: endOfHost) startOfPort = string.index(after: endOfHost)
let hostString = String(string[string.startIndex ..< endOfHost]) hostString = String(string[string.startIndex ..< endOfHost])
guard let endpointPort = NWEndpoint.Port(String(string[startOfPort ..< string.endIndex])) else { return nil }
host = NWEndpoint.Host(hostString)
port = endpointPort
} }
guard let endpointPort = NWEndpoint.Port(String(string[startOfPort ..< string.endIndex])) else { return nil }
let invalidCharacterIndex = hostString.unicodeScalars.firstIndex { (c) -> Bool in
return !CharacterSet.urlHostAllowed.contains(c)
}
guard (invalidCharacterIndex == nil) else { return nil }
host = NWEndpoint.Host(hostString)
port = endpointPort
} }
func stringRepresentation() -> String { func stringRepresentation() -> String {
switch (host) { switch (host) {