By creating new public/private key clear database with registered ser…

…vice worker
WoltLab · Feb 23, 2024 · 8ce4cc4 · 8ce4cc4
1 parent f4f354e
commit 8ce4cc4
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/wcfsetup/install/files/lib/system/service/worker/ServiceWorkerHandler.class.php b/wcfsetup/install/files/lib/system/service/worker/ServiceWorkerHandler.class.php
@@ -11,6 +11,7 @@
 use wcf\system\io\HttpFactory;
 use wcf\system\registry\RegistryHandler;
 use wcf\system\SingletonFactory;
+use wcf\system\WCF;
 
 /**
  * @author      Olaf Braun
@@ -50,7 +51,7 @@ public function updateKeys(): void
     private function createNewKeys(): void
     {
         $jwk = JWKFactory::createECKey(Encryption::CURVE_ALGORITHM);
-        $binaryPublicKey = Util::serializePublicKey($jwk->get('x'), $jwk->get('y'));
+        $binaryPublicKey = Util::serializePublicKey($jwk);
         $binaryPrivateKey = \str_pad(
             Base64UrlSafe::decode($jwk->get('d'), true),
             VAPID::PRIVATE_KEY_LENGTH,
@@ -68,6 +69,11 @@ private function createNewKeys(): void
             self::REGISTRY_KEY,
             \hash('sha256', $base64PrivateKey)
         );
+
+        // Previous client keys are no longer valid
+        $sql = "DELETE FROM wcf1_service_worker";
+        $statement = WCF::getDB()->prepare($sql);
+        $statement->execute();
     }
 
     /**