add preference to clear sensitive data after days (#1859)

Author: woodser

core/src/main/java/haveno/core/api/CoreTradesService.java

@@ -189,7 +189,6 @@ void closeTrade(String tradeId) {
         verifyTradeIsNotClosed(tradeId);
         var trade = getOpenTrade(tradeId).orElseThrow(() ->
                 new IllegalArgumentException(format("trade with id '%s' not found", tradeId)));
-        log.info("Keeping funds received from trade {}", tradeId);
         tradeManager.onTradeCompleted(trade);
     }
 

core/src/main/java/haveno/core/support/dispute/Dispute.java

@@ -392,7 +392,7 @@ public void maybeClearSensitiveData() {
             change += "chat messages;";
         }
         if (change.length() > 0) {
-            log.info("cleared sensitive data from {} of dispute for trade {}", change, Utilities.getShortId(getTradeId()));
+            log.info("Cleared sensitive data from {} of dispute for trade {}", change, Utilities.getShortId(getTradeId()));
         }
     }
 

core/src/main/java/haveno/core/trade/Contract.java

@@ -261,18 +261,12 @@ public boolean isMyRoleMaker(PubKeyRing myPubKeyRing) {
     }
 
     public boolean maybeClearSensitiveData() {
-        return false; // TODO: anything to clear?
+        return false; // nothing to clear
     }
 
     // edits a contract json string
     public static String sanitizeContractAsJson(String contractAsJson) {
-        return contractAsJson
-                .replaceAll(
-                        "\"takerPaymentAccountPayload\": \\{[^}]*}",
-                        "\"takerPaymentAccountPayload\": null")
-                .replaceAll(
-                        "\"makerPaymentAccountPayload\": \\{[^}]*}",
-                        "\"makerPaymentAccountPayload\": null");
+        return contractAsJson; // nothing to sanitize because the contract does not contain the payment account payloads
     }
 
     public void printDiff(@Nullable String peersContractAsJson) {

core/src/main/java/haveno/core/trade/Trade.java

@@ -1586,11 +1586,24 @@ private void clearProcessData() {
 
     public void maybeClearSensitiveData() {
         String change = "";
+        if (contract != null && contract.maybeClearSensitiveData()) {
+            change += "contract;";
+        }
+        if (processModel != null && processModel.maybeClearSensitiveData()) {
+            change += "processModel;";
+        }
+        if (contractAsJson != null) {
+            String edited = Contract.sanitizeContractAsJson(contractAsJson);
+            if (!edited.equals(contractAsJson)) {
+                contractAsJson = edited;
+                change += "contractAsJson;";
+            }
+        }
         if (removeAllChatMessages()) {
             change += "chat messages;";
         }
         if (change.length() > 0) {
-            log.info("cleared sensitive data from {} of trade {}", change, getShortId());
+            log.info("Cleared sensitive data from {} of {} {}", change, getClass().getSimpleName(), getShortId());
         }
     }
 

core/src/main/java/haveno/core/trade/protocol/ProcessModel.java

@@ -326,6 +326,17 @@ void witnessDebugLog(Trade trade) {
         getAccountAgeWitnessService().getAccountAgeWitnessUtils().witnessDebugLog(trade, null);
     }
 
+    public boolean maybeClearSensitiveData() {
+        boolean changed = false;
+        for (TradePeer tradingPeer : getTradePeers()) {
+            if (tradingPeer.getPaymentAccountPayload() != null || tradingPeer.getContractAsJson() != null) {
+                tradingPeer.setPaymentAccountPayload(null);
+                tradingPeer.setContractAsJson(null);
+                changed = true;
+            }
+        }
+        return changed;
+    }
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Delegates

core/src/main/java/haveno/core/user/Preferences.java

@@ -109,8 +109,8 @@ public boolean isUseTorForXmr() {
     ));
 
     public static final boolean USE_SYMMETRIC_SECURITY_DEPOSIT = true;
-    public static final int CLEAR_DATA_AFTER_DAYS_INITIAL = 99999; // feature effectively disabled until user agrees to settings notification
-    public static final int CLEAR_DATA_AFTER_DAYS_DEFAULT = 60; // used when user has agreed to settings notification
+    public static final int CLEAR_DATA_AFTER_DAYS_DEFAULT = 60; // used with new instance or when existing user has agreed to settings notification
+    public static final int CLEAR_DATA_AFTER_DAYS_DISABLED = 99999; // feature effectively disabled until existing user agrees to settings notification
 
 
     // payload is initialized so the default values are available for Property initialization.
@@ -309,6 +309,10 @@ private void setupPreferences() {
             setIgnoreDustThreshold(600);
         }
 
+        if (prefPayload.getClearDataAfterDays() < 1) {
+            setClearDataAfterDays(Preferences.CLEAR_DATA_AFTER_DAYS_DISABLED);
+        }
+
         // For users from old versions the 4 flags a false but we want to have it true by default
         // PhoneKeyAndToken is also null so we can use that to enable the flags
         if (prefPayload.getPhoneKeyAndToken() == null) {

core/src/main/java/haveno/core/user/PreferencesPayload.java

@@ -122,7 +122,7 @@ public final class PreferencesPayload implements PersistableEnvelope {
     private String takeOfferSelectedPaymentAccountId;
     private double securityDepositAsPercent = getDefaultSecurityDepositAsPercent();
     private int ignoreDustThreshold = 600;
-    private int clearDataAfterDays = Preferences.CLEAR_DATA_AFTER_DAYS_INITIAL;
+    private int clearDataAfterDays = Preferences.CLEAR_DATA_AFTER_DAYS_DEFAULT;
     private double securityDepositAsPercentForCrypto = getDefaultSecurityDepositAsPercent();
     private int blockNotifyPort;
     private boolean tacAcceptedV120;

core/src/main/resources/i18n/displayStrings.properties

@@ -1337,6 +1337,7 @@ setting.preferences.notifyOnPreRelease=Receive pre-release notifications
 setting.preferences.resetAllFlags=Reset all \"Don't show again\" flags
 settings.preferences.languageChange=To apply the language change to all screens requires a restart.
 settings.preferences.supportLanguageWarning=In case of a dispute, please note that arbitration is handled in {0}.
+setting.preferences.clearDataAfterDays=Clear sensitive data after (days)
 settings.preferences.editCustomExplorer.headline=Explorer Settings
 settings.preferences.editCustomExplorer.description=Choose a system defined explorer from the list on the left, and/or \
   customize to suit your own preferences.
@@ -1346,6 +1347,15 @@ settings.preferences.editCustomExplorer.name=Name
 settings.preferences.editCustomExplorer.txUrl=Transaction URL
 settings.preferences.editCustomExplorer.addressUrl=Address URL
 
+setting.info.headline=New data-privacy feature
+settings.preferences.sensitiveDataRemoval.msg=To protect the privacy of yourself and other traders, Haveno intends to \
+  remove sensitive data from old trades. This is particularly important for fiat trades which may include bank \
+  account details.\n\n\
+  The threshold for data removal can be configured on this screen via the field "Clear sensitive data after (days)".  \
+  It is recommended to set it as low as possible, for example 60 days.  That means trades from more than 60 \
+  days ago will have sensitive data cleared, as long as they are completed.  Completed trades are found in the \
+  Portfolio / History tab.
+
 settings.net.xmrHeader=Monero network
 settings.net.p2pHeader=Haveno network
 settings.net.onionAddressLabel=My onion address

core/src/main/resources/i18n/displayStrings_cs.properties

@@ -1309,6 +1309,9 @@ settings.preferences.editCustomExplorer.name=Jméno
 settings.preferences.editCustomExplorer.txUrl=Transakční URL
 settings.preferences.editCustomExplorer.addressUrl=Adresa URL
 
+setting.info.headline=Nová funkce ochrany osobních údajů
+settings.preferences.sensitiveDataRemoval.msg=Aby byla chráněna vaše soukromí i soukromí ostatních obchodníků, Haveno zamýšlí odstranit citlivá data ze starých obchodů.\n\nDoporučuje se nastavit tento limit co nejníže, například na 60 dní. To znamená, že obchody starší než 60 dní budou mít citlivá data odstraněna, pokud jsou dokončené. Dokončené obchody najdete na záložce Portfolio / Historie.
+
 settings.net.xmrHeader=Síť Monero
 settings.net.p2pHeader=Síť Haveno
 settings.net.onionAddressLabel=Moje onion adresa

core/src/main/resources/i18n/displayStrings_de.properties

@@ -1044,6 +1044,9 @@ settings.preferences.editCustomExplorer.name=Name
 settings.preferences.editCustomExplorer.txUrl=Transaktions-URL
 settings.preferences.editCustomExplorer.addressUrl=Adress-URL
 
+setting.info.headline=Neue Datenschutzfunktion
+settings.preferences.sensitiveDataRemoval.msg=Zum Schutz der Privatsphäre von Ihnen und anderen Händlern beabsichtigt Haveno, sensible Daten aus alten Trades zu entfernen. Dies ist besonders wichtig bei Fiat-Trades, die Bankkontodaten enthalten können.\n\nEs wird empfohlen, den Wert so niedrig wie möglich zu setzen, zum Beispiel 60 Tage. Das bedeutet, dass Trades, die älter als 60 Tage sind, sensible Daten gelöscht bekommen, sofern sie abgeschlossen sind. Abgeschlossene Trades finden Sie im Portfolio- / Verlauf-Reiter.
+
 settings.net.xmrHeader=Monero-Netzwerk
 settings.net.p2pHeader=Haveno-Netzwerk
 settings.net.onionAddressLabel=Meine Onion-Adresse