feat: evaluate key rotation as soon as VPN is connected

ivpn · Nov 21, 2023 · 3376334 · 3376334
1 parent 2a255a0
commit 3376334
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/wireguard-tunnel-provider/PacketTunnelProvider.swift b/wireguard-tunnel-provider/PacketTunnelProvider.swift
@@ -145,18 +145,23 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
     }
 
     private func startKeyRegenerationMonitor(completion: @escaping (Error?) -> Void) {
+        evaluateKeyRotation(completion)
         let timer = TimerManager(timeInterval: AppKeyManager.regenerationCheckInterval)
         timer.eventHandler = {
-            if AppKeyManager.needToRegenerate() {
-                self.regenerateKeys { error in
-                    completion(error)
-                }
-            }
+            self.evaluateKeyRotation(completion)
             timer.proceed()
         }
         timer.resume()
     }
 
+    private func evaluateKeyRotation(_ completion: @escaping (Error?) -> Void) {
+        if AppKeyManager.needToRegenerate() {
+            self.regenerateKeys { error in
+                completion(error)
+            }
+        }
+    }
+
     private func regenerateKeys(completion: @escaping (Error?) -> Void) {
         wg_log(.info, message: "Rotating keys")
         AppKeyManager.shared.setNewKey { privateKey, ipAddress, presharedKey in