capacitor-freerasp 2.2.2 → 2.4.0

package/ios/Plugin/FreeraspPlugin.swift

@@ -7,11 +7,16 @@ public class FreeraspPlugin: CAPPlugin {
 
     public static var shared: FreeraspPlugin?
     
-    let threatChannelKey = String(Int.random(in: 100_000..<999_999_999)) // key of the argument map under which threats are expected
-    let threatChannelName = String(Int.random(in: 100_000..<999_999_999)) // name of the channel over which threat callbacks are sent
-    
     override public func load() {
         FreeraspPlugin.shared = self
+        
+        ThreatDispatcher.shared.listener = { [weak self] threat in
+            self?.notifyListeners(EventIdentifiers.threatChannelName, data: [EventIdentifiers.threatChannelKey: threat.callbackIdentifier], retainUntilConsumed: true)
+        }
+        
+        ExecutionStateDispatcher.shared.listener = { [weak self] event in
+            self?.notifyListeners(EventIdentifiers.raspExecutionStateChannelName, data: [EventIdentifiers.raspExecutionStateChannelKey: event.callbackIdentifier], retainUntilConsumed: true)
+        }
     }
     
     /// Runs Talsec with given configuration
@@ -40,6 +45,11 @@ public class FreeraspPlugin: CAPPlugin {
         UserDefaults.standard.set(externalId, forKey: "app.talsec.externalid")
         call.resolve(["result": true])
     }
+    
+    @objc func removeExternalId(_ call: CAPPluginCall) -> Void {
+        UserDefaults.standard.removeObject(forKey: "app.talsec.externalid")
+        call.resolve(["result": true])
+    }
 
     @objc func blockScreenCapture(_ call: CAPPluginCall) -> Void {
         guard let enable = call.getBool("enable") else {
@@ -68,28 +78,21 @@ public class FreeraspPlugin: CAPPlugin {
         }
     }
     
-    private func getProtectedWindow(completion: @escaping (UIWindow?) -> Void) {
-        DispatchQueue.main.async {
-            if #available(iOS 13.0, *) {
-                if let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene {
-                    if let window = windowScene.windows.first {
-                        completion(window)
-                    } else {
-                        completion(nil)
-                    }
-                } else {
-                    completion(nil)
-                }
-            }
-        }
-    }
-    
     /**
-     * Method to setup the message passing between native and React Native
+     * Method to setup the message passing between native and Capacitor
      */
     @objc func getThreatChannelData(_ call: CAPPluginCall) -> Void {
         call.resolve([
-                    "ids": [threatChannelName, threatChannelKey]
+                    "ids": [EventIdentifiers.threatChannelName, EventIdentifiers.threatChannelKey]
+                ])
+    }
+
+    /**
+     * Method to setup the message passing between native and Capacitor
+     */
+    @objc func getRaspExecutionStateChannelData(_ call: CAPPluginCall) -> Void {
+        call.resolve([
+                    "ids": [EventIdentifiers.raspExecutionStateChannelName, EventIdentifiers.raspExecutionStateChannelKey]
                 ])
     }
     
@@ -98,9 +101,15 @@ public class FreeraspPlugin: CAPPlugin {
      */
     @objc func getThreatIdentifiers(_ call: CAPPluginCall) -> Void {
         call.resolve([
-                    "ids": getThreatIdentifiers()
+                    "ids": getThreatIdentifiersList()
                 ])
     }
+
+    @objc func getRaspExecutionStateIdentifiers(_ call: CAPPluginCall) -> Void {
+        call.resolve([
+            "ids": getRaspExecutionStateIdentifiersList()
+        ])
+    }
     
     /**
      * We never send an invalid callback over our channel.
@@ -110,16 +119,6 @@ public class FreeraspPlugin: CAPPlugin {
         abort()
     }
     
-    private func getThreatIdentifiers() -> [Int] {
-        return SecurityThreat.allCases
-            .filter {
-                threat in threat.rawValue != "passcodeChange"
-            }
-            .map {
-                threat in threat.callbackIdentifier
-            }
-    }
-    
     private func initializeTalsec(talsecConfig: JSObject) throws {
         guard let iosConfig = talsecConfig["iosConfig"] as? JSObject else {
             throw NSError(domain: "Missing iosConfig parameter in Talsec Native Plugin", code: 1)
@@ -140,56 +139,16 @@ public class FreeraspPlugin: CAPPlugin {
     }
 }
 
-extension SecurityThreatCenter: SecurityThreatHandler {
+extension SecurityThreatCenter:  @retroactive SecurityThreatHandler, @retroactive RaspExecutionState {
     
     public func threatDetected(_ securityThreat: TalsecRuntime.SecurityThreat) {
         if (securityThreat.rawValue == "passcodeChange") {
             return
         }
-
-        FreeraspPlugin.shared!.notifyListeners(FreeraspPlugin.shared!.threatChannelName, data: [FreeraspPlugin.shared!.threatChannelKey: securityThreat.callbackIdentifier], retainUntilConsumed: true)
+        ThreatDispatcher.shared.dispatch(threat: securityThreat)
     }
-}
-
-struct ThreatIdentifiers {
-    static let threatIdentifierList: [Int] = (1...14).map { _ in Int.random(in: 100_000..<999_999_999) }
-}
-
-/// An extension to unify callback names with Capacitor ones.
-extension SecurityThreat {
-
-    var callbackIdentifier: Int {
-        switch self {
-            case .signature:
-                return ThreatIdentifiers.threatIdentifierList[0]
-            case .jailbreak:
-                return ThreatIdentifiers.threatIdentifierList[1]
-            case .debugger:
-                return ThreatIdentifiers.threatIdentifierList[2]
-            case .runtimeManipulation:
-                return ThreatIdentifiers.threatIdentifierList[3]
-            case .passcode:
-                return ThreatIdentifiers.threatIdentifierList[4]
-            case .passcodeChange:
-                return ThreatIdentifiers.threatIdentifierList[5]
-            case .simulator:
-                return ThreatIdentifiers.threatIdentifierList[6]
-            case .missingSecureEnclave:
-                return ThreatIdentifiers.threatIdentifierList[7]
-            case .systemVPN:
-                return ThreatIdentifiers.threatIdentifierList[8]
-            case .deviceChange:
-                return ThreatIdentifiers.threatIdentifierList[9]
-            case .deviceID:
-                return ThreatIdentifiers.threatIdentifierList[10]
-            case .unofficialStore:
-                return ThreatIdentifiers.threatIdentifierList[11]
-            case .screenshot:
-                return ThreatIdentifiers.threatIdentifierList[12]
-            case .screenRecording:
-                return ThreatIdentifiers.threatIdentifierList[13]
-            @unknown default:
-                abort()
-        }
+    
+    public func onAllChecksFinished() {
+        ExecutionStateDispatcher.shared.dispatch(event: RaspExecutionStates.allChecksFinished)
     }
 }

package/ios/Plugin/Info.plist

@@ -21,4 +21,4 @@
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>
-</plist>
+</plist>