Skip to content
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.

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

Check failed trades for sensitive data purge. #6132

Merged
merged 1 commit into from Apr 5, 2022
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import bisq.core.provider.price.PriceFeedService;
import bisq.core.trade.model.TradableList;
import bisq.core.trade.model.bisq_v1.Trade;
import bisq.core.user.Preferences;

import bisq.common.config.Config;
import bisq.common.crypto.KeyRing;
Expand All @@ -35,10 +36,13 @@

import javafx.collections.ObservableList;

import java.time.Instant;

import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.concurrent.TimeUnit;
import java.util.function.Predicate;
import java.util.stream.Collectors;
import java.util.stream.Stream;
Expand All @@ -56,6 +60,7 @@ public class FailedTradesManager implements PersistedDataHost {
private final KeyRing keyRing;
private final PriceFeedService priceFeedService;
private final BtcWalletService btcWalletService;
private final Preferences preferences;
private final CleanupMailboxMessagesService cleanupMailboxMessagesService;
private final PersistenceManager<TradableList<Trade>> persistenceManager;
private final TradeUtil tradeUtil;
Expand All @@ -69,6 +74,7 @@ public class FailedTradesManager implements PersistedDataHost {
public FailedTradesManager(KeyRing keyRing,
PriceFeedService priceFeedService,
BtcWalletService btcWalletService,
Preferences preferences,
PersistenceManager<TradableList<Trade>> persistenceManager,
TradeUtil tradeUtil,
CleanupMailboxMessagesService cleanupMailboxMessagesService,
Expand All @@ -77,6 +83,7 @@ public FailedTradesManager(KeyRing keyRing,
this.keyRing = keyRing;
this.priceFeedService = priceFeedService;
this.btcWalletService = btcWalletService;
this.preferences = preferences;
this.cleanupMailboxMessagesService = cleanupMailboxMessagesService;
this.dumpDelayedPayoutTx = dumpDelayedPayoutTx;
this.persistenceManager = persistenceManager;
Expand All @@ -101,10 +108,12 @@ public void readPersisted(Runnable completeHandler) {

public void onAllServicesInitialized() {
cleanupMailboxMessagesService.handleTrades(failedTrades.getList());
maybeClearSensitiveData();
}

public void add(Trade trade) {
if (failedTrades.add(trade)) {
maybeClearSensitiveData();
requestPersistence();
}
}
Expand Down Expand Up @@ -211,4 +220,25 @@ public boolean hasDelayedPayoutTxBytes(Trade failedTrade) {
private void requestPersistence() {
persistenceManager.requestPersistence();
}

private void maybeClearSensitiveData() {
log.info("checking failed trades eligibility for having sensitive data cleared");
failedTrades.stream()
.filter(e -> canTradeHaveSensitiveDataCleared(e.getId()))
.forEach(Trade::maybeClearSensitiveData);
requestPersistence();
}

private boolean canTradeHaveSensitiveDataCleared(String tradeId) {
Instant safeDate = getSafeDateForSensitiveDataClearing();
return failedTrades.stream()
.filter(e -> e.getId().equals(tradeId))
.filter(e -> e.getDate().toInstant().isBefore(safeDate))
.count() > 0;
}

private Instant getSafeDateForSensitiveDataClearing() {
return Instant.ofEpochSecond(Instant.now().getEpochSecond()
- TimeUnit.DAYS.toSeconds(preferences.getClearDataAfterDays()));
}
}