From c244b29a8f5805d8697f9430607190c8d8edb3d8 Mon Sep 17 00:00:00 2001 From: Davide De Rosa Date: Sat, 5 Jan 2019 22:26:20 +0100 Subject: [PATCH] Parse DNS servers from configuration --- TunnelKit/Sources/Core/ConfigurationParser.swift | 14 ++++++++++++++ TunnelKitTests/ConfigurationParserTests.swift | 12 ++++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/TunnelKit/Sources/Core/ConfigurationParser.swift b/TunnelKit/Sources/Core/ConfigurationParser.swift index 21c1773..d3eee1b 100644 --- a/TunnelKit/Sources/Core/ConfigurationParser.swift +++ b/TunnelKit/Sources/Core/ConfigurationParser.swift @@ -91,6 +91,8 @@ public class ConfigurationParser { static let blockEnd = NSRegularExpression("^<\\/[\\w\\-]+>") + static let dnsRegexp = NSRegularExpression("dhcp-option DNS6? [\\d\\.a-fA-F:]+") + // unsupported // static let fragment = NSRegularExpression("^fragment +\\d+") @@ -143,6 +145,7 @@ public class ConfigurationParser { var tlsStrategy: SessionProxy.TLSWrap.Strategy? var tlsKeyLines: [Substring]? var tlsWrap: SessionProxy.TLSWrap? + var dnsServers: [String]? var currentBlockName: String? var currentBlock: [String] = [] @@ -316,6 +319,16 @@ public class ConfigurationParser { } renegotiateAfterSeconds = TimeInterval(arg) } + Regex.dnsRegexp.enumerateArguments(in: line) { + isHandled = true + guard $0.count == 2 else { + return + } + if dnsServers == nil { + dnsServers = [] + } + dnsServers?.append($0[1]) + } Regex.fragment.enumerateArguments(in: line) { (_) in unsupportedError = ParsingError.unsupportedConfiguration(option: "fragment") } @@ -388,6 +401,7 @@ public class ConfigurationParser { sessionBuilder.clientKey = clientKey sessionBuilder.keepAliveInterval = keepAliveSeconds sessionBuilder.renegotiatesAfter = renegotiateAfterSeconds + sessionBuilder.dnsServers = dnsServers return ParsingResult( url: originalURL, diff --git a/TunnelKitTests/ConfigurationParserTests.swift b/TunnelKitTests/ConfigurationParserTests.swift index fb2ee6a..16edcb6 100644 --- a/TunnelKitTests/ConfigurationParserTests.swift +++ b/TunnelKitTests/ConfigurationParserTests.swift @@ -27,6 +27,8 @@ import XCTest import TunnelKit class ConfigurationParserTests: XCTestCase { + let base: [String] = ["", "", "remote 1.2.3.4"] + override func setUp() { super.setUp() // Put setup code here. This method is called before the invocation of each test method in the class. @@ -55,8 +57,6 @@ class ConfigurationParserTests: XCTestCase { } func testCompression() throws { - let base: [String] = ["", "", "remote 1.2.3.4"] - XCTAssertNotNil(try ConfigurationParser.parsed(fromLines: base + ["comp-lzo"]).warning) XCTAssertNoThrow(try ConfigurationParser.parsed(fromLines: base + ["comp-lzo no"])) XCTAssertThrowsError(try ConfigurationParser.parsed(fromLines: base + ["comp-lzo yes"])) @@ -65,6 +65,14 @@ class ConfigurationParserTests: XCTestCase { XCTAssertThrowsError(try ConfigurationParser.parsed(fromLines: base + ["compress lzo"])) } + func testDHCPOption() throws { + let lines = base + ["dhcp-option DNS 8.8.8.8", "dhcp-option DNS6 ffff::1"] + XCTAssertNoThrow(try ConfigurationParser.parsed(fromLines: lines)) + + let parsed = try! ConfigurationParser.parsed(fromLines: lines) + XCTAssertEqual(parsed.configuration.dnsServers, ["8.8.8.8", "ffff::1"]) + } + private func url(withName name: String) -> URL { return Bundle(for: ConfigurationParserTests.self).url(forResource: name, withExtension: "ovpn")! }