Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-20 00:30:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reenable account cleaner

Browse Source
This commit is contained in:
Moxie Marlinspike
2019-05-07 18:14:32 -07:00
parent e0b85131bd
commit a029768d24
2 changed files with 110 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountCleaner.java
View File

@@ -22,6 +22,7 @@ import com.codahale.metrics.SharedMetricRegistries;
import com.google.common.annotations.VisibleForTesting;
import org.whispersystems.textsecuregcm.sqs.DirectoryQueue;
import org.whispersystems.textsecuregcm.util.Constants;
import org.whispersystems.textsecuregcm.util.Util;
import java.util.List;
import java.util.Optional;
@@ -30,6 +31,7 @@ import java.util.concurrent.TimeUnit;
import static com.codahale.metrics.MetricRegistry.name;
public class AccountCleaner implements AccountDatabaseCrawlerListener {
private static final MetricRegistry metricRegistry = SharedMetricRegistries.getOrCreate(Constants.METRICS_NAME);
private static final Meter expiredAccountsMeter = metricRegistry.meter(name(AccountCleaner.class, "expiredAccounts"));
@@ -50,25 +52,23 @@ public class AccountCleaner implements AccountDatabaseCrawlerListener {
@Override
public void onCrawlChunk(Optional<String> fromNumber, List<Account> chunkAccounts) {
long nowMs = System.currentTimeMillis();
int accountUpdateCount = 0;
for (Account account : chunkAccounts) {
if (account.getMasterDevice().isPresent() &&
account.getMasterDevice().get().isEnabled() &&
isAccountExpired(account, nowMs))
{
if (needsExplicitRemoval(account)) {
expiredAccountsMeter.mark();
// Device masterDevice = account.getMasterDevice().get();
// masterDevice.setFetchesMessages(false);
// masterDevice.setApnId(null);
// masterDevice.setGcmId(null);
//
// if (accountUpdateCount < MAX_ACCOUNT_UPDATES_PER_CHUNK) {
// accountUpdateCount++;
// accountsManager.update(account);
// }
// directoryQueue.deleteRegisteredUser(account.getNumber());
if (accountUpdateCount < MAX_ACCOUNT_UPDATES_PER_CHUNK) {
Device masterDevice = account.getMasterDevice().get();
masterDevice.setFetchesMessages(false);
masterDevice.setApnId(null);
masterDevice.setVoipApnId(null);
masterDevice.setGcmId(null);
accountUpdateCount++;
accountsManager.update(account);
directoryQueue.deleteRegisteredUser(account.getNumber());
}
}
}
}
@@ -77,9 +77,18 @@ public class AccountCleaner implements AccountDatabaseCrawlerListener {
public void onCrawlEnd(Optional<String> fromNumber) {
}
@VisibleForTesting
public static boolean isAccountExpired(Account account, long nowMs) {
return account.getLastSeen() < (nowMs - TimeUnit.DAYS.toMillis(365));
private boolean needsExplicitRemoval(Account account) {
return account.getMasterDevice().isPresent() &&
hasPushToken(account.getMasterDevice().get()) &&
isExpired(account);
}
private boolean hasPushToken(Device device) {
return !Util.isEmpty(device.getGcmId()) || !Util.isEmpty(device.getApnId()) || !Util.isEmpty(device.getVoipApnId()) || device.getFetchesMessages();
}
private boolean isExpired(Account account) {
return account.getLastSeen() + TimeUnit.DAYS.toMillis(365) < System.currentTimeMillis();
}
}