aboutsummaryrefslogtreecommitdiffstats
path: root/WireGuard/Shared/Model
diff options
context:
space:
mode:
authorEric Kuck <eric@bluelinelabs.com>2018-12-21 12:51:14 -0600
committerEric Kuck <eric@bluelinelabs.com>2018-12-21 12:51:14 -0600
commitf6af9d9ffbc3dae8c387a0eacf811d58ee6e4605 (patch)
treeae6563a1e5a37fb3c8856b627062e81443d0eb97 /WireGuard/Shared/Model
parentSimplify versioning of stored data (diff)
downloadwireguard-apple-f6af9d9ffbc3dae8c387a0eacf811d58ee6e4605.tar.xz
wireguard-apple-f6af9d9ffbc3dae8c387a0eacf811d58ee6e4605.zip
All migration stuff moved to one gross file
Signed-off-by: Eric Kuck <eric@bluelinelabs.com>
Diffstat (limited to 'WireGuard/Shared/Model')
-rw-r--r--WireGuard/Shared/Model/Legacy/LegacyDNSServer.swift46
-rw-r--r--WireGuard/Shared/Model/Legacy/LegacyEndpoint.swift64
-rw-r--r--WireGuard/Shared/Model/Legacy/LegacyIPAddressRange.swift57
-rw-r--r--WireGuard/Shared/Model/Legacy/LegacyInterfaceConfiguration.swift24
-rw-r--r--WireGuard/Shared/Model/Legacy/LegacyPeerConfiguration.swift29
-rw-r--r--WireGuard/Shared/Model/Legacy/LegacyTunnelConfiguration.swift15
6 files changed, 0 insertions, 235 deletions
diff --git a/WireGuard/Shared/Model/Legacy/LegacyDNSServer.swift b/WireGuard/Shared/Model/Legacy/LegacyDNSServer.swift
deleted file mode 100644
index f2afcd7a..00000000
--- a/WireGuard/Shared/Model/Legacy/LegacyDNSServer.swift
+++ /dev/null
@@ -1,46 +0,0 @@
-// SPDX-License-Identifier: MIT
-// Copyright © 2018 WireGuard LLC. All Rights Reserved.
-
-import Foundation
-import Network
-
-struct LegacyDNSServer: Codable {
- let address: IPAddress
-
- init(from decoder: Decoder) throws {
- let container = try decoder.singleValueContainer()
- var data = try container.decode(Data.self)
- let ipAddressFromData: IPAddress? = {
- switch data.count {
- case 4: return IPv4Address(data)
- case 16: return IPv6Address(data)
- default: return nil
- }
- }()
- guard let ipAddress = ipAddressFromData else {
- throw DecodingError.invalidData
- }
- address = ipAddress
- }
-
- func encode(to encoder: Encoder) throws {
- var container = encoder.singleValueContainer()
- try container.encode(address.rawValue)
- }
-
- enum DecodingError: Error {
- case invalidData
- }
-}
-
-extension LegacyDNSServer {
- var migrated: DNSServer {
- return DNSServer(address: address)
- }
-}
-
-extension Array where Element == LegacyDNSServer {
- var migrated: [DNSServer] {
- return map { $0.migrated }
- }
-}
diff --git a/WireGuard/Shared/Model/Legacy/LegacyEndpoint.swift b/WireGuard/Shared/Model/Legacy/LegacyEndpoint.swift
deleted file mode 100644
index 7a80be47..00000000
--- a/WireGuard/Shared/Model/Legacy/LegacyEndpoint.swift
+++ /dev/null
@@ -1,64 +0,0 @@
-// SPDX-License-Identifier: MIT
-// Copyright © 2018 WireGuard LLC. All Rights Reserved.
-
-import Foundation
-import Network
-
-struct LegacyEndpoint: Codable {
- let host: NWEndpoint.Host
- let port: NWEndpoint.Port
-
- public init(from decoder: Decoder) throws {
- let container = try decoder.singleValueContainer()
- let endpointString = try container.decode(String.self)
- guard !endpointString.isEmpty else { throw DecodingError.invalidData }
- let startOfPort: String.Index
- let hostString: String
- if endpointString.first! == "[" {
- // Look for IPv6-style endpoint, like [::1]:80
- let startOfHost = endpointString.index(after: endpointString.startIndex)
- guard let endOfHost = endpointString.dropFirst().firstIndex(of: "]") else { throw DecodingError.invalidData }
- let afterEndOfHost = endpointString.index(after: endOfHost)
- guard endpointString[afterEndOfHost] == ":" else { throw DecodingError.invalidData }
- startOfPort = endpointString.index(after: afterEndOfHost)
- hostString = String(endpointString[startOfHost ..< endOfHost])
- } else {
- // Look for an IPv4-style endpoint, like 127.0.0.1:80
- guard let endOfHost = endpointString.firstIndex(of: ":") else { throw DecodingError.invalidData }
- startOfPort = endpointString.index(after: endOfHost)
- hostString = String(endpointString[endpointString.startIndex ..< endOfHost])
- }
- guard let endpointPort = NWEndpoint.Port(String(endpointString[startOfPort ..< endpointString.endIndex])) else { throw DecodingError.invalidData }
- let invalidCharacterIndex = hostString.unicodeScalars.firstIndex { char in
- return !CharacterSet.urlHostAllowed.contains(char)
- }
- guard invalidCharacterIndex == nil else { throw DecodingError.invalidData }
- host = NWEndpoint.Host(hostString)
- port = endpointPort
- }
-
- public func encode(to encoder: Encoder) throws {
- let stringRepresentation: String
- switch host {
- case .name(let hostname, _):
- stringRepresentation = "\(hostname):\(port)"
- case .ipv4(let address):
- stringRepresentation = "\(address):\(port)"
- case .ipv6(let address):
- stringRepresentation = "[\(address)]:\(port)"
- }
-
- var container = encoder.singleValueContainer()
- try container.encode(stringRepresentation)
- }
-
- enum DecodingError: Error {
- case invalidData
- }
-}
-
-extension LegacyEndpoint {
- var migrated: Endpoint {
- return Endpoint(host: host, port: port)
- }
-}
diff --git a/WireGuard/Shared/Model/Legacy/LegacyIPAddressRange.swift b/WireGuard/Shared/Model/Legacy/LegacyIPAddressRange.swift
deleted file mode 100644
index ade87f21..00000000
--- a/WireGuard/Shared/Model/Legacy/LegacyIPAddressRange.swift
+++ /dev/null
@@ -1,57 +0,0 @@
-// SPDX-License-Identifier: MIT
-// Copyright © 2018 WireGuard LLC. All Rights Reserved.
-
-import Foundation
-import Network
-
-struct LegacyIPAddressRange: Codable {
- let address: IPAddress
- let networkPrefixLength: UInt8
-
- public init(from decoder: Decoder) throws {
- let container = try decoder.singleValueContainer()
- var data = try container.decode(Data.self)
- networkPrefixLength = data.removeLast()
- let ipAddressFromData: IPAddress? = {
- switch data.count {
- case 4: return IPv4Address(data)
- case 16: return IPv6Address(data)
- default: return nil
- }
- }()
- guard let ipAddress = ipAddressFromData else { throw DecodingError.invalidData }
- address = ipAddress
- }
-
- public func encode(to encoder: Encoder) throws {
- var container = encoder.singleValueContainer()
- let addressDataLength: Int
- if address is IPv4Address {
- addressDataLength = 4
- } else if address is IPv6Address {
- addressDataLength = 16
- } else {
- fatalError()
- }
- var data = Data(capacity: addressDataLength + 1)
- data.append(address.rawValue)
- data.append(networkPrefixLength)
- try container.encode(data)
- }
-
- enum DecodingError: Error {
- case invalidData
- }
-}
-
-extension LegacyIPAddressRange {
- var migrated: IPAddressRange {
- return IPAddressRange(address: address, networkPrefixLength: networkPrefixLength)
- }
-}
-
-extension Array where Element == LegacyIPAddressRange {
- var migrated: [IPAddressRange] {
- return map { $0.migrated }
- }
-}
diff --git a/WireGuard/Shared/Model/Legacy/LegacyInterfaceConfiguration.swift b/WireGuard/Shared/Model/Legacy/LegacyInterfaceConfiguration.swift
deleted file mode 100644
index 680c8d74..00000000
--- a/WireGuard/Shared/Model/Legacy/LegacyInterfaceConfiguration.swift
+++ /dev/null
@@ -1,24 +0,0 @@
-// SPDX-License-Identifier: MIT
-// Copyright © 2018 WireGuard LLC. All Rights Reserved.
-
-import Foundation
-
-struct LegacyInterfaceConfiguration: Codable {
- let name: String
- let privateKey: Data
- let addresses: [LegacyIPAddressRange]
- let listenPort: UInt16?
- let mtu: UInt16?
- let dns: [LegacyDNSServer]
-}
-
-extension LegacyInterfaceConfiguration {
- var migrated: InterfaceConfiguration {
- var interface = InterfaceConfiguration(name: name, privateKey: privateKey)
- interface.addresses = addresses.migrated
- interface.listenPort = listenPort
- interface.mtu = mtu
- interface.dns = dns.migrated
- return interface
- }
-}
diff --git a/WireGuard/Shared/Model/Legacy/LegacyPeerConfiguration.swift b/WireGuard/Shared/Model/Legacy/LegacyPeerConfiguration.swift
deleted file mode 100644
index 5a61b4ad..00000000
--- a/WireGuard/Shared/Model/Legacy/LegacyPeerConfiguration.swift
+++ /dev/null
@@ -1,29 +0,0 @@
-// SPDX-License-Identifier: MIT
-// Copyright © 2018 WireGuard LLC. All Rights Reserved.
-
-import Foundation
-
-struct LegacyPeerConfiguration: Codable {
- let publicKey: Data
- let preSharedKey: Data?
- let allowedIPs: [LegacyIPAddressRange]
- let endpoint: LegacyEndpoint?
- let persistentKeepAlive: UInt16?
-}
-
-extension LegacyPeerConfiguration {
- var migrated: PeerConfiguration {
- var configuration = PeerConfiguration(publicKey: publicKey)
- configuration.preSharedKey = preSharedKey
- configuration.allowedIPs = allowedIPs.migrated
- configuration.endpoint = endpoint?.migrated
- configuration.persistentKeepAlive = persistentKeepAlive
- return configuration
- }
-}
-
-extension Array where Element == LegacyPeerConfiguration {
- var migrated: [PeerConfiguration] {
- return map { $0.migrated }
- }
-}
diff --git a/WireGuard/Shared/Model/Legacy/LegacyTunnelConfiguration.swift b/WireGuard/Shared/Model/Legacy/LegacyTunnelConfiguration.swift
deleted file mode 100644
index ac369b94..00000000
--- a/WireGuard/Shared/Model/Legacy/LegacyTunnelConfiguration.swift
+++ /dev/null
@@ -1,15 +0,0 @@
-// SPDX-License-Identifier: MIT
-// Copyright © 2018 WireGuard LLC. All Rights Reserved.
-
-import Foundation
-
-final class LegacyTunnelConfiguration: Codable {
- let interface: LegacyInterfaceConfiguration
- let peers: [LegacyPeerConfiguration]
-}
-
-extension LegacyTunnelConfiguration {
- var migrated: TunnelConfiguration {
- return TunnelConfiguration(interface: interface.migrated, peers: peers.migrated)
- }
-}