clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use the existing VAPID key generation

This commit is contained in:
Michael 2021-08-15 21:54:24 +00:00
parent 2c1b33af87
commit e3f8f371a7
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Model/Subscription.php
View File

@ -31,6 +31,7 @@ use Friendica\Core\Worker;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\DI; use Friendica\DI;
use Friendica\Util\Crypto; use Friendica\Util\Crypto;
use Minishlink\WebPush\VAPID;
class Subscription class Subscription
{ {
@ -107,8 +108,8 @@ class Subscription
private static function getKeyPair(): array private static function getKeyPair(): array
{ {
$keypair = DI::config()->get('system', 'ec_keypair'); $keypair = DI::config()->get('system', 'ec_keypair');
if (empty($keypair)) { if (empty($keypair['publicKey']) || empty($keypair['privateKey'])) {
$keypair = Crypto::newECKeypair(); $keypair = VAPID::createVapidKeys();
DI::config()->set('system', 'ec_keypair', $keypair); DI::config()->set('system', 'ec_keypair', $keypair);
} }
return $keypair; return $keypair;
@ -122,7 +123,7 @@ class Subscription
public static function getPublicVapidKey(): string public static function getPublicVapidKey(): string
{ {
$keypair = self::getKeyPair(); $keypair = self::getKeyPair();
return $keypair['vapid-public']; return $keypair['publicKey'];
} }
/** /**
@ -133,7 +134,7 @@ class Subscription
public static function getPrivateVapidKey(): string public static function getPrivateVapidKey(): string
{ {
$keypair = self::getKeyPair(); $keypair = self::getKeyPair();
return $keypair['vapid-private']; return $keypair['privateKey'];
} }
/** /**