Make config_api more robust (#4980)
* Make config_api more robust * Add test and update store instruction
This commit is contained in:
parent
fc58b3e8c3
commit
5e221bf219
|
@ -226,6 +226,7 @@ fn store_update_manifest(
|
||||||
let signers = [from_keypair, update_manifest_keypair];
|
let signers = [from_keypair, update_manifest_keypair];
|
||||||
let instruction = config_instruction::store::<SignedUpdateManifest>(
|
let instruction = config_instruction::store::<SignedUpdateManifest>(
|
||||||
&update_manifest_keypair.pubkey(),
|
&update_manifest_keypair.pubkey(),
|
||||||
|
true, // update_manifest_keypair is signer
|
||||||
vec![], // additional keys
|
vec![], // additional keys
|
||||||
update_manifest,
|
update_manifest,
|
||||||
);
|
);
|
||||||
|
|
|
@ -44,10 +44,11 @@ pub fn create_account<T: ConfigState>(
|
||||||
/// Store new data in a configuration account
|
/// Store new data in a configuration account
|
||||||
pub fn store<T: ConfigState>(
|
pub fn store<T: ConfigState>(
|
||||||
config_account_pubkey: &Pubkey,
|
config_account_pubkey: &Pubkey,
|
||||||
|
is_config_signer: bool,
|
||||||
keys: Vec<(Pubkey, bool)>,
|
keys: Vec<(Pubkey, bool)>,
|
||||||
data: &T,
|
data: &T,
|
||||||
) -> Instruction {
|
) -> Instruction {
|
||||||
let mut account_metas = vec![AccountMeta::new(*config_account_pubkey, true)];
|
let mut account_metas = vec![AccountMeta::new(*config_account_pubkey, is_config_signer)];
|
||||||
for (signer_pubkey, _) in keys.iter().filter(|(_, is_signer)| *is_signer) {
|
for (signer_pubkey, _) in keys.iter().filter(|(_, is_signer)| *is_signer) {
|
||||||
account_metas.push(AccountMeta::new(*signer_pubkey, true));
|
account_metas.push(AccountMeta::new(*signer_pubkey, true));
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,25 +12,30 @@ pub fn process_instruction(
|
||||||
keyed_accounts: &mut [KeyedAccount],
|
keyed_accounts: &mut [KeyedAccount],
|
||||||
data: &[u8],
|
data: &[u8],
|
||||||
) -> Result<(), InstructionError> {
|
) -> Result<(), InstructionError> {
|
||||||
if keyed_accounts[0].signer_key().is_none() {
|
let key_list: ConfigKeys = deserialize(data).map_err(|err| {
|
||||||
error!("account[0].signer_key().is_none()");
|
error!("Invalid ConfigKeys data: {:?} {:?}", data, err);
|
||||||
Err(InstructionError::MissingRequiredSignature)?;
|
InstructionError::InvalidInstructionData
|
||||||
}
|
})?;
|
||||||
|
let mut counter = 0;
|
||||||
let key_list: ConfigKeys = deserialize(data).unwrap();
|
|
||||||
for (i, (signer, _)) in key_list
|
for (i, (signer, _)) in key_list
|
||||||
.keys
|
.keys
|
||||||
.iter()
|
.iter()
|
||||||
.filter(|(_, is_signer)| *is_signer)
|
.filter(|(_, is_signer)| *is_signer)
|
||||||
.enumerate()
|
.enumerate()
|
||||||
{
|
{
|
||||||
|
counter += 1;
|
||||||
let account_index = i + 1;
|
let account_index = i + 1;
|
||||||
let signer_account = keyed_accounts[account_index].signer_key();
|
let signer_account = keyed_accounts.get(account_index);
|
||||||
if signer_account.is_none() {
|
if signer_account.is_none() {
|
||||||
error!("account[{:?}].signer_key().is_none()", account_index);
|
error!("account {:?} is not in account list", signer);
|
||||||
Err(InstructionError::MissingRequiredSignature)?;
|
Err(InstructionError::MissingRequiredSignature)?;
|
||||||
}
|
}
|
||||||
if signer_account.unwrap() != signer {
|
let signer_key = signer_account.unwrap().signer_key();
|
||||||
|
if signer_key.is_none() {
|
||||||
|
error!("account {:?} signer_key().is_none()", signer);
|
||||||
|
Err(InstructionError::MissingRequiredSignature)?;
|
||||||
|
}
|
||||||
|
if signer_key.unwrap() != signer {
|
||||||
error!(
|
error!(
|
||||||
"account[{:?}].signer_key() does not match Config data)",
|
"account[{:?}].signer_key() does not match Config data)",
|
||||||
account_index
|
account_index
|
||||||
|
@ -38,6 +43,13 @@ pub fn process_instruction(
|
||||||
Err(InstructionError::MissingRequiredSignature)?;
|
Err(InstructionError::MissingRequiredSignature)?;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if counter == 0 {
|
||||||
|
// If Config data does not specify any signers, Config account keypair must be a signer
|
||||||
|
if keyed_accounts[0].signer_key().is_none() {
|
||||||
|
error!("account[0].signer_key().is_none()");
|
||||||
|
Err(InstructionError::MissingRequiredSignature)?;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if keyed_accounts[0].account.data.len() < data.len() {
|
if keyed_accounts[0].account.data.len() < data.len() {
|
||||||
error!("instruction data too large");
|
error!("instruction data too large");
|
||||||
|
@ -138,7 +150,7 @@ mod tests {
|
||||||
|
|
||||||
let my_config = MyConfig::new(42);
|
let my_config = MyConfig::new(42);
|
||||||
|
|
||||||
let instruction = config_instruction::store(&config_pubkey, keys.clone(), &my_config);
|
let instruction = config_instruction::store(&config_pubkey, true, keys.clone(), &my_config);
|
||||||
let message = Message::new_with_payer(vec![instruction], Some(&mint_keypair.pubkey()));
|
let message = Message::new_with_payer(vec![instruction], Some(&mint_keypair.pubkey()));
|
||||||
|
|
||||||
bank_client
|
bank_client
|
||||||
|
@ -166,7 +178,7 @@ mod tests {
|
||||||
|
|
||||||
let my_config = MyConfig::new(42);
|
let my_config = MyConfig::new(42);
|
||||||
|
|
||||||
let mut instruction = config_instruction::store(&config_pubkey, vec![], &my_config);
|
let mut instruction = config_instruction::store(&config_pubkey, true, vec![], &my_config);
|
||||||
instruction.data = vec![0; 123]; // <-- Replace data with a vector that's too large
|
instruction.data = vec![0; 123]; // <-- Replace data with a vector that's too large
|
||||||
let message = Message::new(vec![instruction]);
|
let message = Message::new(vec![instruction]);
|
||||||
bank_client
|
bank_client
|
||||||
|
@ -188,7 +200,8 @@ mod tests {
|
||||||
let transfer_instruction =
|
let transfer_instruction =
|
||||||
system_instruction::transfer(&system_pubkey, &Pubkey::new_rand(), 42);
|
system_instruction::transfer(&system_pubkey, &Pubkey::new_rand(), 42);
|
||||||
let my_config = MyConfig::new(42);
|
let my_config = MyConfig::new(42);
|
||||||
let mut store_instruction = config_instruction::store(&config_pubkey, vec![], &my_config);
|
let mut store_instruction =
|
||||||
|
config_instruction::store(&config_pubkey, true, vec![], &my_config);
|
||||||
store_instruction.accounts[0].is_signer = false; // <----- not a signer
|
store_instruction.accounts[0].is_signer = false; // <----- not a signer
|
||||||
|
|
||||||
let message = Message::new(vec![transfer_instruction, store_instruction]);
|
let message = Message::new(vec![transfer_instruction, store_instruction]);
|
||||||
|
@ -215,7 +228,7 @@ mod tests {
|
||||||
|
|
||||||
let my_config = MyConfig::new(42);
|
let my_config = MyConfig::new(42);
|
||||||
|
|
||||||
let instruction = config_instruction::store(&config_pubkey, keys.clone(), &my_config);
|
let instruction = config_instruction::store(&config_pubkey, true, keys.clone(), &my_config);
|
||||||
let message = Message::new_with_payer(vec![instruction], Some(&mint_keypair.pubkey()));
|
let message = Message::new_with_payer(vec![instruction], Some(&mint_keypair.pubkey()));
|
||||||
|
|
||||||
bank_client
|
bank_client
|
||||||
|
@ -239,6 +252,41 @@ mod tests {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_process_store_without_config_signer() {
|
||||||
|
solana_logger::setup();
|
||||||
|
let (bank, mint_keypair) = create_bank(10_000);
|
||||||
|
let pubkey = Pubkey::new_rand();
|
||||||
|
let signer0 = Keypair::new();
|
||||||
|
let keys = vec![(pubkey, false), (signer0.pubkey(), true)];
|
||||||
|
let (bank_client, config_keypair) =
|
||||||
|
create_config_account(bank, &mint_keypair, keys.clone());
|
||||||
|
let config_pubkey = config_keypair.pubkey();
|
||||||
|
|
||||||
|
let my_config = MyConfig::new(42);
|
||||||
|
|
||||||
|
let instruction =
|
||||||
|
config_instruction::store(&config_pubkey, false, keys.clone(), &my_config);
|
||||||
|
let message = Message::new_with_payer(vec![instruction], Some(&mint_keypair.pubkey()));
|
||||||
|
|
||||||
|
bank_client
|
||||||
|
.send_message(&[&mint_keypair, &signer0], message)
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
let config_account_data = bank_client
|
||||||
|
.get_account_data(&config_pubkey)
|
||||||
|
.unwrap()
|
||||||
|
.unwrap();
|
||||||
|
let meta_length = ConfigKeys::serialized_size(keys.clone());
|
||||||
|
let meta_data: ConfigKeys = deserialize(&config_account_data[0..meta_length]).unwrap();
|
||||||
|
assert_eq!(meta_data.keys, keys);
|
||||||
|
let config_account_data = &config_account_data[meta_length..config_account_data.len()];
|
||||||
|
assert_eq!(
|
||||||
|
my_config,
|
||||||
|
MyConfig::deserialize(&config_account_data).unwrap()
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn test_process_store_with_bad_additional_signer() {
|
fn test_process_store_with_bad_additional_signer() {
|
||||||
solana_logger::setup();
|
solana_logger::setup();
|
||||||
|
@ -253,7 +301,7 @@ mod tests {
|
||||||
let my_config = MyConfig::new(42);
|
let my_config = MyConfig::new(42);
|
||||||
|
|
||||||
// Config-data pubkey doesn't match signer
|
// Config-data pubkey doesn't match signer
|
||||||
let instruction = config_instruction::store(&config_pubkey, keys.clone(), &my_config);
|
let instruction = config_instruction::store(&config_pubkey, true, keys.clone(), &my_config);
|
||||||
let mut message =
|
let mut message =
|
||||||
Message::new_with_payer(vec![instruction.clone()], Some(&mint_keypair.pubkey()));
|
Message::new_with_payer(vec![instruction.clone()], Some(&mint_keypair.pubkey()));
|
||||||
message.account_keys[2] = signer1.pubkey();
|
message.account_keys[2] = signer1.pubkey();
|
||||||
|
|
Loading…
Reference in New Issue