makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/17330] Handle mozilla not properly handling webpush padding

Browse source 
PHPBB-17330
This commit is contained in:
Marc Alexander 2024-06-05 22:27:06 +02:00
parent 272daae337
commit a90c59a8a1
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
phpBB/phpbb/notification/method/webpush.php
View file

@ -48,6 +48,9 @@ class webpush extends messenger_base implements extended_method_interface
/** @var string Notification push subscriptions table */ /** @var string Notification push subscriptions table */
protected $push_subscriptions_table; protected $push_subscriptions_table;
/** @var int Fallback size for padding if endpoint is mozilla, see https://github.com/web-push-libs/web-push-php/issues/108#issuecomment-2133477054 */
const MOZILLA_FALLBACK_PADDING = 2820;
/** /**
* Notification Method Web Push constructor * Notification Method Web Push constructor
* *
@ -218,6 +221,7 @@ class webpush extends messenger_base implements extended_method_interface
{ {
try try
{ {
$this->set_endpoint_padding($web_push, $subscription['endpoint']);
$push_subscription = Subscription::create([ $push_subscription = Subscription::create([
'endpoint' => $subscription['endpoint'], 'endpoint' => $subscription['endpoint'],
'keys' => [ 'keys' => [
@ -430,4 +434,21 @@ class webpush extends messenger_base implements extended_method_interface
$this->remove_subscriptions($remove_subscriptions); $this->remove_subscriptions($remove_subscriptions);
} }
/**
* Set web push padding for endpoint
*
* @param \Minishlink\WebPush\WebPush $web_push
* @param string $endpoint
*
* @return void
* @throws \Exception
*/
protected function set_endpoint_padding(\Minishlink\WebPush\WebPush $web_push, string $endpoint): void
{
if (str_contains($endpoint, 'mozilla.com') || str_contains($endpoint, 'mozaws.net'))
{
$web_push->setAutomaticPadding(self::MOZILLA_FALLBACK_PADDING);
}
}
} }