Core/grin
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin.git synced 2025-01-21 03:21:08 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

(1)add verify_slate_messages for wallet receive (2)log the message content

Browse source
This commit is contained in:
Gary Yu 2018-12-22 11:05:24 +08:00
parent aa8d0cfb7c
commit 9584ca7a89
3 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/src/libtx/slate.rs
View file

@ -351,8 +351,8 @@ impl Slate {
/// Verifies any messages in the slate's participant data match their signatures /// Verifies any messages in the slate's participant data match their signatures
pub fn verify_messages(&self, secp: &secp::Secp256k1) -> Result<(), Error> { pub fn verify_messages(&self, secp: &secp::Secp256k1) -> Result<(), Error> {
for p in self.participant_data.iter() { for p in self.participant_data.iter() {
if let Some(m) = p.message.clone() { if let Some(msg) = p.message.clone() {
let hashed = blake2b(secp::constants::MESSAGE_SIZE, &[], &m.as_bytes()[..]); let hashed = blake2b(secp::constants::MESSAGE_SIZE, &[], &msg.as_bytes()[..]);
let m = secp::Message::from_slice(&hashed.as_bytes())?; let m = secp::Message::from_slice(&hashed.as_bytes())?;
if !aggsig::verify_single( if !aggsig::verify_single(
secp, secp,
@ -363,9 +363,14 @@ impl Slate {
Some(&p.public_blind_excess), Some(&p.public_blind_excess),
false, false,
) { ) {
error!("verify_messages - participant message doesn't match signature. Message: \"{}\"",
String::from_utf8_lossy(&msg.as_bytes()[..]));
return Err(ErrorKind::Signature( return Err(ErrorKind::Signature(
"Optional participant messages do not match signatures".to_owned(), "Optional participant messages do not match signatures".to_owned(),
))?; ))?;
} else {
info!("verify_messages - signature verified ok. Participant message: \"{}\"",
String::from_utf8_lossy(&msg.as_bytes()[..]));
} }
} }
} }

4
wallet/src/command.rs
View file

@ -282,6 +282,10 @@ pub fn receive(
let adapter = FileWalletCommAdapter::new(); let adapter = FileWalletCommAdapter::new();
let mut slate = adapter.receive_tx_async(&args.input)?; let mut slate = adapter.receive_tx_async(&args.input)?;
controller::foreign_single_use(wallet, |api| { controller::foreign_single_use(wallet, |api| {
if let Err(e) = api.verify_slate_messages(&slate) {
error!("Error validating participant messages: {}", e);
return Err(e);
}
api.receive_tx(&mut slate, Some(&g_args.account), args.message.clone())?; api.receive_tx(&mut slate, Some(&g_args.account), args.message.clone())?;
Ok(()) Ok(())
})?; })?;

8
wallet/src/libwallet/api.rs
View file

@ -830,6 +830,14 @@ where
res res
} }
/// Verifies all messages in the slate match their public keys
pub fn verify_slate_messages(&mut self, slate: &Slate) -> Result<(), Error> {
error!("verify_slate_messages - enter");
let secp = Secp256k1::with_caps(ContextFlag::VerifyOnly);
slate.verify_messages(&secp)?;
Ok(())
}
/// Receive a transaction from a sender /// Receive a transaction from a sender
pub fn receive_tx( pub fn receive_tx(
&mut self, &mut self,