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

verify message signature on wallet (#2203)

Browse source 
* add verify_slate_messages for wallet receive

* log the message content

* rustfmt

* verify the sender's message signature when receive_tx in wallet listen

* verify the sender's message signature when send by keybase
This commit is contained in:
Gary Yu 2018-12-23 07:25:02 +08:00 committed by GitHub
parent 7a52c0ecd5
commit 45ca7cff79
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 35 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
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
pub fn verify_messages(&self, secp: &secp::Secp256k1) -> Result<(), Error> {
for p in self.participant_data.iter() {
if let Some(m) = p.message.clone() {
let hashed = blake2b(secp::constants::MESSAGE_SIZE, &[], &m.as_bytes()[..]);
if let Some(msg) = p.message.clone() {
let hashed = blake2b(secp::constants::MESSAGE_SIZE, &[], &msg.as_bytes()[..]);
let m = secp::Message::from_slice(&hashed.as_bytes())?;
if !aggsig::verify_single(
secp,
@ -363,9 +363,16 @@ impl Slate {
None,
false,
) {
error!("verify_messages - participant message doesn't match signature. Message: \"{}\"",
String::from_utf8_lossy(&msg.as_bytes()[..]));
return Err(ErrorKind::Signature(
"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/adapters/keybase.rs
View file

@ -236,6 +236,10 @@ impl WalletCommAdapter for KeybaseWalletCommAdapter {
Ok(mut slate) => {
println!("Received message from channel {}", channel);
match controller::foreign_single_use(wallet.clone(), |api| {
if let Err(e) = api.verify_slate_messages(&slate) {
error!("Error validating participant messages: {}", e);
return Err(e);
}
api.receive_tx(&mut slate, None, None)?;
Ok(())
}) {

4
wallet/src/command.rs
View file

@ -282,6 +282,10 @@ pub fn receive(
let adapter = FileWalletCommAdapter::new();
let mut slate = adapter.receive_tx_async(&args.input)?;
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())?;
Ok(())
})?;

15
wallet/src/controller.rs
View file

@ -563,11 +563,18 @@ where
) -> Box<dyn Future<Item = Slate, Error = Error> + Send> {
Box::new(parse_body(req).and_then(
//TODO: No way to insert a message from the params
move |mut slate| match api.receive_tx(&mut slate, None, None) {
Ok(_) => ok(slate.clone()),
Err(e) => {
error!("receive_tx: failed with error: {}", e);
move |mut slate| {
if let Err(e) = api.verify_slate_messages(&slate) {
error!("Error validating participant messages: {}", e);
err(e)
} else {
match api.receive_tx(&mut slate, None, None) {
Ok(_) => ok(slate.clone()),
Err(e) => {
error!("receive_tx: failed with error: {}", e);
err(e)
}
}
}
},
))

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

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