From 0027d865700fc71787046d279825db39b8d314ca Mon Sep 17 00:00:00 2001
From: carrion256 <awesomeibex@proton.me>
Date: Mon, 18 May 2026 13:38:50 +0200
Subject: [PATCH] 4ca30771-41fc-4b53-b8b2-95168b12803d auth before governance
 decode

---
 .../vault/soroban/src/contract/entrypoints.rs | 18 +++++++--------
 .../vault/soroban/src/contract/helpers.rs     |  6 -----
 contract/vault/soroban/src/tests.rs           | 23 +++++++++++++++++++
 3 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/contract/vault/soroban/src/contract/entrypoints.rs b/contract/vault/soroban/src/contract/entrypoints.rs
index cc6bfbeec..f267f3e1c 100644
--- a/contract/vault/soroban/src/contract/entrypoints.rs
+++ b/contract/vault/soroban/src/contract/entrypoints.rs
@@ -6,11 +6,10 @@
 use super::helpers::{
     adapter_for_market, address_from_alloc_string, addresses_from_alloc_strings, apply_fee_change,
     current_supply_queue_len, emit_admin_event, emit_alloc_event, emit_pause_state_event,
-    extend_storage_ttl, get_config_address, governance_caller, kernel_address_from_sdk,
-    load_virtual_offsets, migrate_legacy_paused, migration_in_progress, require_contract_address,
-    require_governance, require_signed, sdk_string_to_alloc, set_config_address,
-    set_migration_in_progress, store_fees_spec, store_virtual_offsets,
-    with_contract_vault_contract_error,
+    extend_storage_ttl, get_config_address, kernel_address_from_sdk, load_virtual_offsets,
+    migrate_legacy_paused, migration_in_progress, require_contract_address, require_governance,
+    require_signed, sdk_string_to_alloc, set_config_address, set_migration_in_progress,
+    store_fees_spec, store_virtual_offsets, with_contract_vault_contract_error,
 };
 use super::*;
 use templar_soroban_shared_types::{
@@ -479,14 +478,13 @@ fn refresh_markets_impl(
 
 fn set_governance_config_impl(
     env: &Env,
-    caller: soroban_sdk::Address,
+    _caller: soroban_sdk::Address,
     kind: u32,
     primary: Option<soroban_sdk::Address>,
     many: Option<soroban_sdk::Vec<soroban_sdk::Address>>,
     value_a: Option<i128>,
     value_b: Option<i128>,
 ) -> Result<(), ContractError> {
-    require_governance(env, &caller)?;
     match kind {
         GOVERNANCE_CONFIG_KIND_CURATOR => apply_curator_config(env, required_address(primary)?),
         GOVERNANCE_CONFIG_KIND_GOVERNANCE => {
@@ -524,7 +522,7 @@ fn set_governance_policy_impl(
     value_b: Option<i128>,
     value_c: Option<i128>,
 ) -> Result<(), ContractError> {
-    let caller_kernel = governance_caller(env, &caller)?;
+    let caller_kernel = kernel_address_from_sdk(env, &caller);
     match kind {
         GOVERNANCE_POLICY_KIND_SUPPLY_QUEUE => apply_supply_queue_policy(
             env,
@@ -574,10 +572,9 @@ fn set_governance_policy_impl(
 
 fn skim_impl(
     env: &Env,
-    caller: soroban_sdk::Address,
+    _caller: soroban_sdk::Address,
     token: soroban_sdk::Address,
 ) -> Result<(), ContractError> {
-    require_governance(env, &caller)?;
     let asset = get_config_address(env, &VaultDataKey::AssetToken)?;
     let share = get_config_address(env, &VaultDataKey::ShareToken)?;
     if token == asset || token == share {
@@ -829,6 +826,7 @@ impl SorobanVaultContract {
         caller: soroban_sdk::Address,
         payload: Bytes,
     ) -> Result<(), ContractError> {
+        require_governance(&env, &caller)?;
         let command = GovernanceCommand::decode(&payload.to_alloc_vec())
             .map_err(|_| ContractError::InvalidInput)?;
         execute_governance_command(&env, caller, command)
diff --git a/contract/vault/soroban/src/contract/helpers.rs b/contract/vault/soroban/src/contract/helpers.rs
index e77dad929..483af50db 100644
--- a/contract/vault/soroban/src/contract/helpers.rs
+++ b/contract/vault/soroban/src/contract/helpers.rs
@@ -542,9 +542,3 @@ pub(crate) fn require_governance(env: &Env, caller: &SdkAddress) -> Result<(), C
     }
     Ok(())
 }
-
-#[inline(never)]
-pub(crate) fn governance_caller(env: &Env, caller: &SdkAddress) -> Result<Address, ContractError> {
-    require_governance(env, caller)?;
-    Ok(kernel_address_from_sdk(env, caller))
-}
diff --git a/contract/vault/soroban/src/tests.rs b/contract/vault/soroban/src/tests.rs
index 2c74192f3..d8ae2d6d1 100644
--- a/contract/vault/soroban/src/tests.rs
+++ b/contract/vault/soroban/src/tests.rs
@@ -2901,6 +2901,29 @@ mod storage_tests {
         });
     }
 
+    #[test]
+    fn test_execute_governance_unauthorized_caller_rejected_before_body_decode() {
+        let env = Env::default();
+        env.mock_all_auths_allowing_non_root_auth();
+        let contract_id = env.register(SorobanVaultContract, ());
+        let curator = SdkAddress::generate(&env);
+        let governance = SdkAddress::generate(&env);
+        let attacker = SdkAddress::generate(&env);
+        let asset = SdkAddress::generate(&env);
+        let share = SdkAddress::generate(&env);
+
+        env.as_contract(&contract_id, || {
+            SorobanVaultContract::initialize(env.clone(), curator, governance, asset, share, 0, 0)
+                .unwrap();
+        });
+
+        let malformed_skim_payload = Bytes::from_slice(&env, &[2, 0xff, 0xff, 0xff, 0xff]);
+        let result = env.as_contract(&contract_id, || {
+            SorobanVaultContract::execute_governance(env.clone(), attacker, malformed_skim_payload)
+        });
+        assert_eq!(result, Err(crate::error::ContractError::Unauthorized));
+    }
+
     #[test]
     fn test_execute_governance_group_membership_requires_market_id() {
         let env = Env::default();