Skip to content

chore(kms-connector): avoid redundant acl check #2041

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

Draft
eudelins-zama wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

chore(kms-connector): avoid redundant acl check #2041

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d9b9a5
chore(kms-connector): avoid redundant acl check
eudelins-zama Mar 4, 2026
c19a4b9
fix(kms-connector): fix acl tests
eudelins-zama Mar 4, 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
63 changes: 14 additions & 49 deletions kms-connector/crates/kms-worker/src/core/event_processor/decryption.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,38 +208,23 @@ where
delegator_address: Address,
) -> Result<(), ProcessingError> {
let handle_hex = hex::encode(handle);
let is_delegated_call = acl_contract.isHandleDelegatedForUserDecryption(
delegator_address,
user_address,
contract_address,
handle,
);
let delegator_allowed_call = acl_contract.isAllowed(handle, delegator_address);
let contract_allowed_call = acl_contract.isAllowed(handle, contract_address);

let (is_delegated, delegator_allowed, contract_allowed) = tokio::try_join!(
is_delegated_call.call(),
delegator_allowed_call.call(),
contract_allowed_call.call(),
)
.map_err(|e| ProcessingError::Recoverable(anyhow::Error::from(e)))?;
let is_delegated = acl_contract
.isHandleDelegatedForUserDecryption(
delegator_address,
user_address,
contract_address,
handle,
)
.call()
.await
.map_err(|e| ProcessingError::Recoverable(anyhow::Error::from(e)))?;

if !is_delegated {
return Err(ProcessingError::Recoverable(anyhow!(
"{user_address} is not a delegate of {delegator_address} for contract \
{contract_address} and handle {handle_hex}!",
)));
}
if !delegator_allowed {
return Err(ProcessingError::Recoverable(anyhow!(
"{delegator_address} is not allowed to decrypt {handle_hex}!",
)));
}
if !contract_allowed {
return Err(ProcessingError::Recoverable(anyhow!(
"{contract_address} is not allowed to decrypt {handle_hex}!",
)));
}

Ok(())
}
Expand Down Expand Up @@ -603,11 +588,7 @@ mod tests {

enum DelegatedUserDecryptACLMock {
Failure(&'static str),
Success {
is_delegated: bool,
delegator_allowed: bool,
contract_allowed: bool,
},
Success { is_delegated: bool },
}

#[rstest]
Expand All @@ -617,22 +598,12 @@ mod tests {
None
)]
#[case::allowed(
DelegatedUserDecryptACLMock::Success { is_delegated: true, delegator_allowed: true, contract_allowed: true },
DelegatedUserDecryptACLMock::Success { is_delegated: true },
ExpectedOutcome::Ok,
None
)]
#[case::delegator_allowed_contract_not_allowed(
DelegatedUserDecryptACLMock::Success { is_delegated: true, delegator_allowed: true, contract_allowed: false },
ExpectedOutcome::Recoverable,
Some("is not allowed to decrypt")
)]
#[case::delegator_not_allowed_contract_allowed(
DelegatedUserDecryptACLMock::Success { is_delegated: true, delegator_allowed: false, contract_allowed: true },
ExpectedOutcome::Recoverable,
Some("is not allowed to decrypt")
)]
#[case::not_delegated(
DelegatedUserDecryptACLMock::Success { is_delegated: false, delegator_allowed: true, contract_allowed: true },
DelegatedUserDecryptACLMock::Success { is_delegated: false },
ExpectedOutcome::Recoverable,
Some("is not a delegate of")
)]
Expand Down Expand Up @@ -670,14 +641,8 @@ mod tests {

match mock_response {
DelegatedUserDecryptACLMock::Failure(msg) => asserter.push_failure_msg(msg),
DelegatedUserDecryptACLMock::Success {
is_delegated,
delegator_allowed,
contract_allowed,
} => {
DelegatedUserDecryptACLMock::Success { is_delegated } => {
asserter.push_success(&is_delegated.abi_encode());
asserter.push_success(&delegator_allowed.abi_encode());
asserter.push_success(&contract_allowed.abi_encode());
}
}

Expand Down