Skip to content

[stable19] Ignore old push devices #667

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 6 commits into from
Jun 22, 2020
Merged

[stable19] Ignore old push devices #667

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
96e84b4
Filter the devices out before looping over them
nickvergessen Jun 9, 2020
ad4c685
Unify token validation
nickvergessen Jun 9, 2020
df5b512
Don't push to devices older than 60 days
nickvergessen Jun 9, 2020
35fde92
Cache the last token activity for 10 minutes
nickvergessen Jun 9, 2020
e284f43
Also cache when a token is invalid
nickvergessen Jun 9, 2020
a0d0654
Adjust the unit tests too
nickvergessen Jun 22, 2020
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
Prev Previous commit
Next Next commit
Cache the last token activity for 10 minutes 
Signed-off-by: Joas Schilling <[email protected]>
  • Loading branch information
@nickvergessen @backportbot
nickvergessen authored and backportbot[bot] committed Jun 22, 2020
commit 35fde92ac0d3505244d8d5c0f7bae98e4d31eb12
21 changes: 20 additions & 1 deletion lib/Push.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
use OCP\AppFramework\Http;
use OCP\DB\QueryBuilder\IQueryBuilder;
use OCP\Http\Client\IClientService;
use OCP\ICache;
use OCP\ICacheFactory;
use OCP\IConfig;
use OCP\IDBConnection;
use OCP\ILogger;
Expand All @@ -53,19 +55,30 @@ class Push {
private $userManager;
/** @var IClientService */
protected $clientService;
/** @var ICache */
protected $cache;
/** @var ILogger */
protected $log;
/** @var OutputInterface */
protected $output;

public function __construct(IDBConnection $connection, INotificationManager $notificationManager, IConfig $config, IProvider $tokenProvider, Manager $keyManager, IUserManager $userManager, IClientService $clientService, ILogger $log) {
public function __construct(IDBConnection $connection,
INotificationManager $notificationManager,
IConfig $config,
IProvider $tokenProvider,
Manager $keyManager,
IUserManager $userManager,
IClientService $clientService,
ICacheFactory $cacheFactory,
ILogger $log) {
$this->db = $connection;
$this->notificationManager = $notificationManager;
$this->config = $config;
$this->tokenProvider = $tokenProvider;
$this->keyManager = $keyManager;
$this->userManager = $userManager;
$this->clientService = $clientService;
$this->cache = $cacheFactory->createDistributed('pushtokens');
$this->log = $log;
}

Expand Down Expand Up @@ -266,9 +279,15 @@ protected function sendNotificationsToProxies(array $pushNotifications): void {
}

protected function validateToken(int $tokenId, int $maxAge): bool {
$age = $this->cache->get('t' . $tokenId);
if ($age !== null) {
return $age > $maxAge;
}

try {
// Check if the token is still valid...
$token = $this->tokenProvider->getTokenById($tokenId);
$this->cache->set('t' . $tokenId, $token->getLastCheck(), 600);
return $token->getLastCheck() > $maxAge;
} catch (InvalidTokenException $e) {
// Token does not exist anymore, should drop the push device entry
Expand Down