Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion programs/8-pda-sharing/insecure/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ pub mod pda_sharing_insecure {

pub fn withdraw_tokens(ctx: Context<WithdrawTokens>) -> ProgramResult {
let amount = ctx.accounts.vault.amount;
// Using the mint field as part of the seeds for the PDA, which allows
// an attacker to manipulate the mint value and withdraw funds.
let seeds = &[ctx.accounts.pool.mint.as_ref(), &[ctx.accounts.pool.bump]];
token::transfer(ctx.accounts.transfer_ctx().with_signer(&[seeds]), amount)
}
Expand Down Expand Up @@ -39,7 +41,7 @@ impl<'info> WithdrawTokens<'info> {
#[account]
pub struct TokenPool {
vault: Pubkey,
mint: Pubkey,
mint: Pubkey, // Vulnerable because it allows manipulation of the mint field.
withdraw_destination: Pubkey,
bump: u8,
}
18 changes: 8 additions & 10 deletions programs/8-pda-sharing/recommended/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,20 @@ pub mod pda_sharing_recommended {

pub fn withdraw_tokens(ctx: Context<WithdrawTokens>) -> ProgramResult {
let amount = ctx.accounts.vault.amount;
let seeds = &[
ctx.accounts.pool.withdraw_destination.as_ref(),
&[ctx.accounts.pool.bump],
];
// Using the withdraw_destination instead of mint to create the seeds, which is more secure.
let seeds = &[ctx.accounts.pool.withdraw_destination.as_ref(), &[ctx.accounts.pool.bump]];
token::transfer(ctx.accounts.transfer_ctx().with_signer(&[seeds]), amount)
}
}

#[derive(Accounts)]
pub struct WithdrawTokens<'info> {
#[account(
has_one = vault,
has_one = withdraw_destination,
seeds = [withdraw_destination.key().as_ref()],
bump = pool.bump,
)]
has_one = vault,
has_one = withdraw_destination,
seeds = [withdraw_destination.key().as_ref()], // Adds PDA security by making sure the seed is deterministic.
bump = pool.bump,
)]
pool: Account<'info, TokenPool>,
vault: Account<'info, TokenAccount>,
withdraw_destination: Account<'info, TokenAccount>,
Expand All @@ -48,6 +46,6 @@ impl<'info> WithdrawTokens<'info> {
pub struct TokenPool {
vault: Pubkey,
mint: Pubkey,
withdraw_destination: Pubkey,
withdraw_destination: Pubkey, // The key used to derive the PDA is now secure.
bump: u8,
}
6 changes: 2 additions & 4 deletions programs/8-pda-sharing/secure/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,8 @@ pub mod pda_sharing_secure {

pub fn withdraw_tokens(ctx: Context<WithdrawTokens>) -> ProgramResult {
let amount = ctx.accounts.vault.amount;
let seeds = &[
ctx.accounts.pool.withdraw_destination.as_ref(),
&[ctx.accounts.pool.bump],
];
// Withdraw using PDA derived from withdraw_destination for secure withdrawal.
let seeds = &[ctx.accounts.pool.withdraw_destination.as_ref(), &[ctx.accounts.pool.bump]];
token::transfer(ctx.accounts.transfer_ctx().with_signer(&[seeds]), amount)
}
}
Expand Down