From 4d56ce9a1071e4c235bf970f730144304d92a805 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Sun, 31 Mar 2019 17:35:14 -0500 Subject: [PATCH] Apply ExtraDataMapValidator for all extraDataMap fields --- core/src/main/java/bisq/core/alert/Alert.java | 3 ++- core/src/main/java/bisq/core/arbitration/Arbitrator.java | 3 ++- core/src/main/java/bisq/core/arbitration/Mediator.java | 3 ++- .../java/bisq/core/dao/governance/blindvote/BlindVote.java | 3 ++- core/src/main/java/bisq/core/filter/Filter.java | 3 ++- core/src/main/java/bisq/core/offer/OfferPayload.java | 3 ++- .../main/java/bisq/core/trade/statistics/TradeStatistics.java | 3 ++- .../main/java/bisq/core/trade/statistics/TradeStatistics2.java | 3 ++- .../network/p2p/storage/payload/MailboxStoragePayload.java | 3 ++- 9 files changed, 18 insertions(+), 9 deletions(-) diff --git a/core/src/main/java/bisq/core/alert/Alert.java b/core/src/main/java/bisq/core/alert/Alert.java index cb2569f390..4081b231f2 100644 --- a/core/src/main/java/bisq/core/alert/Alert.java +++ b/core/src/main/java/bisq/core/alert/Alert.java @@ -22,6 +22,7 @@ import bisq.network.p2p.storage.payload.ProtectedStoragePayload; import bisq.common.app.Version; import bisq.common.crypto.Sig; +import bisq.common.util.ExtraDataMapValidator; import io.bisq.generated.protobuffer.PB; @@ -91,7 +92,7 @@ public final class Alert implements ProtectedStoragePayload, ExpirablePayload { this.version = version; this.ownerPubKeyBytes = ownerPubKeyBytes; this.signatureAsBase64 = signatureAsBase64; - this.extraDataMap = extraDataMap; + this.extraDataMap = ExtraDataMapValidator.getValidatedExtraDataMap(extraDataMap); ownerPubKey = Sig.getPublicKeyFromBytes(ownerPubKeyBytes); } diff --git a/core/src/main/java/bisq/core/arbitration/Arbitrator.java b/core/src/main/java/bisq/core/arbitration/Arbitrator.java index a9b6d738c4..ffc6a8f467 100644 --- a/core/src/main/java/bisq/core/arbitration/Arbitrator.java +++ b/core/src/main/java/bisq/core/arbitration/Arbitrator.java @@ -23,6 +23,7 @@ import bisq.network.p2p.storage.payload.ProtectedStoragePayload; import bisq.common.crypto.PubKeyRing; import bisq.common.proto.ProtoUtil; +import bisq.common.util.ExtraDataMapValidator; import bisq.common.util.Utilities; import io.bisq.generated.protobuffer.PB; @@ -91,7 +92,7 @@ public final class Arbitrator implements ProtectedStoragePayload, ExpirablePaylo this.registrationSignature = registrationSignature; this.emailAddress = emailAddress; this.info = info; - this.extraDataMap = extraDataMap; + this.extraDataMap = ExtraDataMapValidator.getValidatedExtraDataMap(extraDataMap); } /////////////////////////////////////////////////////////////////////////////////////////// diff --git a/core/src/main/java/bisq/core/arbitration/Mediator.java b/core/src/main/java/bisq/core/arbitration/Mediator.java index b5d4e3ca64..0673b5465c 100644 --- a/core/src/main/java/bisq/core/arbitration/Mediator.java +++ b/core/src/main/java/bisq/core/arbitration/Mediator.java @@ -23,6 +23,7 @@ import bisq.network.p2p.storage.payload.ProtectedStoragePayload; import bisq.common.crypto.PubKeyRing; import bisq.common.proto.ProtoUtil; +import bisq.common.util.ExtraDataMapValidator; import io.bisq.generated.protobuffer.PB; @@ -84,7 +85,7 @@ public final class Mediator implements ProtectedStoragePayload, ExpirablePayload this.registrationSignature = registrationSignature; this.emailAddress = emailAddress; this.info = info; - this.extraDataMap = extraDataMap; + this.extraDataMap = ExtraDataMapValidator.getValidatedExtraDataMap(extraDataMap); } diff --git a/core/src/main/java/bisq/core/dao/governance/blindvote/BlindVote.java b/core/src/main/java/bisq/core/dao/governance/blindvote/BlindVote.java index c5fa1c92cf..09e961bcf1 100644 --- a/core/src/main/java/bisq/core/dao/governance/blindvote/BlindVote.java +++ b/core/src/main/java/bisq/core/dao/governance/blindvote/BlindVote.java @@ -21,6 +21,7 @@ import bisq.core.dao.governance.ConsensusCritical; import bisq.common.proto.network.NetworkPayload; import bisq.common.proto.persistable.PersistablePayload; +import bisq.common.util.ExtraDataMapValidator; import bisq.common.util.Utilities; import io.bisq.generated.protobuffer.PB; @@ -65,7 +66,7 @@ public final class BlindVote implements PersistablePayload, NetworkPayload, Cons this.txId = txId; this.stake = stake; this.encryptedMeritList = encryptedMeritList; - this.extraDataMap = extraDataMap; + this.extraDataMap = ExtraDataMapValidator.getValidatedExtraDataMap(extraDataMap); } diff --git a/core/src/main/java/bisq/core/filter/Filter.java b/core/src/main/java/bisq/core/filter/Filter.java index c7b3db9a89..b2fc9f9202 100644 --- a/core/src/main/java/bisq/core/filter/Filter.java +++ b/core/src/main/java/bisq/core/filter/Filter.java @@ -21,6 +21,7 @@ import bisq.network.p2p.storage.payload.ExpirablePayload; import bisq.network.p2p.storage.payload.ProtectedStoragePayload; import bisq.common.crypto.Sig; +import bisq.common.util.ExtraDataMapValidator; import io.bisq.generated.protobuffer.PB; @@ -146,7 +147,7 @@ public final class Filter implements ProtectedStoragePayload, ExpirablePayload { disableDao); this.signatureAsBase64 = signatureAsBase64; this.ownerPubKeyBytes = ownerPubKeyBytes; - this.extraDataMap = extraDataMap; + this.extraDataMap = ExtraDataMapValidator.getValidatedExtraDataMap(extraDataMap); ownerPubKey = Sig.getPublicKeyFromBytes(ownerPubKeyBytes); } diff --git a/core/src/main/java/bisq/core/offer/OfferPayload.java b/core/src/main/java/bisq/core/offer/OfferPayload.java index eb7e37cb03..822f62ce22 100644 --- a/core/src/main/java/bisq/core/offer/OfferPayload.java +++ b/core/src/main/java/bisq/core/offer/OfferPayload.java @@ -24,6 +24,7 @@ import bisq.network.p2p.storage.payload.RequiresOwnerIsOnlinePayload; import bisq.common.crypto.PubKeyRing; import bisq.common.proto.ProtoUtil; +import bisq.common.util.ExtraDataMapValidator; import bisq.common.util.JsonExclude; import io.bisq.generated.protobuffer.PB; @@ -235,7 +236,7 @@ public final class OfferPayload implements ProtectedStoragePayload, ExpirablePay this.upperClosePrice = upperClosePrice; this.isPrivateOffer = isPrivateOffer; this.hashOfChallenge = hashOfChallenge; - this.extraDataMap = extraDataMap; + this.extraDataMap = ExtraDataMapValidator.getValidatedExtraDataMap(extraDataMap); this.protocolVersion = protocolVersion; } diff --git a/core/src/main/java/bisq/core/trade/statistics/TradeStatistics.java b/core/src/main/java/bisq/core/trade/statistics/TradeStatistics.java index f68b99838a..47608fed71 100644 --- a/core/src/main/java/bisq/core/trade/statistics/TradeStatistics.java +++ b/core/src/main/java/bisq/core/trade/statistics/TradeStatistics.java @@ -29,6 +29,7 @@ import bisq.network.p2p.storage.payload.ProtectedStoragePayload; import bisq.common.crypto.Sig; import bisq.common.proto.persistable.PersistablePayload; +import bisq.common.util.ExtraDataMapValidator; import bisq.common.util.JsonExclude; import io.bisq.generated.protobuffer.PB; @@ -147,7 +148,7 @@ public final class TradeStatistics implements LazyProcessedPayload, ProtectedSto this.tradeDate = tradeDate; this.depositTxId = depositTxId; this.signaturePubKeyBytes = signaturePubKeyBytes; - this.extraDataMap = extraDataMap; + this.extraDataMap = ExtraDataMapValidator.getValidatedExtraDataMap(extraDataMap); signaturePubKey = Sig.getPublicKeyFromBytes(signaturePubKeyBytes); } diff --git a/core/src/main/java/bisq/core/trade/statistics/TradeStatistics2.java b/core/src/main/java/bisq/core/trade/statistics/TradeStatistics2.java index 443b489fe6..ecd3b52937 100644 --- a/core/src/main/java/bisq/core/trade/statistics/TradeStatistics2.java +++ b/core/src/main/java/bisq/core/trade/statistics/TradeStatistics2.java @@ -32,6 +32,7 @@ import bisq.common.app.Capabilities; import bisq.common.app.Capability; import bisq.common.crypto.Hash; import bisq.common.proto.persistable.PersistableEnvelope; +import bisq.common.util.ExtraDataMapValidator; import bisq.common.util.JsonExclude; import bisq.common.util.Utilities; @@ -150,7 +151,7 @@ public final class TradeStatistics2 implements LazyProcessedPayload, Persistable this.tradeAmount = tradeAmount; this.tradeDate = tradeDate; this.depositTxId = depositTxId; - this.extraDataMap = extraDataMap; + this.extraDataMap = ExtraDataMapValidator.getValidatedExtraDataMap(extraDataMap); if (hash == null) // We create hash from all fields excluding hash itself. We use json as simple data serialisation. diff --git a/p2p/src/main/java/bisq/network/p2p/storage/payload/MailboxStoragePayload.java b/p2p/src/main/java/bisq/network/p2p/storage/payload/MailboxStoragePayload.java index 88dd96cc94..80ce47f563 100644 --- a/p2p/src/main/java/bisq/network/p2p/storage/payload/MailboxStoragePayload.java +++ b/p2p/src/main/java/bisq/network/p2p/storage/payload/MailboxStoragePayload.java @@ -20,6 +20,7 @@ package bisq.network.p2p.storage.payload; import bisq.network.p2p.PrefixedSealedAndSignedMessage; import bisq.common.crypto.Sig; +import bisq.common.util.ExtraDataMapValidator; import io.bisq.generated.protobuffer.PB; @@ -85,7 +86,7 @@ public final class MailboxStoragePayload implements ProtectedStoragePayload, Exp this.prefixedSealedAndSignedMessage = prefixedSealedAndSignedMessage; this.senderPubKeyForAddOperationBytes = senderPubKeyForAddOperationBytes; this.ownerPubKeyBytes = ownerPubKeyBytes; - this.extraDataMap = extraDataMap; + this.extraDataMap = ExtraDataMapValidator.getValidatedExtraDataMap(extraDataMap); senderPubKeyForAddOperation = Sig.getPublicKeyFromBytes(senderPubKeyForAddOperationBytes); ownerPubKey = Sig.getPublicKeyFromBytes(ownerPubKeyBytes);