Added ability to add tunnels with a QR code scan. Logic in place to parse conf files as well.

Signed-off-by: Eric Kuck <eric@bluelinelabs.com>
2018-08-21 11:00:41 -05:00
parent c2b591cc44
commit 39ae9db11c
10 changed files with 325 additions and 8 deletions
@@ -111,6 +111,54 @@ extension Tunnel {
        }
    }

+    static func fromConfig(_ text: String, context: NSManagedObjectContext) throws -> Tunnel {
+        let lines = text.split(separator: "\n")
+
+        var currentPeer: Peer?
+        var isInInterfaceSection = false
+
+        var tunnel: Tunnel!
+        context.performAndWait {
+            tunnel = Tunnel(context: context)
+            tunnel.interface = Interface(context: context)
+        }
+        tunnel.tunnelIdentifier = UUID().uuidString
+
+        for line in lines {
+            var trimmedLine: String
+            if let commentRange = line.range(of: "#") {
+                trimmedLine = String(line[..<commentRange.lowerBound])
+            } else {
+                trimmedLine = String(line)
+            }
+
+            trimmedLine = trimmedLine.trimmingCharacters(in: .whitespaces)
+
+            guard trimmedLine.count > 0 else { continue }
+
+            if "[interface]" == line.lowercased() {
+                currentPeer = nil
+                isInInterfaceSection = true
+            } else if "[peer]" == line.lowercased() {
+                context.performAndWait { currentPeer = Peer(context: context) }
+                tunnel.insertIntoPeers(currentPeer!, at: tunnel.peers?.count ?? 0)
+                isInInterfaceSection = false
+            } else if isInInterfaceSection, let attribute = Attribute.match(line: String(line)) {
+                try tunnel.interface!.parse(attribute: attribute)
+            } else if let currentPeer = currentPeer, let attribute = Attribute.match(line: String(line)) {
+                try currentPeer.parse(attribute: attribute)
+            } else {
+                throw TunnelParseError.invalidLine(String(line))
+            }
+        }
+
+        if !isInInterfaceSection && currentPeer == nil {
+            throw TunnelParseError.noConfigInfo
+        }
+
+        return tunnel
+    }
+
 }

 private func base64KeyToHex(_ base64: String?) -> String? {
@@ -146,3 +194,8 @@ enum TunnelValidationError: Error {
    case nilPeers
    case invalidPeer
 }
+
+enum TunnelParseError: Error {
+    case invalidLine(_ line: String)
+    case noConfigInfo
+}