policy hash + patches (#38)

* generic security fixes

* use hash to identify policies (#39)

* use hash to identify policies

* use policy account in hash

programs/asset_controller/src/instructions/execute.rs

@@ -11,9 +11,9 @@ use crate::state::*;
 #[instruction(amount: u64)]
 pub struct ExecuteTransferHook<'info> {
     #[account(
-        token::mint = asset_mint,
-        token::authority = owner_delegate,
-        token::token_program = anchor_spl::token_interface::spl_token_2022::id(),
+        associated_token::token_program = anchor_spl::token_interface::spl_token_2022::id(),
+        associated_token::authority = owner_delegate,
+        associated_token::mint = asset_mint,
     )]
     pub source_account: Box<InterfaceAccount<'info, TokenAccount>>,
     #[account(
@@ -24,8 +24,10 @@ pub struct ExecuteTransferHook<'info> {
         token::mint = asset_mint,
         token::token_program = anchor_spl::token_interface::spl_token_2022::id(),
     )]
+    // can be any token account, user must make sure it is an associated token account with relevant identity permissions
     pub destination_account: Box<InterfaceAccount<'info, TokenAccount>>,
-    pub owner_delegate: SystemAccount<'info>,
+    /// CHECK: can be any account
+    pub owner_delegate: UncheckedAccount<'info>,
     /// CHECK: meta list account
     #[account(
         seeds = [META_LIST_ACCOUNT_SEED, asset_mint.key().as_ref()],

programs/data_registry/src/instructions/account/create.rs

@@ -24,6 +24,8 @@ pub struct CreateDataAccount<'info> {
         signer,
         space = 8 + DataAccount::INIT_SPACE,
         payer = payer,
+        constraint = args.name.len() <= MAX_NAME_LEN,
+        constraint = args.uri.len() <= MAX_URI_LEN,
     )]
     pub data_account: Box<Account<'info, DataAccount>>,
     pub system_program: Program<'info, System>,

programs/data_registry/src/instructions/registry/delegate.rs

@@ -1,14 +1,13 @@
 use crate::state::*;
 use anchor_lang::prelude::*;
-use anchor_spl::token_interface::Mint;
 
 #[derive(Accounts)]
 #[instruction()]
 pub struct DelegateDataRegistry<'info> {
     #[account(
         constraint = authority.key() == data_registry.authority,
     )]
-    pub authority: Box<InterfaceAccount<'info, Mint>>,
+    pub authority: Signer<'info>,
     #[account(mut)]
     pub data_registry: Box<Account<'info, DataRegistryAccount>>,
 }

programs/data_registry/src/state.rs

@@ -1,7 +1,5 @@
 use anchor_lang::prelude::*;
 
-use crate::DataRegistryErrors;
-
 #[account()]
 #[derive(InitSpace)]
 pub struct DataRegistryAccount {
@@ -42,6 +40,9 @@ pub enum DataAccountType {
     Miscellaneous,
 }
 
+pub const MAX_NAME_LEN: usize = 32;
+pub const MAX_URI_LEN: usize = 255;
+
 #[account()]
 #[derive(InitSpace)]
 pub struct DataAccount {
@@ -51,10 +52,10 @@ pub struct DataAccount {
     /// type of the data account
     pub _type: DataAccountType,
     /// used by creator to store name of the document
-    #[max_len(32)]
+    #[max_len(MAX_NAME_LEN)]
     pub name: String,
     /// uri pointing to the data stored in the document
-    #[max_len(255)]
+    #[max_len(MAX_URI_LEN)]
     pub uri: String,
 }
 

programs/policy_engine/Cargo.toml

@@ -19,3 +19,4 @@ default = []
 anchor-lang = { git = "https://[email protected]/bridgesplit/anchor" }
 anchor-spl = { git = "https://[email protected]/bridgesplit/anchor" }
 num_enum = "0.7.2"
+sha256 = "1.5.0"

programs/policy_engine/src/error.rs

@@ -18,4 +18,6 @@ pub enum PolicyEngineErrors {
     IdentityFilterFailed,
     #[msg("Unauthorized signer")]
     UnauthorizedSigner,
+    #[msg("Policy already exists")]
+    PolicyAlreadyExists,
 }

programs/policy_engine/src/instructions/attach.rs

@@ -30,9 +30,10 @@ pub fn handler(
     identity_filter: IdentityFilter,
     policy_type: PolicyType,
 ) -> Result<()> {
+    let policy_account_address = ctx.accounts.policy_account.key();
     ctx.accounts
         .policy_account
-        .attach(policy_type, identity_filter);
+        .attach(policy_account_address, policy_type, identity_filter)?;
     ctx.accounts.policy_engine.update_max_timeframe(policy_type);
     Ok(())
 }

programs/policy_engine/src/instructions/create.rs

@@ -29,7 +29,9 @@ pub fn handler(
     identity_filter: IdentityFilter,
     policy_type: PolicyType,
 ) -> Result<()> {
+    let policy_account_address = ctx.accounts.policy_account.key();
     ctx.accounts.policy_account.new(
+        policy_account_address,
         ctx.accounts.policy_engine.key(),
         identity_filter,
         policy_type,

programs/policy_engine/src/instructions/detach.rs

@@ -25,8 +25,8 @@ pub struct DetachFromPolicyAccount<'info> {
     pub system_program: Program<'info, System>,
 }
 
-pub fn handler(ctx: Context<DetachFromPolicyAccount>, policy_type: PolicyType) -> Result<()> {
-    ctx.accounts.policy_account.detach(policy_type);
+pub fn handler(ctx: Context<DetachFromPolicyAccount>, hash: String) -> Result<()> {
+    let policy_type = ctx.accounts.policy_account.detach(hash)?;
     // update max timeframe if detached policy was the max timeframe
 
     let mut max_timeframe = match policy_type {

programs/policy_engine/src/lib.rs

@@ -47,8 +47,8 @@ pub mod policy_engine {
     /// remove policy
     pub fn detach_from_policy_account(
         ctx: Context<DetachFromPolicyAccount>,
-        policy_type: PolicyType,
+        hash: String,
     ) -> Result<()> {
-        instructions::detach::handler(ctx, policy_type)
+        instructions::detach::handler(ctx, hash)
     }
 }