Skip to content

Group delete pushes with a delete-multiple for the talk clients as th… #939

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

Closed
nickvergessen wants to merge 1 commit into from
Closed

Group delete pushes with a delete-multiple for the talk clients as th… #939

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
128 changes: 100 additions & 28 deletions lib/Push.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ class Push {
protected $output;
/** @var array */
protected $payloadsToSend = [];
/** @var array */
protected $deferredDeletes = [];
/** @var bool */
protected $deferPayloads = false;

Expand Down Expand Up @@ -121,6 +123,11 @@ public function deferPayloads(): void {

public function flushPayloads(): void {
$this->deferPayloads = false;

foreach ($this->deferredDeletes as $userId => $deletes) {
$this->createDeletePayloads($userId, $deletes);
}

$this->sendNotificationsToProxies();
}

Expand Down Expand Up @@ -234,7 +241,7 @@ public function pushToDevice(int $id, INotification $notification, ?OutputInterf
}

if (!$this->deferPayloads) {
$this->sendNotificationsToProxies();
$this->flushPayloads();
}
}

Expand All @@ -243,20 +250,59 @@ public function pushDeleteToDevice(string $userId, int $notificationId, string $
return;
}

if (!isset($this->deferredDeletes[$userId])) {
$this->deferredDeletes[$userId] = [];
}

$this->deferredDeletes[$userId] = [
'notificationId' => $notificationId,
'app' => $app,
];

if (!$this->deferPayloads) {
$this->flushPayloads();
}
}

public function createDeletePayloads(string $userId, array $deferredDeletes): void {
if (!$this->config->getSystemValueBool('has_internet_connection', true)) {
return;
}

if (empty($deferredDeletes)) {
return;
}

$user = $this->userManager->get($userId);
if (!($user instanceof IUser)) {
return;
}

$devices = $this->getDevicesForUser($userId);
if ($notificationId !== 0 && $app !== '') {
// Only filter when it's not a single delete
$devices = $this->filterDeviceList($devices, $app);
}

if (empty($devices)) {
return;
}

$deleteAll = !empty(array_filter($deferredDeletes, static function($deferredDelete) {
return $deferredDelete['notificationId'] === 0;
}));

$talkIds = $otherIds = [];
if (!$deleteAll) {
$talkIds = array_map(static function ($deferredDelete) {
return $deferredDelete['notificationId'];
}, array_filter($deferredDeletes, static function($deferredDelete) {
return \in_array($deferredDelete['app'], ['spreed', 'talk', 'admin_notification_talk'], true);
}));

$otherIds = array_map(static function ($deferredDelete) {
return $deferredDelete['notificationId'];
}, array_filter($deferredDeletes, static function($deferredDelete) {
return !\in_array($deferredDelete['app'], ['spreed', 'talk', 'admin_notification_talk'], true);
}));
}

// We don't push to devices that are older than 60 days
$maxAge = time() - 60 * 24 * 60 * 60;

Expand All @@ -267,22 +313,38 @@ public function pushDeleteToDevice(string $userId, int $notificationId, string $
continue;
}

try {
$payload = json_encode($this->encryptAndSignDelete($userKey, $device, $notificationId));

$proxyServer = rtrim($device['proxyserver'], '/');
if (!isset($this->payloadsToSend[$proxyServer])) {
$this->payloadsToSend[$proxyServer] = [];
if ($deleteAll) {
$this->createPayloadsInChunks($userKey, $device, []);
} else if ($device['apptype'] !== 'talk') {
foreach ($otherIds as $id) {
// Only talk clients handle delete-multiple
$this->createPayloadsInChunks($userKey, $device, [$id]);
}
} else {
$ids = $talkIds;
while (!empty($ids)) {
$ids = $this->createPayloadsInChunks($userKey, $device, $ids);
}
$this->payloadsToSend[$proxyServer][] = $payload;
} catch (\InvalidArgumentException $e) {
// Failed to encrypt message for device: public key is invalid
$this->deletePushToken($device['token']);
}
}
}

if (!$this->deferPayloads) {
$this->sendNotificationsToProxies();
protected function createPayloadsInChunks(Key $userKey, array $device, array $ids): array {
try {
$data = $this->encryptAndSignDelete($userKey, $device, $ids);
$payload = json_encode($data['payload']);

$proxyServer = rtrim($device['proxyserver'], '/');
if (!isset($this->payloadsToSend[$proxyServer])) {
$this->payloadsToSend[$proxyServer] = [];
}
$this->payloadsToSend[$proxyServer][] = $payload;

return $data['remaining'];
} catch (\InvalidArgumentException $e) {
// Failed to encrypt message for device: public key is invalid
$this->deletePushToken($device['token']);
return [];
}
}

Expand Down Expand Up @@ -472,21 +534,28 @@ protected function shortenJsonEncodedMultibyte(string $subject, int $dataLength)
/**
* @param Key $userKey
* @param array $device
* @param int $id
* @param int[] $ids
* @return array
* @throws InvalidTokenException
* @throws \InvalidArgumentException
*/
protected function encryptAndSignDelete(Key $userKey, array $device, int $id): array {
if ($id === 0) {
protected function encryptAndSignDelete(Key $userKey, array $device, array $ids): array {
$remainingIds = [];
if (empty($ids)) {
$data = [
'delete-all' => true,
];
} else {
} else if (count($ids) === 1) {
$data = [
'nid' => $id,
'nid' => array_pop($ids),
'delete' => true,
];
} else {
$remainingIds = array_splice($ids, 10);
$data = [
'nids' => $ids,
'delete-multiple' => true,
];
}

if (!openssl_public_encrypt(json_encode($data), $encryptedSubject, $device['devicepublickey'], OPENSSL_PKCS1_PADDING)) {
Expand All @@ -499,12 +568,15 @@ protected function encryptAndSignDelete(Key $userKey, array $device, int $id): a
$base64Signature = base64_encode($signature);

return [
'deviceIdentifier' => $device['deviceidentifier'],
'pushTokenHash' => $device['pushtokenhash'],
'subject' => $base64EncryptedSubject,
'signature' => $base64Signature,
'priority' => 'normal',
'type' => 'background',
'remaining' => $remainingIds,
'payload' => [
'deviceIdentifier' => $device['deviceidentifier'],
'pushTokenHash' => $device['pushtokenhash'],
'subject' => $base64EncryptedSubject,
'signature' => $base64Signature,
'priority' => 'normal',
'type' => 'background',
],
];
}

Expand Down