mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-23 15:00:30 +01:00
Code Issues Projects Releases Packages Wiki Activity

Apply ExtraDataMapValidator for all extraDataMap fields

Browse source
This commit is contained in:
Manfred Karrer 2019-03-31 17:35:14 -05:00
parent dad4b04093
commit 4d56ce9a10
No known key found for this signature in database
GPG key ID: 401250966A6B2C46
9 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/src/main/java/bisq/core/alert/Alert.java
View file

@ -22,6 +22,7 @@ import bisq.network.p2p.storage.payload.ProtectedStoragePayload;
import bisq.common.app.Version; import bisq.common.app.Version;
import bisq.common.crypto.Sig; import bisq.common.crypto.Sig;
import bisq.common.util.ExtraDataMapValidator;
import io.bisq.generated.protobuffer.PB; import io.bisq.generated.protobuffer.PB;
@ -91,7 +92,7 @@ public final class Alert implements ProtectedStoragePayload, ExpirablePayload {
this.version = version; this.version = version;
this.ownerPubKeyBytes = ownerPubKeyBytes; this.ownerPubKeyBytes = ownerPubKeyBytes;
this.signatureAsBase64 = signatureAsBase64; this.signatureAsBase64 = signatureAsBase64;
this.extraDataMap = extraDataMap; this.extraDataMap = ExtraDataMapValidator.getValidatedExtraDataMap(extraDataMap);
ownerPubKey = Sig.getPublicKeyFromBytes(ownerPubKeyBytes); ownerPubKey = Sig.getPublicKeyFromBytes(ownerPubKeyBytes);
} }

3
core/src/main/java/bisq/core/arbitration/Arbitrator.java
View file

@ -23,6 +23,7 @@ import bisq.network.p2p.storage.payload.ProtectedStoragePayload;
import bisq.common.crypto.PubKeyRing; import bisq.common.crypto.PubKeyRing;
import bisq.common.proto.ProtoUtil; import bisq.common.proto.ProtoUtil;
import bisq.common.util.ExtraDataMapValidator;
import bisq.common.util.Utilities; import bisq.common.util.Utilities;
import io.bisq.generated.protobuffer.PB; import io.bisq.generated.protobuffer.PB;
@ -91,7 +92,7 @@ public final class Arbitrator implements ProtectedStoragePayload, ExpirablePaylo
this.registrationSignature = registrationSignature; this.registrationSignature = registrationSignature;
this.emailAddress = emailAddress; this.emailAddress = emailAddress;
this.info = info; this.info = info;
this.extraDataMap = extraDataMap; this.extraDataMap = ExtraDataMapValidator.getValidatedExtraDataMap(extraDataMap);
} }
/////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////

3
core/src/main/java/bisq/core/arbitration/Mediator.java
View file

@ -23,6 +23,7 @@ import bisq.network.p2p.storage.payload.ProtectedStoragePayload;
import bisq.common.crypto.PubKeyRing; import bisq.common.crypto.PubKeyRing;
import bisq.common.proto.ProtoUtil; import bisq.common.proto.ProtoUtil;
import bisq.common.util.ExtraDataMapValidator;
import io.bisq.generated.protobuffer.PB; import io.bisq.generated.protobuffer.PB;
@ -84,7 +85,7 @@ public final class Mediator implements ProtectedStoragePayload, ExpirablePayload
this.registrationSignature = registrationSignature; this.registrationSignature = registrationSignature;
this.emailAddress = emailAddress; this.emailAddress = emailAddress;
this.info = info; this.info = info;
this.extraDataMap = extraDataMap; this.extraDataMap = ExtraDataMapValidator.getValidatedExtraDataMap(extraDataMap);
} }

3
core/src/main/java/bisq/core/dao/governance/blindvote/BlindVote.java
View file

@ -21,6 +21,7 @@ import bisq.core.dao.governance.ConsensusCritical;
import bisq.common.proto.network.NetworkPayload; import bisq.common.proto.network.NetworkPayload;
import bisq.common.proto.persistable.PersistablePayload; import bisq.common.proto.persistable.PersistablePayload;
import bisq.common.util.ExtraDataMapValidator;
import bisq.common.util.Utilities; import bisq.common.util.Utilities;
import io.bisq.generated.protobuffer.PB; import io.bisq.generated.protobuffer.PB;
@ -65,7 +66,7 @@ public final class BlindVote implements PersistablePayload, NetworkPayload, Cons
this.txId = txId; this.txId = txId;
this.stake = stake; this.stake = stake;
this.encryptedMeritList = encryptedMeritList; this.encryptedMeritList = encryptedMeritList;
this.extraDataMap = extraDataMap; this.extraDataMap = ExtraDataMapValidator.getValidatedExtraDataMap(extraDataMap);
} }

3
core/src/main/java/bisq/core/filter/Filter.java
View file

@ -21,6 +21,7 @@ import bisq.network.p2p.storage.payload.ExpirablePayload;
import bisq.network.p2p.storage.payload.ProtectedStoragePayload; import bisq.network.p2p.storage.payload.ProtectedStoragePayload;
import bisq.common.crypto.Sig; import bisq.common.crypto.Sig;
import bisq.common.util.ExtraDataMapValidator;
import io.bisq.generated.protobuffer.PB; import io.bisq.generated.protobuffer.PB;
@ -146,7 +147,7 @@ public final class Filter implements ProtectedStoragePayload, ExpirablePayload {
disableDao); disableDao);
this.signatureAsBase64 = signatureAsBase64; this.signatureAsBase64 = signatureAsBase64;
this.ownerPubKeyBytes = ownerPubKeyBytes; this.ownerPubKeyBytes = ownerPubKeyBytes;
this.extraDataMap = extraDataMap; this.extraDataMap = ExtraDataMapValidator.getValidatedExtraDataMap(extraDataMap);
ownerPubKey = Sig.getPublicKeyFromBytes(ownerPubKeyBytes); ownerPubKey = Sig.getPublicKeyFromBytes(ownerPubKeyBytes);
} }

3
core/src/main/java/bisq/core/offer/OfferPayload.java
View file

@ -24,6 +24,7 @@ import bisq.network.p2p.storage.payload.RequiresOwnerIsOnlinePayload;
import bisq.common.crypto.PubKeyRing; import bisq.common.crypto.PubKeyRing;
import bisq.common.proto.ProtoUtil; import bisq.common.proto.ProtoUtil;
import bisq.common.util.ExtraDataMapValidator;
import bisq.common.util.JsonExclude; import bisq.common.util.JsonExclude;
import io.bisq.generated.protobuffer.PB; import io.bisq.generated.protobuffer.PB;
@ -235,7 +236,7 @@ public final class OfferPayload implements ProtectedStoragePayload, ExpirablePay
this.upperClosePrice = upperClosePrice; this.upperClosePrice = upperClosePrice;
this.isPrivateOffer = isPrivateOffer; this.isPrivateOffer = isPrivateOffer;
this.hashOfChallenge = hashOfChallenge; this.hashOfChallenge = hashOfChallenge;
this.extraDataMap = extraDataMap; this.extraDataMap = ExtraDataMapValidator.getValidatedExtraDataMap(extraDataMap);
this.protocolVersion = protocolVersion; this.protocolVersion = protocolVersion;
} }

3
core/src/main/java/bisq/core/trade/statistics/TradeStatistics.java
View file

@ -29,6 +29,7 @@ import bisq.network.p2p.storage.payload.ProtectedStoragePayload;
import bisq.common.crypto.Sig; import bisq.common.crypto.Sig;
import bisq.common.proto.persistable.PersistablePayload; import bisq.common.proto.persistable.PersistablePayload;
import bisq.common.util.ExtraDataMapValidator;
import bisq.common.util.JsonExclude; import bisq.common.util.JsonExclude;
import io.bisq.generated.protobuffer.PB; import io.bisq.generated.protobuffer.PB;
@ -147,7 +148,7 @@ public final class TradeStatistics implements LazyProcessedPayload, ProtectedSto
this.tradeDate = tradeDate; this.tradeDate = tradeDate;
this.depositTxId = depositTxId; this.depositTxId = depositTxId;
this.signaturePubKeyBytes = signaturePubKeyBytes; this.signaturePubKeyBytes = signaturePubKeyBytes;
this.extraDataMap = extraDataMap; this.extraDataMap = ExtraDataMapValidator.getValidatedExtraDataMap(extraDataMap);
signaturePubKey = Sig.getPublicKeyFromBytes(signaturePubKeyBytes); signaturePubKey = Sig.getPublicKeyFromBytes(signaturePubKeyBytes);
} }

3
core/src/main/java/bisq/core/trade/statistics/TradeStatistics2.java
View file

@ -32,6 +32,7 @@ import bisq.common.app.Capabilities;
import bisq.common.app.Capability; import bisq.common.app.Capability;
import bisq.common.crypto.Hash; import bisq.common.crypto.Hash;
import bisq.common.proto.persistable.PersistableEnvelope; import bisq.common.proto.persistable.PersistableEnvelope;
import bisq.common.util.ExtraDataMapValidator;
import bisq.common.util.JsonExclude; import bisq.common.util.JsonExclude;
import bisq.common.util.Utilities; import bisq.common.util.Utilities;
@ -150,7 +151,7 @@ public final class TradeStatistics2 implements LazyProcessedPayload, Persistable
this.tradeAmount = tradeAmount; this.tradeAmount = tradeAmount;
this.tradeDate = tradeDate; this.tradeDate = tradeDate;
this.depositTxId = depositTxId; this.depositTxId = depositTxId;
this.extraDataMap = extraDataMap; this.extraDataMap = ExtraDataMapValidator.getValidatedExtraDataMap(extraDataMap);
if (hash == null) if (hash == null)
// We create hash from all fields excluding hash itself. We use json as simple data serialisation. // We create hash from all fields excluding hash itself. We use json as simple data serialisation.

3
p2p/src/main/java/bisq/network/p2p/storage/payload/MailboxStoragePayload.java
View file

@ -20,6 +20,7 @@ package bisq.network.p2p.storage.payload;
import bisq.network.p2p.PrefixedSealedAndSignedMessage; import bisq.network.p2p.PrefixedSealedAndSignedMessage;
import bisq.common.crypto.Sig; import bisq.common.crypto.Sig;
import bisq.common.util.ExtraDataMapValidator;
import io.bisq.generated.protobuffer.PB; import io.bisq.generated.protobuffer.PB;
@ -85,7 +86,7 @@ public final class MailboxStoragePayload implements ProtectedStoragePayload, Exp
this.prefixedSealedAndSignedMessage = prefixedSealedAndSignedMessage; this.prefixedSealedAndSignedMessage = prefixedSealedAndSignedMessage;
this.senderPubKeyForAddOperationBytes = senderPubKeyForAddOperationBytes; this.senderPubKeyForAddOperationBytes = senderPubKeyForAddOperationBytes;
this.ownerPubKeyBytes = ownerPubKeyBytes; this.ownerPubKeyBytes = ownerPubKeyBytes;
this.extraDataMap = extraDataMap; this.extraDataMap = ExtraDataMapValidator.getValidatedExtraDataMap(extraDataMap);
senderPubKeyForAddOperation = Sig.getPublicKeyFromBytes(senderPubKeyForAddOperationBytes); senderPubKeyForAddOperation = Sig.getPublicKeyFromBytes(senderPubKeyForAddOperationBytes);
ownerPubKey = Sig.getPublicKeyFromBytes(ownerPubKeyBytes); ownerPubKey = Sig.getPublicKeyFromBytes(ownerPubKeyBytes);