Implemented GetPeers intent
Signed-off-by: Alessio Nossa <alessio.nossa@gmail.com>
This commit is contained in:
Alessio Nossa
@@ -0,0 +1,157 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>INEnums</key>
|
||||
<array/>
|
||||
<key>INIntentDefinitionModelVersion</key>
|
||||
<string>1.2</string>
|
||||
<key>INIntentDefinitionNamespace</key>
|
||||
<string>6NREiY</string>
|
||||
<key>INIntentDefinitionSystemVersion</key>
|
||||
<string>21C52</string>
|
||||
<key>INIntentDefinitionToolsBuildVersion</key>
|
||||
<string>13C100</string>
|
||||
<key>INIntentDefinitionToolsVersion</key>
|
||||
<string>13.2.1</string>
|
||||
<key>INIntents</key>
|
||||
<array>
|
||||
<dict>
|
||||
<key>INIntentCategory</key>
|
||||
<string>generic</string>
|
||||
<key>INIntentConfigurable</key>
|
||||
<true/>
|
||||
<key>INIntentDescription</key>
|
||||
<string>Get list of public keys of peers in the selected configuration</string>
|
||||
<key>INIntentDescriptionID</key>
|
||||
<string>e4jxYU</string>
|
||||
<key>INIntentIneligibleForSuggestions</key>
|
||||
<true/>
|
||||
<key>INIntentKeyParameter</key>
|
||||
<string>tunnel</string>
|
||||
<key>INIntentLastParameterTag</key>
|
||||
<integer>1</integer>
|
||||
<key>INIntentManagedParameterCombinations</key>
|
||||
<dict>
|
||||
<key>tunnel</key>
|
||||
<dict>
|
||||
<key>INIntentParameterCombinationSupportsBackgroundExecution</key>
|
||||
<true/>
|
||||
<key>INIntentParameterCombinationTitle</key>
|
||||
<string>Get peers of ${tunnel}</string>
|
||||
<key>INIntentParameterCombinationTitleID</key>
|
||||
<string>5Ewt1o</string>
|
||||
<key>INIntentParameterCombinationUpdatesLinked</key>
|
||||
<true/>
|
||||
</dict>
|
||||
</dict>
|
||||
<key>INIntentName</key>
|
||||
<string>GetPeers</string>
|
||||
<key>INIntentParameters</key>
|
||||
<array>
|
||||
<dict>
|
||||
<key>INIntentParameterConfigurable</key>
|
||||
<true/>
|
||||
<key>INIntentParameterDisplayName</key>
|
||||
<string>Tunnel</string>
|
||||
<key>INIntentParameterDisplayNameID</key>
|
||||
<string>tUPuxx</string>
|
||||
<key>INIntentParameterDisplayPriority</key>
|
||||
<integer>1</integer>
|
||||
<key>INIntentParameterMetadata</key>
|
||||
<dict>
|
||||
<key>INIntentParameterMetadataCapitalization</key>
|
||||
<string>Sentences</string>
|
||||
<key>INIntentParameterMetadataDefaultValueID</key>
|
||||
<string>0AfeHS</string>
|
||||
</dict>
|
||||
<key>INIntentParameterName</key>
|
||||
<string>tunnel</string>
|
||||
<key>INIntentParameterPromptDialogs</key>
|
||||
<array>
|
||||
<dict>
|
||||
<key>INIntentParameterPromptDialogCustom</key>
|
||||
<true/>
|
||||
<key>INIntentParameterPromptDialogType</key>
|
||||
<string>Configuration</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>INIntentParameterPromptDialogCustom</key>
|
||||
<true/>
|
||||
<key>INIntentParameterPromptDialogType</key>
|
||||
<string>Primary</string>
|
||||
</dict>
|
||||
</array>
|
||||
<key>INIntentParameterSupportsDynamicEnumeration</key>
|
||||
<true/>
|
||||
<key>INIntentParameterTag</key>
|
||||
<integer>1</integer>
|
||||
<key>INIntentParameterType</key>
|
||||
<string>String</string>
|
||||
</dict>
|
||||
</array>
|
||||
<key>INIntentResponse</key>
|
||||
<dict>
|
||||
<key>INIntentResponseCodes</key>
|
||||
<array>
|
||||
<dict>
|
||||
<key>INIntentResponseCodeName</key>
|
||||
<string>success</string>
|
||||
<key>INIntentResponseCodeSuccess</key>
|
||||
<true/>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>INIntentResponseCodeName</key>
|
||||
<string>failure</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>INIntentResponseCodeConciseFormatString</key>
|
||||
<string>Failed to retrive configuration with the provided name.</string>
|
||||
<key>INIntentResponseCodeConciseFormatStringID</key>
|
||||
<string>ExhkKO</string>
|
||||
<key>INIntentResponseCodeFormatString</key>
|
||||
<string>Failed to retrive configuration with the provided name.</string>
|
||||
<key>INIntentResponseCodeFormatStringID</key>
|
||||
<string>lxnQb0</string>
|
||||
<key>INIntentResponseCodeName</key>
|
||||
<string>wrongTunnel</string>
|
||||
</dict>
|
||||
</array>
|
||||
<key>INIntentResponseLastParameterTag</key>
|
||||
<integer>2</integer>
|
||||
<key>INIntentResponseOutput</key>
|
||||
<string>peersPublicKeys</string>
|
||||
<key>INIntentResponseParameters</key>
|
||||
<array>
|
||||
<dict>
|
||||
<key>INIntentResponseParameterDisplayName</key>
|
||||
<string>Peers Public Keys</string>
|
||||
<key>INIntentResponseParameterDisplayNameID</key>
|
||||
<string>zJOQgA</string>
|
||||
<key>INIntentResponseParameterDisplayPriority</key>
|
||||
<integer>1</integer>
|
||||
<key>INIntentResponseParameterName</key>
|
||||
<string>peersPublicKeys</string>
|
||||
<key>INIntentResponseParameterSupportsMultipleValues</key>
|
||||
<true/>
|
||||
<key>INIntentResponseParameterTag</key>
|
||||
<integer>2</integer>
|
||||
<key>INIntentResponseParameterType</key>
|
||||
<string>String</string>
|
||||
</dict>
|
||||
</array>
|
||||
</dict>
|
||||
<key>INIntentTitle</key>
|
||||
<string>Get Peers</string>
|
||||
<key>INIntentTitleID</key>
|
||||
<string>V1ySW4</string>
|
||||
<key>INIntentType</key>
|
||||
<string>Custom</string>
|
||||
<key>INIntentVerb</key>
|
||||
<string>Do</string>
|
||||
</dict>
|
||||
</array>
|
||||
<key>INTypes</key>
|
||||
<array/>
|
||||
</dict>
|
||||
</plist>
|
||||
@@ -28,8 +28,12 @@
|
||||
<dict>
|
||||
<key>IntentsRestrictedWhileLocked</key>
|
||||
<array/>
|
||||
<key>IntentsSupported</key>
|
||||
<key>IntentsRestrictedWhileProtectedDataUnavailable</key>
|
||||
<array/>
|
||||
<key>IntentsSupported</key>
|
||||
<array>
|
||||
<string>GetPeersIntent</string>
|
||||
</array>
|
||||
</dict>
|
||||
<key>NSExtensionPointIdentifier</key>
|
||||
<string>com.apple.intents-service</string>
|
||||
|
||||
@@ -5,11 +5,17 @@ import Intents
|
||||
|
||||
class IntentHandler: INExtension {
|
||||
|
||||
override func handler(for intent: INIntent) -> Any {
|
||||
// This is the default implementation. If you want different objects to handle different intents,
|
||||
// you can override this and return the handler you want for that particular intent.
|
||||
override init() {
|
||||
super.init()
|
||||
Logger.configureGlobal(tagged: "INTENTS", withFilePath: FileManager.logFileURL?.path)
|
||||
}
|
||||
|
||||
return self
|
||||
override func handler(for intent: INIntent) -> Any {
|
||||
guard intent is GetPeersIntent else {
|
||||
fatalError("Unhandled intent type: \(intent)")
|
||||
}
|
||||
|
||||
return IntentHandling()
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,120 @@
|
||||
// SPDX-License-Identifier: MIT
|
||||
// Copyright © 2018-2021 WireGuard LLC. All Rights Reserved.
|
||||
|
||||
import Intents
|
||||
|
||||
class IntentHandling: NSObject {
|
||||
|
||||
public enum IntentError: Error {
|
||||
case failedDecode
|
||||
case wrongTunnel
|
||||
case unknown
|
||||
}
|
||||
|
||||
var tunnelsManager: TunnelsManager?
|
||||
|
||||
var onTunnelsManagerReady: ((TunnelsManager) -> Void)?
|
||||
|
||||
override init() {
|
||||
super.init()
|
||||
|
||||
TunnelsManager.create { [weak self] result in
|
||||
guard let self = self else { return }
|
||||
|
||||
switch result {
|
||||
case .failure(let error):
|
||||
wg_log(.error, message: error.localizedDescription)
|
||||
case .success(let tunnelsManager):
|
||||
self.tunnelsManager = tunnelsManager
|
||||
|
||||
self.onTunnelsManagerReady?(tunnelsManager)
|
||||
self.onTunnelsManagerReady = nil
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
init(tunnelsManager: TunnelsManager) {
|
||||
super.init()
|
||||
|
||||
self.tunnelsManager = tunnelsManager
|
||||
}
|
||||
}
|
||||
|
||||
extension IntentHandling {
|
||||
|
||||
private func allTunnelNames(completion: @escaping ([String]?) -> Void) {
|
||||
let getTunnelsNameBlock: (TunnelsManager) -> Void = { tunnelsManager in
|
||||
let tunnelsNames = tunnelsManager.mapTunnels { $0.name }
|
||||
return completion(tunnelsNames)
|
||||
}
|
||||
|
||||
if let tunnelsManager = tunnelsManager {
|
||||
getTunnelsNameBlock(tunnelsManager)
|
||||
} else {
|
||||
if onTunnelsManagerReady != nil {
|
||||
wg_log(.error, message: "Overriding onTunnelsManagerReady action in allTunnelNames function. This should not happen.")
|
||||
}
|
||||
onTunnelsManagerReady = getTunnelsNameBlock
|
||||
}
|
||||
}
|
||||
|
||||
private func allTunnelPeers(for tunnelName: String, completion: @escaping (Result<[String], IntentError>) -> Void) {
|
||||
let getPeersFromConfigBlock: (TunnelsManager) -> Void = { tunnelsManager in
|
||||
guard let tunnel = tunnelsManager.tunnel(named: tunnelName) else {
|
||||
return completion(.failure(.wrongTunnel))
|
||||
}
|
||||
|
||||
guard let publicKeys = tunnel.tunnelConfiguration?.peers.map({ $0.publicKey.base64Key }) else {
|
||||
return completion(.failure(.unknown))
|
||||
}
|
||||
return completion(.success(publicKeys))
|
||||
}
|
||||
|
||||
if let tunnelsManager = tunnelsManager {
|
||||
getPeersFromConfigBlock(tunnelsManager)
|
||||
} else {
|
||||
if onTunnelsManagerReady != nil {
|
||||
wg_log(.error, message: "Overriding onTunnelsManagerReady action in allTunnelPeers function. This should not happen.")
|
||||
}
|
||||
onTunnelsManagerReady = getPeersFromConfigBlock
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
extension IntentHandling: GetPeersIntentHandling {
|
||||
|
||||
@available(iOSApplicationExtension 14.0, *)
|
||||
func provideTunnelOptionsCollection(for intent: GetPeersIntent, with completion: @escaping (INObjectCollection<NSString>?, Error?) -> Void) {
|
||||
|
||||
self.allTunnelNames { tunnelsNames in
|
||||
let tunnelsNamesObjects = (tunnelsNames ?? []).map { NSString(string: $0) }
|
||||
|
||||
let objectCollection = INObjectCollection(items: tunnelsNamesObjects)
|
||||
completion(objectCollection, nil)
|
||||
}
|
||||
}
|
||||
|
||||
func handle(intent: GetPeersIntent, completion: @escaping (GetPeersIntentResponse) -> Void) {
|
||||
guard let tunnel = intent.tunnel else {
|
||||
return completion(GetPeersIntentResponse(code: .failure, userActivity: nil))
|
||||
}
|
||||
|
||||
self.allTunnelPeers(for: tunnel) { peersResult in
|
||||
switch peersResult {
|
||||
case .success(let peers):
|
||||
let response = GetPeersIntentResponse(code: .success, userActivity: nil)
|
||||
response.peersPublicKeys = peers
|
||||
completion(response)
|
||||
|
||||
case .failure(let error):
|
||||
switch error {
|
||||
case .wrongTunnel:
|
||||
completion(GetPeersIntentResponse(code: .wrongTunnel, userActivity: nil))
|
||||
default:
|
||||
completion(GetPeersIntentResponse(code: .failure, userActivity: nil))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -2,6 +2,10 @@
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>com.apple.developer.networking.networkextension</key>
|
||||
<array>
|
||||
<string>packet-tunnel-provider</string>
|
||||
</array>
|
||||
<key>com.apple.security.application-groups</key>
|
||||
<array>
|
||||
<string>group.$(APP_ID_IOS)</string>
|
||||
|
||||
Reference in New Issue
Block a user