diff options
author | Eric Kuck <eric@bluelinelabs.com> | 2018-08-15 17:34:16 -0500 |
---|---|---|
committer | Eric Kuck <eric@bluelinelabs.com> | 2018-08-15 17:34:16 -0500 |
commit | b306149222290f659a08902810141f53643f1365 (patch) | |
tree | 43ef54fb537928c1b200a2fa7e4bc8aa98f6ac97 /Shared | |
parent | Apply endpoint config to routes. (diff) | |
download | wireguard-apple-b306149222290f659a08902810141f53643f1365.tar.xz wireguard-apple-b306149222290f659a08902810141f53643f1365.zip |
Added validation before saving any tunnels
Signed-off-by: Eric Kuck <eric@bluelinelabs.com>
Diffstat (limited to 'Shared')
-rw-r--r-- | Shared/Validators.swift | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/Shared/Validators.swift b/Shared/Validators.swift index 17c8368..aef1019 100644 --- a/Shared/Validators.swift +++ b/Shared/Validators.swift @@ -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 + } +} |