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

We need to create a vapid public and private key

This commit is contained in:
Michael 2021-08-15 12:57:29 +00:00
parent 74f3cbc383
commit 5056376902
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Model/Subscription.php
View File

@ -19,6 +19,10 @@
*
*/
/**
* @see https://github.com/web-push-libs/web-push-php
* Possibly we should simply use this.
*/
namespace Friendica\Model;
use Friendica\Database\DBA;
@ -104,6 +108,6 @@ class Subscription
$keypair = Crypto::newECKeypair();
DI::config()->set('system', 'ec_keypair', $keypair);
}
return $keypair['vapid'];
return $keypair['vapid-public'];
}
}

11
src/Util/Crypto.php
View File

@ -155,7 +155,7 @@ class Crypto
/**
* Create a new elliptic curve key pair
*
* @return array with the elements "prvkey", "vapid" and "pubkey"
* @return array with the elements "prvkey", "pubkey", "vapid-public" and "vapid-private"
*/
public static function newECKeypair()
{
@ -174,7 +174,7 @@ class Crypto
throw new Exception('Key creation failed');
}
$response = ['prvkey' => '', 'pubkey' => '', 'vapid' => ''];
$response = ['prvkey' => '', 'pubkey' => ''];
// Get private key
openssl_pkey_export($result, $response['prvkey']);
@ -183,12 +183,15 @@ class Crypto
$pkey = openssl_pkey_get_details($result);
$response['pubkey'] = $pkey['key'];
// Create VAPID key
// Create VAPID keys
// @see https://github.com/web-push-libs/web-push-php/blob/256a18b2a2411469c94943725fb6eccb9681bd75/src/Utils.php#L60-L62
$hexString = '04';
$hexString .= str_pad(bin2hex($pkey['ec']['x']), 64, '0', STR_PAD_LEFT);
$hexString .= str_pad(bin2hex($pkey['ec']['y']), 64, '0', STR_PAD_LEFT);
$response['vapid'] = Base64UrlSafe::encode(hex2bin($hexString));
$response['vapid-public'] = Base64UrlSafe::encode(hex2bin($hexString));
// @see https://github.com/web-push-libs/web-push-php/blob/256a18b2a2411469c94943725fb6eccb9681bd75/src/VAPID.php
$response['vapid-private'] = Base64UrlSafe::encode(hex2bin(str_pad(bin2hex($pkey['ec']['d']), 64, '0', STR_PAD_LEFT)));
return $response;
}