providerConfiguration is now a WgQuickConfig

Signed-off-by: Eric Kuck <eric@bluelinelabs.com>

1 files changed, 63 insertions, 27 deletions

diff --git a/WireGuard/WireGuard/ConfigFile/WgQuickConfigFileParser.swift b/WireGuard/Shared/TunnelConfiguration+WgQuickConfig.swift
index f4c52c2..9121426 100644
--- a/WireGuard/WireGuard/ConfigFile/WgQuickConfigFileParser.swift
+++ b/WireGuard/Shared/TunnelConfiguration+WgQuickConfig.swift
@@ -3,14 +3,14 @@
 
 import Foundation
 
-class WgQuickConfigFileParser {
-
+extension TunnelConfiguration {
+    
     enum ParserState {
         case inInterfaceSection
         case inPeerSection
         case notInASection
     }
-
+    
     enum ParseError: Error {
         case invalidLine(_ line: String.SubSequence)
         case noInterface
@@ -19,19 +19,17 @@ class WgQuickConfigFileParser {
         case multiplePeersWithSamePublicKey
         case invalidPeer
     }
-
+    
     //swiftlint:disable:next cyclomatic_complexity function_body_length
-    static func parse(_ text: String, name: String) throws -> TunnelConfiguration {
-        assert(!name.isEmpty)
-
+    convenience init(_ wgQuickConfig: String, name: String?) throws {
         var interfaceConfiguration: InterfaceConfiguration?
         var peerConfigurations = [PeerConfiguration]()
-
-        let lines = text.split(separator: "\n")
-
+        
+        let lines = wgQuickConfig.split(separator: "\n")
+        
         var parserState = ParserState.notInASection
         var attributes = [String: String]()
-
+        
         for (lineIndex, line) in lines.enumerated() {
             var trimmedLine: String
             if let commentRange = line.range(of: "#") {
@@ -39,12 +37,12 @@ class WgQuickConfigFileParser {
             } else {
                 trimmedLine = String(line)
             }
-
+            
             trimmedLine = trimmedLine.trimmingCharacters(in: .whitespaces)
-
+            
             guard !trimmedLine.isEmpty else { continue }
             let lowercasedLine = line.lowercased()
-
+            
             if let equalsIndex = line.firstIndex(of: "=") {
                 // Line contains an attribute
                 let key = line[..<equalsIndex].trimmingCharacters(in: .whitespaces).lowercased()
@@ -58,21 +56,21 @@ class WgQuickConfigFileParser {
             } else if lowercasedLine != "[interface]" && lowercasedLine != "[peer]" {
                 throw ParseError.invalidLine(line)
             }
-
+            
             let isLastLine = lineIndex == lines.count - 1
-
+            
             if isLastLine || lowercasedLine == "[interface]" || lowercasedLine == "[peer]" {
                 // Previous section has ended; process the attributes collected so far
                 if parserState == .inInterfaceSection {
-                    guard let interface = collate(interfaceAttributes: attributes, name: name) else { throw ParseError.invalidInterface }
+                    guard let interface = TunnelConfiguration.collate(interfaceAttributes: attributes, name: name) else { throw ParseError.invalidInterface }
                     guard interfaceConfiguration == nil else { throw ParseError.multipleInterfaces }
                     interfaceConfiguration = interface
                 } else if parserState == .inPeerSection {
-                    guard let peer = collate(peerAttributes: attributes) else { throw ParseError.invalidPeer }
+                    guard let peer = TunnelConfiguration.collate(peerAttributes: attributes) else { throw ParseError.invalidPeer }
                     peerConfigurations.append(peer)
                 }
             }
-
+            
             if lowercasedLine == "[interface]" {
                 parserState = .inInterfaceSection
                 attributes.removeAll()
@@ -81,23 +79,61 @@ class WgQuickConfigFileParser {
                 attributes.removeAll()
             }
         }
-
+        
         let peerPublicKeysArray = peerConfigurations.map { $0.publicKey }
         let peerPublicKeysSet = Set<Data>(peerPublicKeysArray)
         if peerPublicKeysArray.count != peerPublicKeysSet.count {
             throw ParseError.multiplePeersWithSamePublicKey
         }
-
+        
         if let interfaceConfiguration = interfaceConfiguration {
-            let tunnelConfiguration = TunnelConfiguration(interface: interfaceConfiguration, peers: peerConfigurations)
-            return tunnelConfiguration
+            self.init(interface: interfaceConfiguration, peers: peerConfigurations)
         } else {
             throw ParseError.noInterface
         }
     }
-
+    
+    func asWgQuickConfig() -> String {
+        var output = "[Interface]\n"
+        output.append("PrivateKey = \(interface.privateKey.base64EncodedString())\n")
+        if let listenPort = interface.listenPort {
+            output.append("ListenPort = \(listenPort)\n")
+        }
+        if !interface.addresses.isEmpty {
+            let addressString = interface.addresses.map { $0.stringRepresentation }.joined(separator: ", ")
+            output.append("Address = \(addressString)\n")
+        }
+        if !interface.dns.isEmpty {
+            let dnsString = interface.dns.map { $0.stringRepresentation }.joined(separator: ", ")
+            output.append("DNS = \(dnsString)\n")
+        }
+        if let mtu = interface.mtu {
+            output.append("MTU = \(mtu)\n")
+        }
+        
+        for peer in peers {
+            output.append("\n[Peer]\n")
+            output.append("PublicKey = \(peer.publicKey.base64EncodedString())\n")
+            if let preSharedKey = peer.preSharedKey {
+                output.append("PresharedKey = \(preSharedKey.base64EncodedString())\n")
+            }
+            if !peer.allowedIPs.isEmpty {
+                let allowedIPsString = peer.allowedIPs.map { $0.stringRepresentation }.joined(separator: ", ")
+                output.append("AllowedIPs = \(allowedIPsString)\n")
+            }
+            if let endpoint = peer.endpoint {
+                output.append("Endpoint = \(endpoint.stringRepresentation)\n")
+            }
+            if let persistentKeepAlive = peer.persistentKeepAlive {
+                output.append("PersistentKeepalive = \(persistentKeepAlive)\n")
+            }
+        }
+        
+        return output
+    }
+    
     //swiftlint:disable:next cyclomatic_complexity
-    private static func collate(interfaceAttributes attributes: [String: String], name: String) -> InterfaceConfiguration? {
+    private static func collate(interfaceAttributes attributes: [String: String], name: String?) -> InterfaceConfiguration? {
         // required wg fields
         guard let privateKeyString = attributes["privatekey"] else { return nil }
         guard let privateKey = Data(base64Encoded: privateKeyString), privateKey.count == TunnelConfiguration.keyLength else { return nil }
@@ -130,7 +166,7 @@ class WgQuickConfigFileParser {
         }
         return interface
     }
-
+    
     //swiftlint:disable:next cyclomatic_complexity
     private static func collate(peerAttributes attributes: [String: String]) -> PeerConfiguration? {
         // required wg fields
@@ -160,5 +196,5 @@ class WgQuickConfigFileParser {
         }
         return peer
     }
-
+    
 }