passepartoutvpn
/
tunnelkit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Encapsulate complex serialization

This commit is contained in:
Davide De Rosa 2018-08-31 00:08:21 +02:00
parent bae51c735e
commit 3aebedf5b8
1 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
TunnelKit/Sources/AppExtension/TunnelKitProvider+Configuration.swift
View File

@ -70,6 +70,26 @@ extension TunnelKitProvider {
self.port = port self.port = port
} }
/// :nodoc:
public static func deserialized(_ string: String) throws -> EndpointProtocol {
let components = string.components(separatedBy: ":")
guard components.count == 2 else {
throw ProviderError.configuration(field: "endpointProtocol")
}
guard let socketType = SocketType(rawValue: components[0]) else {
throw ProviderError.configuration(field: "endpointProtocol.socketType")
}
guard let port = UInt16(components[1]) else {
throw ProviderError.configuration(field: "endpointProtocol.port")
}
return EndpointProtocol(socketType, port)
}
/// :nodoc:
public func serialized() -> String {
return "\(socketType.rawValue):\(port)"
}
// MARK: Equatable // MARK: Equatable
/// :nodoc: /// :nodoc:
@ -81,7 +101,7 @@ extension TunnelKitProvider {
/// :nodoc: /// :nodoc:
public var description: String { public var description: String {
return "\(socketType.rawValue):\(port)" return serialized()
} }
} }
@ -238,24 +258,11 @@ extension TunnelKitProvider {
prefersResolvedAddresses = providerConfiguration[S.prefersResolvedAddresses] as? Bool ?? false prefersResolvedAddresses = providerConfiguration[S.prefersResolvedAddresses] as? Bool ?? false
resolvedAddresses = providerConfiguration[S.resolvedAddresses] as? [String] resolvedAddresses = providerConfiguration[S.resolvedAddresses] as? [String]
guard let endpointProtocolsStrings = providerConfiguration[S.endpointProtocols] as? [String], !endpointProtocolsStrings.isEmpty else { guard let endpointProtocolsStrings = providerConfiguration[S.endpointProtocols] as? [String], !endpointProtocolsStrings.isEmpty else {
throw ProviderError.configuration(field: "protocolConfiguration.providerConfiguration[\(S.endpointProtocols)] is nil or empty") throw ProviderError.configuration(field: "protocolConfiguration.providerConfiguration[\(S.endpointProtocols)] is nil or empty")
} }
endpointProtocols = try endpointProtocolsStrings.map { endpointProtocols = try endpointProtocolsStrings.map { try EndpointProtocol.deserialized($0) }
let components = $0.components(separatedBy: ":")
guard components.count == 2 else {
throw ProviderError.configuration(field: "protocolConfiguration.providerConfiguration[\(S.endpointProtocols)] entries must be in the form 'socketType:port'")
}
let socketTypeString = components[0]
let portString = components[1]
guard let socketType = SocketType(rawValue: socketTypeString) else {
throw ProviderError.configuration(field: "protocolConfiguration.providerConfiguration[\(S.endpointProtocols)] unrecognized socketType '\(socketTypeString)'")
}
guard let port = UInt16(portString) else {
throw ProviderError.configuration(field: "protocolConfiguration.providerConfiguration[\(S.endpointProtocols)] non-numeric port '\(portString)'")
}
return EndpointProtocol(socketType, port)
}
self.appGroup = appGroup self.appGroup = appGroup
self.cipher = cipher self.cipher = cipher
@ -430,9 +437,7 @@ extension TunnelKitProvider {
var dict: [String: Any] = [ var dict: [String: Any] = [
S.appGroup: appGroup, S.appGroup: appGroup,
S.prefersResolvedAddresses: prefersResolvedAddresses, S.prefersResolvedAddresses: prefersResolvedAddresses,
S.endpointProtocols: endpointProtocols.map { S.endpointProtocols: endpointProtocols.map { $0.serialized() },
"\($0.socketType.rawValue):\($0.port)"
},
S.cipherAlgorithm: cipher.rawValue, S.cipherAlgorithm: cipher.rawValue,
S.digestAlgorithm: digest.rawValue, S.digestAlgorithm: digest.rawValue,
S.mtu: mtu, S.mtu: mtu,