Skip to content

sec: implement explicit authorization signatures for admin actions #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Queenode merged 2 commits into from
Aug 26, 2026
Merged

sec: implement explicit authorization signatures for admin actions #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e0a3ca
sec: implement explicit authorization signatures for admin actions (f…
Ultra-Tech-code Aug 25, 2026
6abcc92
style: fix formatting in test.rs
Ultra-Tech-code Aug 25, 2026
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
17 changes: 10 additions & 7 deletions contracts/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#![allow(deprecated)]

use soroban_sdk::{
contract, contractimpl, contracttype, symbol_short, token, Address, Env, String, Vec,
contract, contractimpl, contracttype, symbol_short, token, Address, Env, IntoVal, String, Vec,
};

mod test;
Expand Down Expand Up @@ -145,7 +145,7 @@ impl KoloSavingsContract {
/// Add a member to the group (Admin only)
pub fn add_member(env: Env, new_member: Address) {
let admin: Address = env.storage().instance().get(&DataKey::Admin).unwrap();
admin.require_auth();
admin.require_auth_for_args((new_member.clone(),).into_val(&env));
extend_instance_ttl(&env);

let mut members: Vec<Address> = env.storage().instance().get(&DataKey::Members).unwrap();
Expand Down Expand Up @@ -179,7 +179,7 @@ impl KoloSavingsContract {
/// Refunds current cycle contribution if applicable. Panics if member already received payout.
pub fn remove_member(env: Env, member_to_remove: Address) {
let admin: Address = env.storage().instance().get(&DataKey::Admin).unwrap();
admin.require_auth();
admin.require_auth_for_args((member_to_remove.clone(),).into_val(&env));
extend_instance_ttl(&env);

let mut members: Vec<Address> = env.storage().instance().get(&DataKey::Members).unwrap();
Expand Down Expand Up @@ -347,7 +347,7 @@ impl KoloSavingsContract {

/// Withdraw payout (Admin triggers payout to the next member in queue)
/// Enforces strictly deterministic rotational payout (Ajo/Esusu) order.
pub fn payout(env: Env) {
pub fn payout(env: Env, expected_recipient: Address) {
let group_type: GroupType = env
.storage()
.instance()
Expand All @@ -358,7 +358,7 @@ impl KoloSavingsContract {
}

let admin: Address = env.storage().instance().get(&DataKey::Admin).unwrap();
admin.require_auth();
admin.require_auth_for_args((expected_recipient.clone(),).into_val(&env));
extend_instance_ttl(&env);

let members: Vec<Address> = env.storage().instance().get(&DataKey::Members).unwrap();
Expand All @@ -373,6 +373,9 @@ impl KoloSavingsContract {
}

let recipient: Address = members.get(next_index).unwrap();
if recipient != expected_recipient {
panic!("Recipient mismatch");
}

let contribution_amount: i128 = env
.storage()
Expand Down Expand Up @@ -510,7 +513,7 @@ impl KoloSavingsContract {
/// all members have received their payout and the admin triggers a new rotation.
pub fn reset_cycle(env: Env) {
let admin: Address = env.storage().instance().get(&DataKey::Admin).unwrap();
admin.require_auth();
admin.require_auth_for_args(().into_val(&env));
extend_instance_ttl(&env);

let group_type: GroupType = env
Expand Down Expand Up @@ -541,7 +544,7 @@ impl KoloSavingsContract {
/// Call this after all members have received their payout to begin a new rotation.
pub fn reset_rotation(env: Env) {
let admin: Address = env.storage().instance().get(&DataKey::Admin).unwrap();
admin.require_auth();
admin.require_auth_for_args(().into_val(&env));
extend_instance_ttl(&env);

env.storage()
Expand Down
73 changes: 61 additions & 12 deletions contracts/src/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -521,7 +521,7 @@ fn test_remove_member_after_payout_panics() {
client.contribute(&member1, &1000);
client.contribute(&member2, &1000);

client.payout();
client.payout(&member1);

client.remove_member(&member1);
}
Expand Down Expand Up @@ -584,7 +584,7 @@ fn test_remove_member_adjusts_cycle_count() {

client.contribute(&member2, &1000);

client.payout();
client.payout(&member1);

let contract_balance = token_client.balance(&contract_id);
assert_eq!(contract_balance, 0);
Expand Down Expand Up @@ -681,7 +681,7 @@ fn test_deterministic_payout_order() {
client.contribute(&member1, &1000);
client.contribute(&member2, &1000);
assert_eq!(client.get_next_payout_recipient(), member0);
client.payout();
client.payout(&member0);
assert!(client.has_received_payout(&member0));
assert!(!client.has_received_payout(&member1));
assert!(!client.has_received_payout(&member2));
Expand All @@ -698,7 +698,7 @@ fn test_deterministic_payout_order() {
client.contribute(&member1, &1000);
client.contribute(&member2, &1000);
assert_eq!(client.get_next_payout_recipient(), member1);
client.payout();
client.payout(&member1);
assert!(client.has_received_payout(&member1));
assert!(!client.has_received_payout(&member2));
// 10000 - 1000 (round1) - 1000 (round2) + 3000 (payout) = 11000
Expand All @@ -710,7 +710,7 @@ fn test_deterministic_payout_order() {
client.contribute(&member1, &1000);
client.contribute(&member2, &1000);
assert_eq!(client.get_next_payout_recipient(), member2);
client.payout();
client.payout(&member2);
assert!(client.has_received_payout(&member2));
// 10000 - 1000*3 (3 rounds) + 3000 (payout) = 10000
assert_eq!(token_client.balance(&member2), 10000);
Expand Down Expand Up @@ -756,7 +756,7 @@ fn test_queue_enforced_payout_order() {
client.contribute(&member2, &1000);

assert_eq!(client.get_next_payout_recipient(), member0);
client.payout();
client.payout(&member0);
assert!(client.has_received_payout(&member0));
assert!(!client.has_received_payout(&member2));

Expand All @@ -767,7 +767,7 @@ fn test_queue_enforced_payout_order() {
client.contribute(&member2, &1000);

assert_eq!(client.get_next_payout_recipient(), member1);
client.payout();
client.payout(&member1);
assert!(client.has_received_payout(&member1));
assert!(!client.has_received_payout(&member2));

Expand All @@ -778,7 +778,7 @@ fn test_queue_enforced_payout_order() {
client.contribute(&member2, &1000);

assert_eq!(client.get_next_payout_recipient(), member2);
client.payout();
client.payout(&member2);
assert!(client.has_received_payout(&member2));
}

Expand Down Expand Up @@ -822,7 +822,7 @@ fn test_cycle_resets_and_starts_again() {
client.contribute(&member1, &1000);
client.contribute(&member2, &1000);
assert_eq!(client.get_next_payout_recipient(), member0);
client.payout();
client.payout(&member0);
assert!(client.has_received_payout(&member0));

// Round 2: payout to member1
Expand All @@ -831,7 +831,7 @@ fn test_cycle_resets_and_starts_again() {
client.contribute(&member1, &1000);
client.contribute(&member2, &1000);
assert_eq!(client.get_next_payout_recipient(), member1);
client.payout();
client.payout(&member1);
assert!(client.has_received_payout(&member1));

// Round 3: payout to member2
Expand All @@ -840,7 +840,7 @@ fn test_cycle_resets_and_starts_again() {
client.contribute(&member1, &1000);
client.contribute(&member2, &1000);
assert_eq!(client.get_next_payout_recipient(), member2);
client.payout();
client.payout(&member2);
assert!(client.has_received_payout(&member2));

// --- Full reset: reset_rotation() resets NextPayoutIndex to 0 ---
Expand All @@ -857,6 +857,55 @@ fn test_cycle_resets_and_starts_again() {
client.contribute(&member1, &1000);
client.contribute(&member2, &1000);
assert_eq!(client.get_next_payout_recipient(), member0);
client.payout();
client.payout(&member0);
assert!(client.has_received_payout(&member0));
}

#[test]
#[should_panic(expected = "Error(Auth, InvalidAction)")]
fn test_payout_wrong_recipient_auth_fails() {
let env = Env::default();

let contract_id = env.register_contract(None, KoloSavingsContract);
let client = KoloSavingsContractClient::new(&env, &contract_id);

let admin = Address::generate(&env);
let token_admin = Address::generate(&env);
let token = env.register_stellar_asset_contract(token_admin.clone());
let token_client = token::StellarAssetClient::new(&env, &token);

// Initialize with mock all auths to easily bypass initialization auth
env.mock_all_auths();
client.initialize(
&admin,
&token,
&String::from_str(&env, "Test Group"),
&1000i128,
&GroupType::Rotational,
&None,
&false,
&None,
);

let member0 = Address::generate(&env);
let member1 = Address::generate(&env);
client.add_member(&member0);
client.add_member(&member1);

token_client.mint(&member0, &10000);
client.contribute(&member0, &1000);

// We only explicitly mock the auth for payout with the WRONG recipient (member1)
env.mock_auths(&[soroban_sdk::testutils::MockAuth {
address: &admin,
invoke: &soroban_sdk::testutils::MockAuthInvoke {
contract: &contract_id,
fn_name: "payout",
args: (member1.clone(),).into_val(&env),
sub_invokes: &[],
},
}]);

// Calling it with member0 should fail because auth is for member1
client.payout(&member0);
}
24 changes: 20 additions & 4 deletions contracts/test_snapshots/test/test_cycle_resets_and_starts_again.1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,11 @@
"contract_fn": {
"contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
"function_name": "payout",
"args": []
"args": [
{
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM"
}
]
}
},
"sub_invocations": []
Expand Down Expand Up @@ -488,7 +492,11 @@
"contract_fn": {
"contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
"function_name": "payout",
"args": []
"args": [
{
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4"
}
]
}
},
"sub_invocations": []
Expand Down Expand Up @@ -649,7 +657,11 @@
"contract_fn": {
"contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
"function_name": "payout",
"args": []
"args": [
{
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOLZM"
}
]
}
},
"sub_invocations": []
Expand Down Expand Up @@ -828,7 +840,11 @@
"contract_fn": {
"contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
"function_name": "payout",
"args": []
"args": [
{
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM"
}
]
}
},
"sub_invocations": []
Expand Down
18 changes: 15 additions & 3 deletions contracts/test_snapshots/test/test_deterministic_payout_order.1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,11 @@
"contract_fn": {
"contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
"function_name": "payout",
"args": []
"args": [
{
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAK3IM"
}
]
}
},
"sub_invocations": []
Expand Down Expand Up @@ -492,7 +496,11 @@
"contract_fn": {
"contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
"function_name": "payout",
"args": []
"args": [
{
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMDR4"
}
]
}
},
"sub_invocations": []
Expand Down Expand Up @@ -655,7 +663,11 @@
"contract_fn": {
"contract_address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD2KM",
"function_name": "payout",
"args": []
"args": [
{
"address": "CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAOLZM"
}
]
}
},
"sub_invocations": []
Expand Down
Loading
Loading