core/mobile_nebula
1
0
Fork 1
mirror of https://github.com/DefinedNet/mobile_nebula.git synced 2025-02-15 16:25:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

swiftformat .

Browse source
This commit is contained in:
Caleb Jasik 2025-02-13 16:33:07 -06:00
parent 02e8c5bf35
commit 7c4a1a5faa
No known key found for this signature in database
9 changed files with 411 additions and 423 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ios/NebulaNetworkExtension/Keychain.swift
View file

@ -11,12 +11,12 @@ class KeyChain {
kSecAttrAccessGroup as String: groupName,
]
if (managed) {
if managed {
query[kSecAttrAccessible as String] = kSecAttrAccessibleAfterFirstUnlock
}
// Attempt to delete an existing key to allow for an overwrite
_ = self.delete(key: key)
_ = delete(key: key)
return SecItemAdd(query as CFDictionary, nil) == 0
}
@ -29,7 +29,7 @@ class KeyChain {
kSecAttrAccessGroup as String: groupName,
]
var dataTypeRef: AnyObject? = nil
var dataTypeRef: AnyObject?
let status: OSStatus = SecItemCopyMatching(query as CFDictionary, &dataTypeRef)
@ -52,18 +52,16 @@ class KeyChain {
}
extension Data {
init<T>(from value: T) {
var value = value
var data = Data()
withUnsafePointer(to: &value, { (ptr: UnsafePointer<T>) -> Void in
withUnsafePointer(to: &value) { (ptr: UnsafePointer<T>) in
data = Data(buffer: UnsafeBufferPointer(start: ptr, count: 1))
})
}
self.init(data)
}
func to<T>(type: T.Type) -> T {
return self.withUnsafeBytes { $0.load(as: T.self) }
func to<T>(type _: T.Type) -> T {
return withUnsafeBytes { $0.load(as: T.self) }
}
}

69
ios/NebulaNetworkExtension/PacketTunnelProvider.swift
View file

@ -1,5 +1,5 @@
import NetworkExtension
import MobileNebula
import NetworkExtension
import os.log
import SwiftyJSON
@ -17,13 +17,12 @@ enum AppMessageError: Error {
extension AppMessageError: LocalizedError {
public var description: String? {
switch self {
case .unknownIPCType(let command):
case let .unknownIPCType(command):
return NSLocalizedString("Unknown IPC message type \(String(command))", comment: "")
}
}
}
class PacketTunnelProvider: NEPacketTunnelProvider {
private var networkMonitor: NWPathMonitor?
@ -56,27 +55,27 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
// Cannot use NETunnelProviderManager.loadAllFromPreferences() in earlier versions of iOS
// TODO: Remove else once we drop support for iOS 16
if ProcessInfo().isOperatingSystemAtLeast(OperatingSystemVersion(majorVersion: 17, minorVersion: 0, patchVersion: 0)) {
manager = try await self.findManager()
manager = try await findManager()
guard let foundManager = manager else {
throw VPNStartError.couldNotFindManager
}
self.site = try Site(manager: foundManager)
site = try Site(manager: foundManager)
} else {
// This does not save the manager with the site, which means we cannot update the
// vpn profile name when updates happen (rare).
self.site = try Site(proto: self.protocolConfiguration as! NETunnelProviderProtocol)
site = try Site(proto: protocolConfiguration as! NETunnelProviderProtocol)
}
config = try self.site!.getConfig()
config = try site!.getConfig()
} catch {
// TODO: need a way to notify the app
self.log.error("Failed to render config from vpn object")
log.error("Failed to render config from vpn object")
throw error
}
let _site = self.site!
let _site = site!
key = try _site.getKey()
guard let fileDescriptor = self.tunnelFileDescriptor else {
guard let fileDescriptor = tunnelFileDescriptor else {
throw VPNStartError.noTunFileDescriptor
}
let tunFD = Int(fileDescriptor)
@ -87,7 +86,7 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
// Make sure our ip is routed to the tun device
var err: NSError?
let ipNet = MobileNebulaParseCIDR(_site.cert!.cert.details.ips[0], &err)
if (err != nil) {
if err != nil {
throw err!
}
tunnelNetworkSettings.ipv4Settings = NEIPv4Settings(addresses: [ipNet!.ip], subnetMasks: [ipNet!.maskCIDR])
@ -96,7 +95,7 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
// Add our unsafe routes
try _site.unsafeRoutes.forEach { unsafeRoute in
let ipNet = MobileNebulaParseCIDR(unsafeRoute.route, &err)
if (err != nil) {
if err != nil {
throw err!
}
routes.append(NEIPv4Route(destinationAddress: ipNet!.network, subnetMask: ipNet!.maskCIDR))
@ -105,24 +104,24 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
tunnelNetworkSettings.ipv4Settings!.includedRoutes = routes
tunnelNetworkSettings.mtu = _site.mtu as NSNumber
try await self.setTunnelNetworkSettings(tunnelNetworkSettings)
try await setTunnelNetworkSettings(tunnelNetworkSettings)
var nebulaErr: NSError?
self.nebula = MobileNebulaNewNebula(String(data: config, encoding: .utf8), key, self.site!.logFile, tunFD, &nebulaErr)
self.startNetworkMonitor()
nebula = MobileNebulaNewNebula(String(data: config, encoding: .utf8), key, site!.logFile, tunFD, &nebulaErr)
startNetworkMonitor()
if nebulaErr != nil {
self.log.error("We had an error starting up: \(nebulaErr, privacy: .public)")
log.error("We had an error starting up: \(nebulaErr, privacy: .public)")
throw nebulaErr!
}
self.nebula!.start()
self.dnUpdater.updateSingleLoop(site: self.site!, onUpdate: self.handleDNUpdate)
nebula!.start()
dnUpdater.updateSingleLoop(site: site!, onUpdate: handleDNUpdate)
}
private func handleDNUpdate(newSite: Site) {
do {
self.site = newSite
try self.nebula?.reload(String(data: newSite.getConfig(), encoding: .utf8), key: newSite.getKey())
site = newSite
try nebula?.reload(String(data: newSite.getConfig(), encoding: .utf8), key: newSite.getKey())
} catch {
log.error("Got an error while updating nebula \(error.localizedDescription, privacy: .public)")
@ -136,7 +135,7 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
// }
private func findManager() async throws -> NETunnelProviderManager {
let targetProtoConfig = self.protocolConfiguration as? NETunnelProviderProtocol
let targetProtoConfig = protocolConfiguration as? NETunnelProviderProtocol
guard let targetProviderConfig = targetProtoConfig?.providerConfiguration else {
throw VPNStartError.noProviderConfig
}
@ -150,7 +149,7 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
throw VPNStartError.noProviderConfig
}
let id = mgrProviderConfig["id"] as? String
if (id == targetID) {
if id == targetID {
return manager
}
}
@ -161,16 +160,16 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
private func startNetworkMonitor() {
networkMonitor = NWPathMonitor()
networkMonitor!.pathUpdateHandler = self.pathUpdate
networkMonitor!.pathUpdateHandler = pathUpdate
networkMonitor!.start(queue: DispatchQueue(label: "NetworkMonitor"))
}
private func stopNetworkMonitor() {
self.networkMonitor?.cancel()
networkMonitor?.cancel()
networkMonitor = nil
}
override func stopTunnel(with reason: NEProviderStopReason, completionHandler: @escaping () -> Void) {
override func stopTunnel(with _: NEProviderStopReason, completionHandler: @escaping () -> Void) {
nebula?.stop()
stopNetworkMonitor()
completionHandler()
@ -189,14 +188,14 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
private func collectAddresses(endpoints: [Network.NWEndpoint]) -> String {
var str: [String] = []
endpoints.forEach{ endpoint in
for endpoint in endpoints {
switch endpoint {
case let .hostPort(.ipv6(host), port):
str.append("[\(host)]:\(port)")
case let .hostPort(.ipv4(host), port):
str.append("\(host):\(port)")
default:
return
continue
}
}
@ -215,21 +214,21 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
// start command has special treatment due to needing to call two completers
if call.command == "start" {
do {
try await self.start()
try await start()
// No response data, this is expected on a clean start
return try? JSONEncoder().encode(IPCResponse.init(type: .success, message: nil))
return try? JSONEncoder().encode(IPCResponse(type: .success, message: nil))
} catch {
defer {
self.cancelTunnelWithError(error)
}
return try? JSONEncoder().encode(IPCResponse.init(type: .error, message: JSON(error.localizedDescription)))
return try? JSONEncoder().encode(IPCResponse(type: .error, message: JSON(error.localizedDescription)))
}
}
if nebula == nil {
// Respond with an empty success message in the event a command comes in before we've truly started
log.warning("Received command but do not have a nebula instance")
return try? JSONEncoder().encode(IPCResponse.init(type: .success, message: nil))
return try? JSONEncoder().encode(IPCResponse(type: .success, message: nil))
}
// TODO: try catch over all this
@ -239,15 +238,14 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
case "getHostInfo": (data, error) = getHostInfo(args: call.arguments!)
case "setRemoteForTunnel": (data, error) = setRemoteForTunnel(args: call.arguments!)
case "closeTunnel": (data, error) = closeTunnel(args: call.arguments!)
default:
error = AppMessageError.unknownIPCType(command: call.command)
}
if (error != nil) {
return try? JSONEncoder().encode(IPCResponse.init(type: .error, message: JSON(error?.localizedDescription ?? "Unknown error")))
if error != nil {
return try? JSONEncoder().encode(IPCResponse(type: .error, message: JSON(error?.localizedDescription ?? "Unknown error")))
} else {
return try? JSONEncoder().encode(IPCResponse.init(type: .success, message: data))
return try? JSONEncoder().encode(IPCResponse(type: .success, message: data))
}
}
@ -306,4 +304,3 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
return nil
}
}

87
ios/NebulaNetworkExtension/Site.swift
View file

@ -1,7 +1,7 @@
import NetworkExtension
import MobileNebula
import SwiftyJSON
import NetworkExtension
import os.log
import SwiftyJSON
let log = Logger(subsystem: "net.defined.mobileNebula", category: "Site")
@ -21,7 +21,7 @@ enum SiteError: Error {
extension SiteError: CustomStringConvertible {
public var description: String {
switch self {
case .nonConforming(let site):
case let .nonConforming(site):
return String("Non-conforming site \(String(describing: site))")
case .noCertificate:
return "No certificate found"
@ -35,15 +35,15 @@ extension SiteError: CustomStringConvertible {
return "failed to find dn credentials in keychain"
case .dnCredentialSave:
return "failed to store dn credentials in keychain"
case .unexpected(_):
case .unexpected:
return "An unexpected error occurred."
}
}
}
enum IPCResponseType: String, Codable {
case error = "error"
case success = "success"
case error
case success
}
class IPCResponse: Codable {
@ -131,7 +131,7 @@ struct CertificateValidity: Codable {
}
}
let statusMap: Dictionary<NEVPNStatus, Bool> = [
let statusMap: [NEVPNStatus: Bool] = [
NEVPNStatus.invalid: false,
NEVPNStatus.disconnected: false,
NEVPNStatus.connecting: false,
@ -140,7 +140,7 @@ let statusMap: Dictionary<NEVPNStatus, Bool> = [
NEVPNStatus.disconnecting: true,
]
let statusString: Dictionary<NEVPNStatus, String> = [
let statusString: [NEVPNStatus: String] = [
NEVPNStatus.invalid: "Invalid configuration",
NEVPNStatus.disconnected: "Disconnected",
NEVPNStatus.connecting: "Connecting...",
@ -156,7 +156,7 @@ class Site: Codable {
var id: String
// Stored in proto
var staticHostmap: Dictionary<String, StaticHosts>
var staticHostmap: [String: StaticHosts]
var unsafeRoutes: [UnsafeRoute]
var cert: CertificateInfo?
var ca: [CertificateInfo]
@ -190,8 +190,8 @@ class Site: Codable {
let proto = manager.protocolConfiguration as! NETunnelProviderProtocol
try self.init(proto: proto)
self.manager = manager
self.connected = statusMap[manager.connection.status]
self.status = statusString[manager.connection.status]
connected = statusMap[manager.connection.status]
status = statusString[manager.connection.status]
}
convenience init(proto: NETunnelProviderProtocol) throws {
@ -202,7 +202,7 @@ class Site: Codable {
let decoder = JSONDecoder()
let incoming = try decoder.decode(IncomingSite.self, from: config)
self.init(incoming: incoming)
self.needsToMigrateToFS = true
needsToMigrateToFS = true
return
}
@ -244,18 +244,18 @@ class Site: Codable {
do {
let rawCert = incoming.cert
let rawDetails = MobileNebulaParseCerts(rawCert, &err)
if (err != nil) {
if err != nil {
throw err!
}
var certs: [CertificateInfo]
certs = try JSONDecoder().decode([CertificateInfo].self, from: rawDetails.data(using: .utf8)!)
if (certs.count == 0) {
if certs.count == 0 {
throw SiteError.noCertificate
}
cert = certs[0]
if (!cert!.validity.valid) {
if !cert!.validity.valid {
errors.append("Certificate is invalid: \(cert!.validity.reason)")
}
@ -266,19 +266,19 @@ class Site: Codable {
do {
let rawCa = incoming.ca
let rawCaDetails = MobileNebulaParseCerts(rawCa, &err)
if (err != nil) {
if err != nil {
throw err!
}
ca = try JSONDecoder().decode([CertificateInfo].self, from: rawCaDetails.data(using: .utf8)!)
var hasErrors = false
ca.forEach { cert in
if (!cert.validity.valid) {
for cert in ca {
if !cert.validity.valid {
hasErrors = true
}
}
if (hasErrors && !managed) {
if hasErrors && !managed {
errors.append("There are issues with 1 or more ca certificates")
}
@ -288,17 +288,17 @@ class Site: Codable {
}
do {
logFile = try SiteList.getSiteLogFile(id: self.id, createDir: true).path
logFile = try SiteList.getSiteLogFile(id: id, createDir: true).path
} catch {
logFile = nil
errors.append("Unable to create the site directory: \(error.localizedDescription)")
}
if (managed && (try? getDNCredentials())?.invalid != false) {
if managed && (try? getDNCredentials())?.invalid != false {
errors.append("Unable to fetch managed updates - please re-enroll the device")
}
if (errors.isEmpty) {
if errors.isEmpty {
do {
let encoder = JSONEncoder()
let rawConfig = try encoder.encode(incoming)
@ -307,7 +307,7 @@ class Site: Codable {
var err: NSError?
MobileNebulaTestConfig(strConfig, key, &err)
if (err != nil) {
if err != nil {
throw err!
}
} catch {
@ -327,7 +327,7 @@ class Site: Codable {
}
func getDNCredentials() throws -> DNCredentials {
if (!managed) {
if !managed {
throw SiteError.unmanagedGetCredentials
}
@ -344,7 +344,7 @@ class Site: Codable {
let creds = try getDNCredentials()
creds.invalid = true
if (!(try creds.save(siteID: self.id))) {
if try !(creds.save(siteID: id)) {
throw SiteError.dnCredentialLoad
}
}
@ -353,13 +353,13 @@ class Site: Codable {
let creds = try getDNCredentials()
creds.invalid = false
if (!(try creds.save(siteID: self.id))) {
if try !(creds.save(siteID: id)) {
throw SiteError.dnCredentialSave
}
}
func getConfig() throws -> Data {
return try self.incomingSite!.getConfig()
return try incomingSite!.getConfig()
}
// Limits what we export to the UI
@ -429,7 +429,7 @@ class DNCredentials: Codable {
struct IncomingSite: Codable {
var name: String
var id: String
var staticHostmap: Dictionary<String, StaticHosts>
var staticHostmap: [String: StaticHosts]
var unsafeRoutes: [UnsafeRoute]?
var cert: String?
var ca: String?
@ -456,11 +456,11 @@ struct IncomingSite: Codable {
return try encoder.encode(config)
}
func save(manager: NETunnelProviderManager?, saveToManager: Bool = true, callback: @escaping (Error?) -> ()) {
func save(manager: NETunnelProviderManager?, saveToManager: Bool = true, callback: @escaping (Error?) -> Void) {
let configPath: URL
do {
configPath = try SiteList.getSiteConfigFile(id: self.id, createDir: true)
configPath = try SiteList.getSiteConfigFile(id: id, createDir: true)
} catch {
callback(error)
@ -469,28 +469,27 @@ struct IncomingSite: Codable {
log.notice("Saving to \(configPath, privacy: .public)")
do {
if (self.key != nil) {
let data = self.key!.data(using: .utf8)
if (!KeyChain.save(key: "\(self.id).key", data: data!, managed: self.managed ?? false)) {
if key != nil {
let data = key!.data(using: .utf8)
if !KeyChain.save(key: "\(id).key", data: data!, managed: managed ?? false) {
return callback(SiteError.keySave)
}
}
do {
if ((try self.dnCredentials?.save(siteID: self.id)) == false) {
if try (dnCredentials?.save(siteID: id)) == false {
return callback(SiteError.dnCredentialSave)
}
} catch {
return callback(error)
}
try self.getConfig().write(to: configPath)
try getConfig().write(to: configPath)
} catch {
return callback(error)
}
#if targetEnvironment(simulator)
// We are on a simulator and there is no NEVPNManager for us to interact with
callback(nil)
@ -503,11 +502,11 @@ struct IncomingSite: Codable {
#endif
}
private func saveToManager(manager: NETunnelProviderManager?, callback: @escaping (Error?) -> ()) {
if (manager != nil) {
private func saveToManager(manager: NETunnelProviderManager?, callback: @escaping (Error?) -> Void) {
if manager != nil {
// We need to refresh our settings to properly update config
manager?.loadFromPreferences { error in
if (error != nil) {
if error != nil {
return callback(error)
}
@ -519,13 +518,13 @@ struct IncomingSite: Codable {
return finishSaveToManager(manager: NETunnelProviderManager(), callback: callback)
}
private func finishSaveToManager(manager: NETunnelProviderManager, callback: @escaping (Error?) -> ()) {
private func finishSaveToManager(manager: NETunnelProviderManager, callback: @escaping (Error?) -> Void) {
// Stuff our details in the protocol
let proto = manager.protocolConfiguration as? NETunnelProviderProtocol ?? NETunnelProviderProtocol()
proto.providerBundleIdentifier = "net.defined.mobileNebula.NebulaNetworkExtension";
proto.providerBundleIdentifier = "net.defined.mobileNebula.NebulaNetworkExtension"
// WARN: If we stop setting providerConfiguration["id"] here, we'll need to use something else to match
// managers in PacketTunnelProvider.findManager
proto.providerConfiguration = ["id": self.id]
proto.providerConfiguration = ["id": id]
proto.serverAddress = "Nebula"
// Finish up the manager, this is what stores everything at the system level
@ -533,11 +532,11 @@ struct IncomingSite: Codable {
// TODO: cert name? manager.protocolConfiguration?.username
// TODO: This is what is shown on the vpn page. We should add more identifying details in
manager.localizedDescription = self.name
manager.localizedDescription = name
manager.isEnabled = true
manager.saveToPreferences { error in
return callback(error)
callback(error)
}
}
}

18
ios/NebulaNetworkExtension/SiteList.swift
View file

@ -8,7 +8,7 @@ class SiteList {
let fileManager = FileManager.default
let rootDir = fileManager.containerURL(forSecurityApplicationGroupIdentifier: "group.net.defined.mobileNebula")!
if (!fileManager.fileExists(atPath: rootDir.absoluteString)) {
if !fileManager.fileExists(atPath: rootDir.absoluteString) {
try fileManager.createDirectory(at: rootDir, withIntermediateDirectories: true)
}
@ -19,7 +19,7 @@ class SiteList {
static func getSitesDir() throws -> URL {
let fileManager = FileManager.default
let sitesDir = try getRootDir().appendingPathComponent("sites", isDirectory: true)
if (!fileManager.fileExists(atPath: sitesDir.absoluteString)) {
if !fileManager.fileExists(atPath: sitesDir.absoluteString) {
try fileManager.createDirectory(at: sitesDir, withIntermediateDirectories: true)
}
return sitesDir
@ -29,7 +29,7 @@ class SiteList {
static func getSiteDir(id: String, create: Bool = false) throws -> URL {
let fileManager = FileManager.default
let siteDir = try getSitesDir().appendingPathComponent(id, isDirectory: true)
if (create && !fileManager.fileExists(atPath: siteDir.absoluteString)) {
if create && !fileManager.fileExists(atPath: siteDir.absoluteString) {
try fileManager.createDirectory(at: siteDir, withIntermediateDirectories: true)
}
return siteDir
@ -45,7 +45,7 @@ class SiteList {
return try getSiteDir(id: id, create: createDir).appendingPathComponent("logs", isDirectory: false)
}
init(completion: @escaping ([String: Site]?, Error?) -> ()) {
init(completion: @escaping ([String: Site]?, Error?) -> Void) {
#if targetEnvironment(simulator)
SiteList.loadAllFromFS { sites, err in
if sites != nil {
@ -63,7 +63,7 @@ class SiteList {
#endif
}
private static func loadAllFromFS(completion: @escaping ([String: Site]?, Error?) -> ()) {
private static func loadAllFromFS(completion: @escaping ([String: Site]?, Error?) -> Void) {
let fileManager = FileManager.default
var siteDirs: [URL]
var sites = [String: Site]()
@ -76,7 +76,7 @@ class SiteList {
return
}
siteDirs.forEach { path in
for path in siteDirs {
do {
let site = try Site(path: path.appendingPathComponent("config").appendingPathExtension("json"))
sites[site.id] = site
@ -91,15 +91,15 @@ class SiteList {
completion(sites, nil)
}
private static func loadAllFromNETPM(completion: @escaping ([String: Site]?, Error?) -> ()) {
private static func loadAllFromNETPM(completion: @escaping ([String: Site]?, Error?) -> Void) {
var sites = [String: Site]()
// dispatchGroup is used to ensure we have migrated all sites before returning them
// If there are no sites to migrate, there are never any entrants
let dispatchGroup = DispatchGroup()
NETunnelProviderManager.loadAllFromPreferences() { newManagers, err in
if (err != nil) {
NETunnelProviderManager.loadAllFromPreferences { newManagers, err in
if err != nil {
return completion(nil, err)
}

7
ios/Runner/APIClient.swift
View file

@ -26,17 +26,18 @@ class APIClient {
hostID: hostID,
privateKey: privateKey,
counter: counter,
trustedKeys: trustedKeys)
trustedKeys: trustedKeys
)
} catch {
// type information from Go is not available, use string matching instead
if (error.localizedDescription == "invalid credentials") {
if error.localizedDescription == "invalid credentials" {
throw APIClientError.invalidCredentials
}
throw error
}
if (res.fetchedUpdate) {
if res.fetchedUpdate {
return try decodeIncomingSite(jsonSite: res.site)
}

64
ios/Runner/AppDelegate.swift
View file

@ -1,8 +1,8 @@
import UIKit
import Flutter
import MobileNebula
import NetworkExtension
import SwiftyJSON
import UIKit
enum ChannelName {
static let vpn = "net.defined.mobileNebula/NebulaVpnService"
@ -19,18 +19,16 @@ func MissingArgumentError(message: String, details: Any?) -> FlutterError {
private var sites: Sites?
private var ui: FlutterMethodChannel?
override func application(
_ application: UIApplication,
didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?
) -> Bool {
GeneratedPluginRegistrant.register(with: self)
dnUpdater.updateAllLoop { site in
// Signal the site has changed in case the current site details screen is active
let container = self.sites?.getContainer(id: site.id)
if (container != nil) {
if container != nil {
// Update references to the site with the new site config
container!.site = site
container!.updater.update(connected: site.connected ?? false, replaceSite: site)
@ -47,42 +45,38 @@ func MissingArgumentError(message: String, details: Any?) -> FlutterError {
sites = Sites(messenger: controller.binaryMessenger)
ui = FlutterMethodChannel(name: ChannelName.vpn, binaryMessenger: controller.binaryMessenger)
ui!.setMethodCallHandler({(call: FlutterMethodCall, result: @escaping FlutterResult) -> Void in
ui!.setMethodCallHandler { (call: FlutterMethodCall, result: @escaping FlutterResult) in
switch call.method {
case "nebula.parseCerts": return self.nebulaParseCerts(call: call, result: result)
case "nebula.generateKeyPair": return self.nebulaGenerateKeyPair(result: result)
case "nebula.renderConfig": return self.nebulaRenderConfig(call: call, result: result)
case "nebula.verifyCertAndKey": return self.nebulaVerifyCertAndKey(call: call, result: result)
case "dn.enroll": return self.dnEnroll(call: call, result: result)
case "listSites": return self.listSites(result: result)
case "deleteSite": return self.deleteSite(call: call, result: result)
case "saveSite": return self.saveSite(call: call, result: result)
case "startSite": return self.startSite(call: call, result: result)
case "stopSite": return self.stopSite(call: call, result: result)
case "active.listHostmap": self.vpnRequest(command: "listHostmap", arguments: call.arguments, result: result)
case "active.listPendingHostmap": self.vpnRequest(command: "listPendingHostmap", arguments: call.arguments, result: result)
case "active.getHostInfo": self.vpnRequest(command: "getHostInfo", arguments: call.arguments, result: result)
case "active.setRemoteForTunnel": self.vpnRequest(command: "setRemoteForTunnel", arguments: call.arguments, result: result)
case "active.closeTunnel": self.vpnRequest(command: "closeTunnel", arguments: call.arguments, result: result)
default:
result(FlutterMethodNotImplemented)
}
})
}
return super.application(application, didFinishLaunchingWithOptions: launchOptions)
}
func nebulaParseCerts(call: FlutterMethodCall, result: FlutterResult) {
guard let args = call.arguments as? Dictionary<String, String> else { return result(NoArgumentsError()) }
guard let args = call.arguments as? [String: String] else { return result(NoArgumentsError()) }
guard let certs = args["certs"] else { return result(MissingArgumentError(message: "certs is a required argument")) }
var err: NSError?
let json = MobileNebulaParseCerts(certs, &err)
if (err != nil) {
if err != nil {
return result(CallFailedError(message: "Error while parsing certificate(s)", details: err!.localizedDescription))
}
@ -90,14 +84,14 @@ func MissingArgumentError(message: String, details: Any?) -> FlutterError {
}
func nebulaVerifyCertAndKey(call: FlutterMethodCall, result: FlutterResult) {
guard let args = call.arguments as? Dictionary<String, String> else { return result(NoArgumentsError()) }
guard let args = call.arguments as? [String: String] else { return result(NoArgumentsError()) }
guard let cert = args["cert"] else { return result(MissingArgumentError(message: "cert is a required argument")) }
guard let key = args["key"] else { return result(MissingArgumentError(message: "key is a required argument")) }
var err: NSError?
var validd: ObjCBool = false
let valid = MobileNebulaVerifyCertAndKey(cert, key, &validd, &err)
if (err != nil) {
if err != nil {
return result(CallFailedError(message: "Error while verifying certificate and private key", details: err!.localizedDescription))
}
@ -107,7 +101,7 @@ func MissingArgumentError(message: String, details: Any?) -> FlutterError {
func nebulaGenerateKeyPair(result: FlutterResult) {
var err: NSError?
let kp = MobileNebulaGenerateKeyPair(&err)
if (err != nil) {
if err != nil {
return result(CallFailedError(message: "Error while generating key pairs", details: err!.localizedDescription))
}
@ -119,7 +113,7 @@ func MissingArgumentError(message: String, details: Any?) -> FlutterError {
var err: NSError?
let yaml = MobileNebulaRenderConfig(config, "<hidden>", &err)
if (err != nil) {
if err != nil {
return result(CallFailedError(message: "Error while rendering config", details: err!.localizedDescription))
}
@ -132,9 +126,9 @@ func MissingArgumentError(message: String, details: Any?) -> FlutterError {
do {
let site = try apiClient.enroll(code: code)
let oldSite = self.sites?.getSite(id: site.id)
let oldSite = sites?.getSite(id: site.id)
site.save(manager: oldSite?.manager) { error in
if (error != nil) {
if error != nil {
return result(CallFailedError(message: "Failed to enroll", details: error!.localizedDescription))
}
@ -146,8 +140,8 @@ func MissingArgumentError(message: String, details: Any?) -> FlutterError {
}
func listSites(result: @escaping FlutterResult) {
self.sites?.loadSites { (sites, err) -> () in
if (err != nil) {
sites?.loadSites { sites, err in
if err != nil {
return result(CallFailedError(message: "Failed to load site list", details: err!.localizedDescription))
}
@ -161,8 +155,8 @@ func MissingArgumentError(message: String, details: Any?) -> FlutterError {
func deleteSite(call: FlutterMethodCall, result: @escaping FlutterResult) {
guard let id = call.arguments as? String else { return result(NoArgumentsError()) }
// TODO: stop the site if its running currently
self.sites?.deleteSite(id: id) { error in
if (error != nil) {
sites?.deleteSite(id: id) { error in
if error != nil {
result(CallFailedError(message: "Failed to delete site", details: error!.localizedDescription))
}
@ -178,9 +172,9 @@ func MissingArgumentError(message: String, details: Any?) -> FlutterError {
return result(NoArgumentsError())
}
let oldSite = self.sites?.getSite(id: site.id)
let oldSite = sites?.getSite(id: site.id)
site.save(manager: oldSite?.manager) { error in
if (error != nil) {
if error != nil {
return result(CallFailedError(message: "Failed to save site", details: error!.localizedDescription))
}
@ -191,14 +185,14 @@ func MissingArgumentError(message: String, details: Any?) -> FlutterError {
}
func startSite(call: FlutterMethodCall, result: @escaping FlutterResult) {
guard let args = call.arguments as? Dictionary<String, String> else { return result(NoArgumentsError()) }
guard let args = call.arguments as? [String: String] else { return result(NoArgumentsError()) }
guard let id = args["id"] else { return result(MissingArgumentError(message: "id is a required argument")) }
#if targetEnvironment(simulator)
let updater = self.sites?.getUpdater(id: id)
let updater = sites?.getUpdater(id: id)
updater?.update(connected: true)
#else
let container = self.sites?.getContainer(id: id)
let container = sites?.getContainer(id: id)
let manager = container?.site.manager
manager?.loadFromPreferences { error in
@ -210,8 +204,8 @@ func MissingArgumentError(message: String, details: Any?) -> FlutterError {
manager?.loadFromPreferences { error in
// TODO: Handle load error
do {
container?.updater.startFunc = {() -> Void in
return self.vpnRequest(command: "start", arguments: args, result: result)
container?.updater.startFunc = { () in
self.vpnRequest(command: "start", arguments: args, result: result)
}
try manager?.connection.startVPNTunnel(options: ["expectStart": NSNumber(1)])
} catch {
@ -224,15 +218,15 @@ func MissingArgumentError(message: String, details: Any?) -> FlutterError {
}
func stopSite(call: FlutterMethodCall, result: @escaping FlutterResult) {
guard let args = call.arguments as? Dictionary<String, String> else { return result(NoArgumentsError()) }
guard let args = call.arguments as? [String: String] else { return result(NoArgumentsError()) }
guard let id = args["id"] else { return result(MissingArgumentError(message: "id is a required argument")) }
#if targetEnvironment(simulator)
let updater = self.sites?.getUpdater(id: id)
let updater = sites?.getUpdater(id: id)
updater?.update(connected: false)
#else
let manager = self.sites?.getSite(id: id)?.manager
manager?.loadFromPreferences{ error in
let manager = sites?.getSite(id: id)?.manager
manager?.loadFromPreferences { _ in
// TODO: Handle load error
manager?.connection.stopVPNTunnel()
@ -242,7 +236,7 @@ func MissingArgumentError(message: String, details: Any?) -> FlutterError {
}
func vpnRequest(command: String, arguments: Any?, result: @escaping FlutterResult) {
guard let args = arguments as? Dictionary<String, Any> else { return result(NoArgumentsError()) }
guard let args = arguments as? [String: Any] else { return result(NoArgumentsError()) }
guard let id = args["id"] as? String else { return result(MissingArgumentError(message: "id is a required argument")) }
let container = sites?.getContainer(id: id)
@ -258,7 +252,7 @@ func MissingArgumentError(message: String, details: Any?) -> FlutterError {
if let session = container!.site.manager?.connection as? NETunnelProviderSession {
do {
try session.sendProviderMessage(try JSONEncoder().encode(IPCRequest(command: command, arguments: JSON(args)))) { data in
try session.sendProviderMessage(JSONEncoder().encode(IPCRequest(command: command, arguments: JSON(args)))) { data in
if data == nil {
return result(nil)
}

21
ios/Runner/DNUpdate.swift
View file

@ -6,13 +6,13 @@ class DNUpdater {
private let timer = RepeatingTimer(timeInterval: 15 * 60) // 15 * 60 is 15 minutes
private let log = Logger(subsystem: "net.defined.mobileNebula", category: "DNUpdater")
func updateAll(onUpdate: @escaping (Site) -> ()) {
_ = SiteList{ (sites, _) -> () in
func updateAll(onUpdate: @escaping (Site) -> Void) {
_ = SiteList { sites, _ in
// NEVPN seems to force us onto the main thread and we are about to make network calls that
// could block for a while. Push ourselves onto another thread to avoid blocking the UI.
Task.detached(priority: .userInitiated) {
sites?.values.forEach { site in
if (site.connected == true) {
if site.connected == true {
// The vpn service is in charge of updating the currently connected site
return
}
@ -23,23 +23,23 @@ class DNUpdater {
}
}
func updateAllLoop(onUpdate: @escaping (Site) -> ()) {
func updateAllLoop(onUpdate: @escaping (Site) -> Void) {
timer.eventHandler = {
self.updateAll(onUpdate: onUpdate)
}
timer.resume()
}
func updateSingleLoop(site: Site, onUpdate: @escaping (Site) -> ()) {
func updateSingleLoop(site: Site, onUpdate: @escaping (Site) -> Void) {
timer.eventHandler = {
self.updateSite(site: site, onUpdate: onUpdate)
}
timer.resume()
}
func updateSite(site: Site, onUpdate: @escaping (Site) -> ()) {
func updateSite(site: Site, onUpdate: @escaping (Site) -> Void) {
do {
if (!site.managed) {
if !site.managed {
return
}
@ -55,7 +55,7 @@ class DNUpdater {
trustedKeys: credentials.trustedKeys
)
} catch (APIClientError.invalidCredentials) {
if (!credentials.invalid) {
if !credentials.invalid {
try site.invalidateDNCredentials()
log.notice("Invalidated credentials in site: \(site.name, privacy: .public)")
}
@ -67,7 +67,7 @@ class DNUpdater {
let shouldSaveToManager = siteManager != nil || ProcessInfo().isOperatingSystemAtLeast(OperatingSystemVersion(majorVersion: 17, minorVersion: 0, patchVersion: 0))
newSite?.save(manager: site.manager, saveToManager: shouldSaveToManager) { error in
if (error != nil) {
if error != nil {
self.log.error("failed to save update: \(error!.localizedDescription, privacy: .public)")
}
@ -75,7 +75,7 @@ class DNUpdater {
onUpdate(Site(incoming: newSite!))
}
if (credentials.invalid) {
if credentials.invalid {
try site.validateDNCredentials()
log.notice("Revalidated credentials in site \(site.name, privacy: .public)")
}
@ -88,7 +88,6 @@ class DNUpdater {
// From https://medium.com/over-engineering/a-background-repeating-timer-in-swift-412cecfd2ef9
class RepeatingTimer {
let timeInterval: TimeInterval
init(timeInterval: TimeInterval) {

2
ios/Runner/PackageInfo.swift
View file

@ -6,7 +6,7 @@ class PackageInfo {
"unknown"
let buildNumber = Bundle.main.infoDictionary?["CFBundleVersion"] as? String
if (buildNumber == nil) {
if buildNumber == nil {
return version
}

64
ios/Runner/Sites.swift
View file

@ -1,5 +1,5 @@
import NetworkExtension
import MobileNebula
import NetworkExtension
class SiteContainer {
var site: Site
@ -19,15 +19,15 @@ class Sites {
self.messenger = messenger
}
func loadSites(completion: @escaping ([String: Site]?, Error?) -> ()) {
_ = SiteList { (sites, err) in
if (err != nil) {
func loadSites(completion: @escaping ([String: Site]?, Error?) -> Void) {
_ = SiteList { sites, err in
if err != nil {
return completion(nil, err)
}
sites?.values.forEach { site in
var updater = self.containers[site.id]?.updater
if (updater != nil) {
if updater != nil {
updater!.setSite(site: site)
} else {
updater = SiteUpdater(messenger: self.messenger!, site: site)
@ -36,14 +36,14 @@ class Sites {
}
let justSites = self.containers.mapValues {
return $0.site
$0.site
}
completion(justSites, nil)
}
}
func deleteSite(id: String, callback: @escaping (Error?) -> ()) {
if let site = self.containers.removeValue(forKey: id) {
func deleteSite(id: String, callback: @escaping (Error?) -> Void) {
if let site = containers.removeValue(forKey: id) {
_ = KeyChain.delete(key: "\(site.site.id).dnCredentials")
_ = KeyChain.delete(key: "\(site.site.id).key")
@ -66,21 +66,21 @@ class Sites {
}
func getSite(id: String) -> Site? {
return self.containers[id]?.site
return containers[id]?.site
}
func getUpdater(id: String) -> SiteUpdater? {
return self.containers[id]?.updater
return containers[id]?.updater
}
func getContainer(id: String) -> SiteContainer? {
return self.containers[id]
return containers[id]
}
}
class SiteUpdater: NSObject, FlutterStreamHandler {
private var eventSink: FlutterEventSink?;
private var eventChannel: FlutterEventChannel;
private var eventSink: FlutterEventSink?
private var eventChannel: FlutterEventChannel
private var site: Site
private var notification: Any?
public var startFunc: (() -> Void)?
@ -90,15 +90,15 @@ class SiteUpdater: NSObject, FlutterStreamHandler {
init(messenger: FlutterBinaryMessenger, site: Site) {
do {
let configPath = try SiteList.getSiteConfigFile(id: site.id, createDir: false)
self.configFd = open(configPath.path, O_EVTONLY)
self.configObserver = DispatchSource.makeFileSystemObjectSource(
fileDescriptor: self.configFd!,
configFd = open(configPath.path, O_EVTONLY)
configObserver = DispatchSource.makeFileSystemObjectSource(
fileDescriptor: configFd!,
eventMask: .write
)
} catch {
// SiteList.getSiteConfigFile should never throw because we are not creating it here
self.configObserver = nil
configObserver = nil
}
eventChannel = FlutterEventChannel(name: "net.defined.nebula/\(site.id)", binaryMessenger: messenger)
@ -107,15 +107,15 @@ class SiteUpdater: NSObject, FlutterStreamHandler {
eventChannel.setStreamHandler(self)
self.configObserver?.setEventHandler(handler: self.configUpdated)
self.configObserver?.setCancelHandler {
configObserver?.setEventHandler(handler: configUpdated)
configObserver?.setCancelHandler {
if self.configFd != nil {
close(self.configFd!)
}
self.configObserver = nil
}
self.configObserver?.resume()
configObserver?.resume()
}
func setSite(site: Site) {
@ -123,8 +123,8 @@ class SiteUpdater: NSObject, FlutterStreamHandler {
}
/// onListen is called when flutter code attaches an event listener
func onListen(withArguments arguments: Any?, eventSink events: @escaping FlutterEventSink) -> FlutterError? {
eventSink = events;
func onListen(withArguments _: Any?, eventSink events: @escaping FlutterEventSink) -> FlutterError? {
eventSink = events
#if !targetEnvironment(simulator)
if site.manager == nil {
@ -133,13 +133,13 @@ class SiteUpdater: NSObject, FlutterStreamHandler {
return FlutterError(code: "Internal Error", message: "Flutter manager was not present", details: nil)
}
self.notification = NotificationCenter.default.addObserver(forName: NSNotification.Name.NEVPNStatusDidChange, object: site.manager!.connection , queue: nil) { n in
notification = NotificationCenter.default.addObserver(forName: NSNotification.Name.NEVPNStatusDidChange, object: site.manager!.connection, queue: nil) { _ in
let oldConnected = self.site.connected
self.site.status = statusString[self.site.manager!.connection.status]
self.site.connected = statusMap[self.site.manager!.connection.status]
// Check to see if we just moved to connected and if we have a start function to call when that happens
if self.site.connected! && oldConnected != self.site.connected && self.startFunc != nil {
if self.site.connected!, oldConnected != self.site.connected, self.startFunc != nil {
self.startFunc!()
self.startFunc = nil
}
@ -151,16 +151,16 @@ class SiteUpdater: NSObject, FlutterStreamHandler {
}
/// onCancel is called when the flutter listener stops listening
func onCancel(withArguments arguments: Any?) -> FlutterError? {
if (self.notification != nil) {
NotificationCenter.default.removeObserver(self.notification!)
func onCancel(withArguments _: Any?) -> FlutterError? {
if notification != nil {
NotificationCenter.default.removeObserver(notification!)
}
return nil
}
/// update is a way to send information to the flutter listener and generally should not be used directly
func update(connected: Bool, replaceSite: Site? = nil) {
if (replaceSite != nil) {
if replaceSite != nil {
site = replaceSite!
}
site.connected = connected
@ -168,18 +168,18 @@ class SiteUpdater: NSObject, FlutterStreamHandler {
let encoder = JSONEncoder()
let data = try! encoder.encode(site)
self.eventSink?(String(data: data, encoding: .utf8))
eventSink?(String(data: data, encoding: .utf8))
}
private func configUpdated() {
if self.site.connected != true {
if site.connected != true {
return
}
guard let newSite = try? Site(manager: self.site.manager!) else {
guard let newSite = try? Site(manager: site.manager!) else {
return
}
self.update(connected: newSite.connected ?? false, replaceSite: newSite)
update(connected: newSite.connected ?? false, replaceSite: newSite)
}
}