Skip to content

fix(auth-eth): report the current root epoch in wrong-kind rejections #1538

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
kvinwang merged 1 commit into from
Nov 9, 2026
Merged

fix(auth-eth): report the current root epoch in wrong-kind rejections #1538

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 7 additions & 8 deletions dstack/kms/auth-eth/contracts/DstackKms.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,20 +489,19 @@ contract DstackKms is Initializable, Ownable2StepUpgradeable, UUPSUpgradeable, E
{
result.gatewayAppId = gatewayAppId;
result.currentAppEpoch = isKms ? 0 : currentAppEpoch(request.appInfo.appId);
if (_rootEpochs.length > 0) {
result.currentRootEpoch = _currentRootEpoch;
result.currentRootEpochHash = _rootEpochs[_currentRootEpoch].chainHash;
}
if (!(isKms
? AuthorizationOperation.isKms(request.operation)
: AuthorizationOperation.isApp(request.operation))) {
result.rejectionReason = "Invalid authorization operation";
return result;
}
if (_rootEpochs.length == 0) {
if (request.operation != AuthorizationOperation.KMS_BOOTSTRAP) {
result.rejectionReason = "Root epoch not registered";
return result;
}
} else {
result.currentRootEpoch = _currentRootEpoch;
result.currentRootEpochHash = _rootEpochs[_currentRootEpoch].chainHash;
if (_rootEpochs.length == 0 && request.operation != AuthorizationOperation.KMS_BOOTSTRAP) {
result.rejectionReason = "Root epoch not registered";
return result;
}
uint256 latestAllowedRoot = isKms ? _latestRootEpoch() : _currentRootEpoch;
if (request.requestedRootEpoch.isSet && request.requestedRootEpoch.value > latestAllowedRoot) {
Expand Down
14 changes: 12 additions & 2 deletions dstack/kms/auth-eth/test/DstackKms.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -659,13 +659,23 @@ contract DstackKmsTest is Test {
kms.activateRootEpoch(1, chainHash(chainHash(bytes32(0), ca(0xa0), k256(0xb0)), ca(0xa1), k256(0xb1)));
vm.stopPrank();

bytes32 hash1 = chainHash(chainHash(bytes32(0), ca(0xa0), k256(0xb0)), ca(0xa1), k256(0xb1));
DstackKms.AuthorizationResult memory result = authorize(authorizationInfo(user), false);
assertFalse(result.isAllowed);
assertEq(result.rejectionReason, "App not registered");
assertEq(result.currentRootEpoch, 1);
assertEq(
result.currentRootEpochHash, chainHash(chainHash(bytes32(0), ca(0xa0), k256(0xb0)), ca(0xa1), k256(0xb1))
assertEq(result.currentRootEpochHash, hash1);

DstackKms.AuthorizationRequest memory request = DstackKms.AuthorizationRequest(
authorizationInfo(user),
keccak256("kms_serve"),
DstackKms.OptionalUint256(false, 0),
DstackKms.OptionalUint256(false, 0)
);
result = kms.authorizeApp(request);
assertEq(result.rejectionReason, "Invalid authorization operation");
assertEq(result.currentRootEpoch, 1);
assertEq(result.currentRootEpochHash, hash1);
}

function test_IsKmsAllowed() public {
Expand Down
Loading