Extend validators to work for DNS entries as well.

This commit is contained in:
Jeroen Leenarts 2018-08-16 22:41:45 +02:00
parent 5363be2403
commit 93e2264751
2 changed files with 19 additions and 13 deletions

View File

@ -31,20 +31,28 @@ public enum EndpointValidationError: Error {
struct Endpoint {
var ipAddress: String
var port: Int32
var port: Int32?
var addressType: AddressType
init?(endpointString: String) throws {
guard let range = endpointString.range(of: ":", options: .backwards, range: nil, locale: nil) else {
throw EndpointValidationError.noIpAndPort(endpointString)
init?(endpointString: String, needsPort: Bool = true) throws {
var ipString: String
if needsPort {
guard let range = endpointString.range(of: ":", options: .backwards, range: nil, locale: nil) else {
throw EndpointValidationError.noIpAndPort(endpointString)
}
ipString = String(endpointString[..<range.lowerBound])
let portString = endpointString[range.upperBound...]
guard let port = Int32(portString), port > 0 else {
throw EndpointValidationError.invalidPort(String(portString/*parts[1]*/))
}
self.port = port
} else {
ipString = endpointString
}
let ipString = endpointString[..<range.lowerBound].replacingOccurrences(of: "[", with: "").replacingOccurrences(of: "]", with: "")
let portString = endpointString[range.upperBound...]
guard let port = Int32(portString), port > 0 else {
throw EndpointValidationError.invalidPort(String(portString/*parts[1]*/))
}
ipString = ipString.replacingOccurrences(of: "[", with: "").replacingOccurrences(of: "]", with: "")
ipAddress = String(ipString)
let addressType = validateIpAddress(ipToValidate: ipAddress)
@ -52,8 +60,6 @@ struct Endpoint {
throw EndpointValidationError.invalidIP(ipAddress)
}
self.addressType = addressType
self.port = port
}
}

View File

@ -29,7 +29,7 @@ extension Interface {
try dns?.commaSeparatedToArray().forEach { address in
do {
try _ = Endpoint(endpointString: address)
try _ = Endpoint(endpointString: address, needsPort: false)
} catch {
throw InterfaceValidationError.invalidDNSServer(cause: error)
}