blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Report error when an invalid confirmation signature or public key is provided

This commit is contained in:
Michael Vines 2018-07-02 14:54:35 -07:00
parent 6feed5fd56
commit c72dced8fa
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/bin/wallet.rs
View File

@ -35,6 +35,7 @@ enum WalletCommand {
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
enum WalletError { enum WalletError {
CommandNotRecognized(String), CommandNotRecognized(String),
BadParameter(String),
} }
impl fmt::Display for WalletError { impl fmt::Display for WalletError {
@ -173,6 +174,11 @@ fn parse_args() -> Result<WalletConfig, Box<error::Error>> {
let pubkey_vec = bs58::decode(pay_matches.value_of("to").unwrap()) let pubkey_vec = bs58::decode(pay_matches.value_of("to").unwrap())
.into_vec() .into_vec()
.expect("base58-encoded public key"); .expect("base58-encoded public key");
if pubkey_vec.len() != std::mem::size_of::<PublicKey>() {
display_actions();
Err(WalletError::BadParameter("Invalid public key".to_string()))?;
}
to = PublicKey::clone_from_slice(&pubkey_vec); to = PublicKey::clone_from_slice(&pubkey_vec);
} else { } else {
to = id.pubkey(); to = id.pubkey();
@ -187,8 +193,14 @@ fn parse_args() -> Result<WalletConfig, Box<error::Error>> {
let sig_vec = bs58::decode(confirm_matches.value_of("signature").unwrap()) let sig_vec = bs58::decode(confirm_matches.value_of("signature").unwrap())
.into_vec() .into_vec()
.expect("base58-encoded signature"); .expect("base58-encoded signature");
if sig_vec.len() == std::mem::size_of::<Signature>() {
let sig = Signature::clone_from_slice(&sig_vec); let sig = Signature::clone_from_slice(&sig_vec);
Ok(WalletCommand::Confirm(sig)) Ok(WalletCommand::Confirm(sig))
} else {
display_actions();
Err(WalletError::BadParameter("Invalid signature".to_string()))
}
} }
("balance", Some(_balance_matches)) => Ok(WalletCommand::Balance), ("balance", Some(_balance_matches)) => Ok(WalletCommand::Balance),
("address", Some(_address_matches)) => Ok(WalletCommand::Address), ("address", Some(_address_matches)) => Ok(WalletCommand::Address),