Added validation before saving any tunnels

Signed-off-by: Eric Kuck <eric@bluelinelabs.com>
This commit is contained in:
Eric Kuck
2018-08-15 17:34:16 -05:00
parent 449bd53b1e
commit b306149222
12 changed files with 340 additions and 19 deletions
+46
View File
@@ -28,6 +28,7 @@ public enum EndpointValidationError: Error {
}
}
}
struct Endpoint {
var ipAddress: String
var port: Int32
@@ -72,3 +73,48 @@ func validateIpAddress(ipToValidate: String) -> AddressType {
return .other
}
public enum CIDRAddressValidationError: Error {
case noIpAndSubnet(String)
case invalidIP(String)
case invalidSubnet(String)
var localizedDescription: String {
switch self {
case .noIpAndSubnet:
return NSLocalizedString("CIDRAddressValidationError", comment: "Error message for malformed CIDR address.")
case .invalidIP:
return NSLocalizedString("CIDRAddressValidationError", comment: "Error message for invalid address ip.")
case .invalidSubnet:
return NSLocalizedString("CIDRAddressValidationError", comment: "Error message invalid address subnet.")
}
}
}
struct CIDRAddress {
var ipAddress: String
var subnet: Int32
var addressType: AddressType
init?(stringRepresentation: String) throws {
guard let range = stringRepresentation.range(of: "/", options: .backwards, range: nil, locale: nil) else {
throw CIDRAddressValidationError.noIpAndSubnet(stringRepresentation)
}
let ipString = stringRepresentation[..<range.lowerBound].replacingOccurrences(of: "[", with: "").replacingOccurrences(of: "]", with: "")
let subnetString = stringRepresentation[range.upperBound...]
guard let subnet = Int32(subnetString) else {
throw CIDRAddressValidationError.invalidSubnet(String(subnetString))
}
ipAddress = String(ipString)
let addressType = validateIpAddress(ipToValidate: ipAddress)
guard addressType == .IPv4 || addressType == .IPv6 else {
throw CIDRAddressValidationError.invalidIP(ipAddress)
}
self.addressType = addressType
self.subnet = subnet
}
}