macOS: Refactor config file parsing

- To report more fine grained errors - To make the parse errors conform to WireGuardAppError Signed-off-by: Roopesh Chander <roop@roopc.net>
2019-01-08 15:44:17 +05:30
parent 96fa6d3ba6
commit c2a6241b5c
4 changed files with 147 additions and 26 deletions
@@ -256,3 +256,25 @@

 "macEditDiscard" = "Discard";
 "macEditSave" = "Save";
+
+"macAlertInvalidLine (%@)" = "Invalid line: '%@'.";
+
+"macAlertNoInterface" = "Configuration must have an 'Interface' section.";
+"macAlertMultipleInterfaces" = "Configuration must have only one 'Interface' section.";
+"macAlertPrivateKeyInvalid" = "Private key is invalid.";
+"macAlertListenPortInvalid (%@)" = "Listen port '%@' is invalid.";
+"macAlertAddressInvalid (%@)" = "Address '%@' is invalid.";
+"macAlertDNSInvalid (%@)" = "DNS '%@' is invalid.";
+"macAlertMTUInvalid (%@)" = "MTU '%@' is invalid.";
+
+"macAlertUnrecognizedInterfaceKey (%@)" = "Interface contains unrecognized key '%@'";
+"macAlertInfoUnrecognizedInterfaceKey" = "Valid keys are: 'PrivateKey', 'ListenPort', 'Address', 'DNS' and 'MTU'.";
+
+"macAlertPublicKeyInvalid" = "Public key is invalid";
+"macAlertPreSharedKeyInvalid" = "Preshared key is invalid";
+"macAlertAllowedIPInvalid (%@)" = "Allowed IP '%@' is invalid";
+"macAlertEndpointInvalid (%@)" = "Endpoint '%@' is invalid";
+"macAlertPersistentKeepliveInvalid (%@)" = "Persistent keepalive value '%@' is invalid";
+
+"macAlertUnrecognizedPeerKey (%@)" = "Peer contains unrecognized key '%@'";
+"macAlertInfoUnrecognizedPeerKey" = "Valid keys are: 'PublicKey', 'PresharedKey', 'AllowedIPs', 'Endpoint' and 'PersistentKeepalive'";
@@ -0,0 +1,50 @@
+// SPDX-License-Identifier: MIT
+// Copyright © 2018 WireGuard LLC. All Rights Reserved.
+
+import Cocoa
+
+// We have this in a separate file because we don't want the network extension
+// code to see WireGuardAppError and tr(). Also, this extension is used only on macOS.
+
+extension TunnelConfiguration.ParseError: WireGuardAppError {
+    var alertText: AlertText {
+        switch self {
+        case .invalidLine(let line):
+            return (tr(format: "macAlertInvalidLine (%@)", String(line)), "")
+        case .noInterface:
+            return (tr("macAlertNoInterface"), "")
+        case .multipleInterfaces:
+            return (tr("macAlertMultipleInterfaces"), "")
+        case .interfaceHasNoPrivateKey:
+            return (tr("alertInvalidInterfaceMessagePrivateKeyRequired"), tr("alertInvalidInterfaceMessagePrivateKeyInvalid"))
+        case .interfaceHasInvalidPrivateKey:
+            return (tr("macAlertPrivateKeyInvalid"), tr("alertInvalidInterfaceMessagePrivateKeyInvalid"))
+        case .interfaceHasInvalidListenPort(let value):
+            return (tr(format: "macAlertListenPortInvalid (%@)", value), tr("alertInvalidInterfaceMessageListenPortInvalid"))
+        case .interfaceHasInvalidAddress(let value):
+            return (tr(format: "macAlertAddressInvalid (%@)", value), tr("alertInvalidInterfaceMessageAddressInvalid"))
+        case .interfaceHasInvalidDNS(let value):
+            return (tr(format: "macAlertDNSInvalid (%@)", value), tr("alertInvalidInterfaceMessageDNSInvalid"))
+        case .interfaceHasInvalidMTU(let value):
+            return (tr(format: "macAlertMTUInvalid (%@)", value), tr("alertInvalidInterfaceMessageMTUInvalid"))
+        case .interfaceHasUnrecognizedKey(let value):
+            return (tr(format: "macAlertUnrecognizedInterfaceKey (%@)", value), tr("macAlertInfoUnrecognizedInterfaceKey"))
+        case .peerHasNoPublicKey:
+            return (tr("alertInvalidPeerMessagePublicKeyRequired"), tr("alertInvalidPeerMessagePublicKeyInvalid"))
+        case .peerHasInvalidPublicKey:
+            return (tr("macAlertPublicKeyInvalid"), tr("alertInvalidPeerMessagePublicKeyInvalid"))
+        case .peerHasInvalidPreSharedKey:
+            return (tr("macAlertPreSharedKeyInvalid"), tr("alertInvalidPeerMessagePreSharedKeyInvalid"))
+        case .peerHasInvalidAllowedIP(let value):
+            return (tr(format: "macAlertAllowedIPInvalid (%@)", value), tr("alertInvalidPeerMessageAllowedIPsInvalid"))
+        case .peerHasInvalidEndpoint(let value):
+            return (tr(format: "macAlertEndpointInvalid (%@)", value), tr("alertInvalidPeerMessageEndpointInvalid"))
+        case .peerHasInvalidPersistentKeepAlive(let value):
+            return (tr(format: "macAlertPersistentKeepliveInvalid (%@)", value), tr("alertInvalidPeerMessagePersistentKeepaliveInvalid"))
+        case .peerHasUnrecognizedKey(let value):
+            return (tr(format: "macAlertUnrecognizedPeerKey (%@)", value), tr("macAlertInfoUnrecognizedPeerKey"))
+        case .multiplePeersWithSamePublicKey:
+            return (tr("alertInvalidPeerMessagePublicKeyDuplicated"), "")
+        }
+    }
+}