Skip to content

[stable34] fix(webpush): Fix "Undefined array key -… at lib/Push.php#297" #3347

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickvergessen merged 2 commits into from
Sep 3, 2026
+128 −2
Merged

[stable34] fix(webpush): Fix "Undefined array key -… at lib/Push.php#297" #3347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
78736d8
fix(webpush): Fix "Undefined array key -… at lib/Push.php#297"
nickvergessen Aug 28, 2026
c2d706a
test(webpush): Add unit test for undefined index issue
nickvergessen Aug 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions lib/Push.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,10 +291,11 @@ protected function filterByTokenAge(array $devices): array {
}

arsort($tokenAgeList);
$tokenAgeList = array_slice($tokenAgeList, 0, self::DEVICE_LIMIT);
$newestTokens = array_slice($tokenAgeList, 0, self::DEVICE_LIMIT, true);
$devices = [];
foreach ($deviceList as $device) {
if (!isset($tokenAgeList[$device['token']]) || $tokenAgeList[$device['token']] !== 0) {
// Web session tokens have an age of 0 and are otherwise never sorted into the newest tokens
if (!isset($newestTokens[$device['token']]) && $tokenAgeList[$device['token']] !== 0) {
$this->printInfo('<comment>Device token ' . $device['token'] . ' is not in the most recent 20 devices: ' . $tokenAgeList[$device['token']] . '</comment>');
continue;
}
Expand Down
125 changes: 125 additions & 0 deletions tests/Unit/PushTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1473,6 +1473,131 @@ public function testValidateTokenAndGetAgeSessionToken(): void {
$this->assertSame(0, self::invokePrivate($push, 'validateTokenAndGetAge', [-1]));
}

/**
* @return array{id: int, uid: string, token: int}
*/
protected static function getProxyDevice(int $token): array {
return [
'id' => 1000 + $token,
'uid' => 'valid',
'token' => $token,
];
}

/**
* @return array{id: int, uid: string, token: int, endpoint: string}
*/
protected static function getWebPushDevice(int $token): array {
return self::getProxyDevice($token) + [
'endpoint' => 'https://push.example.com/' . $token,
];
}

public function testFilterByTokenAgeBelowLimit(): void {
$now = 1234567890;
$this->timeFactory->method('getTime')
->willReturn($now);

$devices = [
self::getProxyDevice(23),
self::getProxyDevice(42),
];

$push = $this->getPush(['validateTokenAndGetAge']);
$push->method('validateTokenAndGetAge')
->willReturnMap([
[23, $now - 100],
[42, $now - 200],
]);

$this->assertSame($devices, self::invokePrivate($push, 'filterByTokenAge', [$devices]));
}

public function testFilterByTokenAgeRemovesOutdatedTokens(): void {
$now = 1234567890;
$this->timeFactory->method('getTime')
->willReturn($now);

$recent = self::getProxyDevice(23);
$outdated = self::getProxyDevice(42);

$push = $this->getPush(['validateTokenAndGetAge']);
$push->method('validateTokenAndGetAge')
->willReturnMap([
[23, $now - 100],
[42, $now - Push::MAX_PUSH_AGE - 1],
]);

$this->assertSame([$recent], self::invokePrivate($push, 'filterByTokenAge', [[$recent, $outdated]]));
}

public function testFilterByTokenAgeDeletesInvalidTokens(): void {
$this->timeFactory->method('getTime')
->willReturn(1234567890);

$proxyDevice = self::getProxyDevice(23);
$webPushDevice = self::getWebPushDevice(42);

$push = $this->getPush(['validateTokenAndGetAge', 'deleteProxyPushToken', 'deleteWebPushToken']);
$push->method('validateTokenAndGetAge')
->willThrowException(new InvalidDeviceTokenException());

$push->expects($this->once())
->method('deleteProxyPushToken')
->with(23);
$push->expects($this->once())
->method('deleteWebPushToken')
->with(42);

$this->assertSame([], self::invokePrivate($push, 'filterByTokenAge', [[$proxyDevice, $webPushDevice]]));
}

public function testFilterByTokenAgeKeepsTheNewestDevices(): void {
$now = 1234567890;
$this->timeFactory->method('getTime')
->willReturn($now);

// Oldest token first, so the device limit has to cut off the head of the list
$devices = $ages = [];
for ($i = 0; $i < Push::DEVICE_LIMIT + 5; $i++) {
$devices[] = self::getProxyDevice($i + 1);
$ages[] = [$i + 1, $now - 10000 + $i];
}

$push = $this->getPush(['validateTokenAndGetAge']);
$push->method('validateTokenAndGetAge')
->willReturnMap($ages);

$this->assertSame(
array_slice($devices, 5),
self::invokePrivate($push, 'filterByTokenAge', [$devices]),
);
}

public function testFilterByTokenAgeKeepsWebSessionTokensAboveTheLimit(): void {
$now = 1234567890;
$this->timeFactory->method('getTime')
->willReturn($now);

// Web session tokens have a negative id and an age of 0, so they always
// sort last and would be cut off by the device limit
$devices = $ages = [];
for ($i = 0; $i < Push::DEVICE_LIMIT; $i++) {
$devices[] = self::getProxyDevice($i + 1);
$ages[] = [$i + 1, $now - 10000 + $i];
}
for ($i = 1; $i <= 3; $i++) {
$devices[] = self::getProxyDevice(-$i);
$ages[] = [-$i, 0];
}

$push = $this->getPush(['validateTokenAndGetAge']);
$push->method('validateTokenAndGetAge')
->willReturnMap($ages);

$this->assertSame($devices, self::invokePrivate($push, 'filterByTokenAge', [$devices]));
}

public function testValidateTokenAndGetAgeCached(): void {
$this->cache->expects($this->once())
->method('get')
Expand Down
Loading