Merge pull request #20 from keeshux/incorrect-compression-warnings

Incorrect compression warnings

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+
+### Fixed
+
+- Incorrect compression warnings when importing host configurations. [#20](https://github.com/keeshux/passepartout-ios/pull/20)
+
 ## 1.0 RC1 1194 (2018-11-01)
 
 ### Added

Passepartout/Sources/Model/ConnectionService+Migration.swift

@@ -29,7 +29,7 @@ import SwiftyBeaver
 private let log = SwiftyBeaver.self
 
 extension ConnectionService {
-    static func migrateJSON(at from: URL, to: URL) {
+    static func migrateJSON(from: URL, to: URL) {
         do {
             let newData = try migrateJSON(at: from)
 //            log.verbose(String(data: newData, encoding: .utf8)!)
@@ -39,8 +39,8 @@ extension ConnectionService {
         }
     }
     
-    private static func migrateJSON(at from: URL) throws -> Data {
-        let data = try Data(contentsOf: from)
+    static func migrateJSON(at url: URL) throws -> Data {
+        let data = try Data(contentsOf: url)
         guard var json = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] else {
             throw ApplicationError.migration
         }

Passepartout/Sources/Model/TransientStore.swift

@@ -53,7 +53,7 @@ class TransientStore {
     private init() {
         let cfg = AppConstants.VPN.baseConfiguration()
         do {
-            ConnectionService.migrateJSON(at: TransientStore.serviceURL, to: TransientStore.serviceURL)
+            ConnectionService.migrateJSON(from: TransientStore.serviceURL, to: TransientStore.serviceURL)
             
             let data = try Data(contentsOf: TransientStore.serviceURL)
             if let content = String(data: data, encoding: .utf8) {

Passepartout/Sources/VPN/TunnelKitProvider+FileConfiguration.swift

@@ -53,9 +53,9 @@ extension TunnelKitProvider.Configuration {
 
         static let auth = Utils.regex("^auth +[\\w\\-]+")
         
-        static let compLZO = Utils.regex("^comp-lzo")
+        static let compLZO = Utils.regex("^comp-lzo.*")
 
-        static let compress = Utils.regex("^compress")
+        static let compress = Utils.regex("^compress.*")
         
         static let ping = Utils.regex("^ping +\\d+")