(13/13) [BUGFIX] Validate Entry.receiversPubKey when adding a MailboxPayload

common/src/main/java/bisq/common/proto/network/NetworkProtoResolver.java

@@ -20,11 +20,15 @@
 import bisq.common.proto.ProtoResolver;
 import bisq.common.proto.ProtobufferException;
 
+import java.time.Clock;
+
 
 public interface NetworkProtoResolver extends ProtoResolver {
     NetworkEnvelope fromProto(protobuf.NetworkEnvelope proto) throws ProtobufferException;
 
     NetworkPayload fromProto(protobuf.StoragePayload proto);
 
     NetworkPayload fromProto(protobuf.StorageEntryWrapper proto);
+
+    Clock getClock();
 }

core/src/main/java/bisq/core/proto/CoreProtoResolver.java

@@ -59,10 +59,16 @@
 import bisq.common.proto.ProtobufferRuntimeException;
 import bisq.common.proto.persistable.PersistableEnvelope;
 
+import java.time.Clock;
+
+import lombok.Getter;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
 public class CoreProtoResolver implements ProtoResolver {
+    @Getter
+    protected Clock clock;
+
     @Override
     public PaymentAccountPayload fromProto(protobuf.PaymentAccountPayload proto) {
         if (proto != null) {

core/src/main/java/bisq/core/proto/network/CoreNetworkProtoResolver.java

@@ -88,14 +88,17 @@
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
+import java.time.Clock;
+
 import lombok.extern.slf4j.Slf4j;
 
 // TODO Use ProtobufferException instead of ProtobufferRuntimeException
 @Slf4j
 @Singleton
 public class CoreNetworkProtoResolver extends CoreProtoResolver implements NetworkProtoResolver {
     @Inject
-    public CoreNetworkProtoResolver() {
+    public CoreNetworkProtoResolver(Clock clock) {
+        this.clock = clock;
     }
 
     @Override

monitor/src/main/java/bisq/monitor/metric/P2PNetworkLoad.java

@@ -49,6 +49,8 @@
 
 import org.springframework.core.env.PropertySource;
 
+import java.time.Clock;
+
 import java.io.File;
 
 import java.util.Collections;
@@ -118,7 +120,7 @@ protected void execute() {
 
             // start the network node
             networkNode = new TorNetworkNode(Integer.parseInt(configuration.getProperty(TOR_PROXY_PORT, "9053")),
-                    new CoreNetworkProtoResolver(), false,
+                    new CoreNetworkProtoResolver(Clock.systemDefaultZone()), false,
                     new AvailableTor(Monitor.TOR_WORKING_DIR, torHiddenServiceDir.getName()));
             networkNode.start(this);
 
@@ -139,7 +141,7 @@ public String getProperty(String name) {
                 });
                 CorruptedDatabaseFilesHandler corruptedDatabaseFilesHandler = new CorruptedDatabaseFilesHandler();
                 int maxConnections = Integer.parseInt(configuration.getProperty(MAX_CONNECTIONS, "12"));
-                NetworkProtoResolver networkProtoResolver = new CoreNetworkProtoResolver();
+                NetworkProtoResolver networkProtoResolver = new CoreNetworkProtoResolver(Clock.systemDefaultZone());
                 CorePersistenceProtoResolver persistenceProtoResolver = new CorePersistenceProtoResolver(null,
                         networkProtoResolver, storageDir, corruptedDatabaseFilesHandler);
                 DefaultSeedNodeRepository seedNodeRepository = new DefaultSeedNodeRepository(environment, null);

monitor/src/main/java/bisq/monitor/metric/P2PSeedNodeSnapshotBase.java

@@ -39,6 +39,8 @@
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.SettableFuture;
 
+import java.time.Clock;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -90,7 +92,7 @@ public P2PSeedNodeSnapshotBase(Reporter reporter) {
     protected void execute() {
         // start the network node
         final NetworkNode networkNode = new TorNetworkNode(Integer.parseInt(configuration.getProperty(TOR_PROXY_PORT, "9054")),
-                new CoreNetworkProtoResolver(), false,
+                new CoreNetworkProtoResolver(Clock.systemDefaultZone()), false,
                 new AvailableTor(Monitor.TOR_WORKING_DIR, "unused"));
         // we do not need to start the networkNode, as we do not need the HS
         //networkNode.start(this);

p2p/src/main/java/bisq/network/p2p/P2PService.java

@@ -700,12 +700,12 @@ public void onBroadcastFailed(String errorMessage) {
                     };
                     boolean result = p2PDataStorage.addProtectedStorageEntry(protectedMailboxStorageEntry, networkNode.getNodeAddress(), listener, true);
                     if (!result) {
-                        //TODO remove and add again with a delay to ensure the data will be broadcasted
-                        // The p2PDataStorage.remove makes probably sense but need to be analysed more.
-                        // Don't change that if it is not 100% clear.
                         sendMailboxMessageListener.onFault("Data already exists in our local database");
-                        boolean removeResult = p2PDataStorage.remove(protectedMailboxStorageEntry, networkNode.getNodeAddress(), true);
-                        log.debug("remove result=" + removeResult);
+
+                        // This should only fail if there are concurrent calls to addProtectedStorageEntry with the
+                        // same ProtectedMailboxStorageEntry. This is an unexpected use case so if it happens we
+                        // want to see it, but it is not worth throwing an exception.
+                        log.error("Unexpected state: adding mailbox message that already exists.");
                     }
                 } catch (CryptoException e) {
                     log.error("Signing at getDataWithSignedSeqNr failed. That should never happen.");
@@ -759,7 +759,7 @@ private void delayedRemoveEntryFromMailbox(DecryptedMessageWithPubKey decryptedM
                             expirableMailboxStoragePayload,
                             keyRing.getSignatureKeyPair(),
                             receiversPubKey);
-                    p2PDataStorage.removeMailboxData(protectedMailboxStorageEntry, networkNode.getNodeAddress(), true);
+                    p2PDataStorage.remove(protectedMailboxStorageEntry, networkNode.getNodeAddress(), true);
                 } catch (CryptoException e) {
                     log.error("Signing at getDataWithSignedSeqNr failed. That should never happen.");
                 }