Skip to content
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

Jump to bottom

Handle edge case where an authorizedUser has multiple verification methods #21

Merged
merged 2 commits into from
Sep 29, 2023
Merged

Handle edge case where an authorizedUser has multiple verification methods #21

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
3f9c84e
Handle edge case where an authorizedUser has multiple verification me…
Sep 29, 2023
35114a3
make check for authority flag more readable
Sep 29, 2023
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
5 changes: 4 additions & 1 deletion src/DidRegistry.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,10 @@ contract DIDRegistry is IDidRegistry, Initializable, UUPSUpgradeable, OwnableUpg
// Iterate through verification methods looking for key
if(address(bytes20(didState.verificationMethods[i].keyData)) == authority) {
// Does the key authority have permission to invoke
return _hasFlag(didState.verificationMethods[i].flags, VerificationMethodFlagBitMask.CAPABILITY_INVOCATION);
if ( _hasFlag(didState.verificationMethods[i].flags, VerificationMethodFlagBitMask.CAPABILITY_INVOCATION) )
{
return true;
}
}
}
return false;
Expand Down
42 changes: 39 additions & 3 deletions test/DidRegistryVerificationMethodTest.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,13 +58,13 @@ contract DidRegistryVerificationMethodTest is DidRegistryTest {

function test_authorized_user_should_remove_verification_method() public {
address user = vm.addr(1);
address nonAuthorizedUser = vm.addr(2);
address authorizedUser = vm.addr(2);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume this was just an unrelated typo?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep yep.


DIDRegistry.VerificationMethod memory newVm = DIDRegistry.VerificationMethod({
fragment: 'verification-new-1',
flags: uint16(uint16(1) << uint16(DIDRegistry.VerificationMethodFlagBitMask.CAPABILITY_INVOCATION)),
methodType: DIDRegistry.VerificationMethodType.EcdsaSecp256k1RecoveryMethod,
keyData: abi.encodePacked(nonAuthorizedUser)
keyData: abi.encodePacked(authorizedUser)
});

vm.startPrank(user); // Send transaction as the authorized user
Expand All @@ -73,7 +73,7 @@ contract DidRegistryVerificationMethodTest is DidRegistryTest {

vm.stopPrank();

vm.startPrank(nonAuthorizedUser);
vm.startPrank(authorizedUser);

didRegistry.removeVerificationMethod(user, newVm.fragment);

Expand All @@ -82,6 +82,42 @@ contract DidRegistryVerificationMethodTest is DidRegistryTest {
assertEq(finalState.verificationMethods.length,1);
}

function test_authorized_user_with_multiple_verification_methods_should_remove_verification_method() public {
address user = vm.addr(1);
address authorizedUser = vm.addr(2);

// Add authoried user to verification method with no capabilitiy invocation
DIDRegistry.VerificationMethod memory newVm = DIDRegistry.VerificationMethod({
fragment: 'verification-new-1',
flags: uint16(uint16(1) << uint16(0)),
methodType: DIDRegistry.VerificationMethodType.EcdsaSecp256k1RecoveryMethod,
keyData: abi.encodePacked(authorizedUser)
});

DIDRegistry.VerificationMethod memory newVm2 = DIDRegistry.VerificationMethod({
fragment: 'verification-new-2',
flags: uint16(uint16(1) << uint16(DIDRegistry.VerificationMethodFlagBitMask.CAPABILITY_INVOCATION)),
methodType: DIDRegistry.VerificationMethodType.EcdsaSecp256k1RecoveryMethod,
keyData: abi.encodePacked(authorizedUser)
});

// Send transactions as the user to add vm's
vm.startPrank(user);

_attemptToAddVerificationMethod(user, newVm);
didRegistry.addVerificationMethod(user, newVm2);

vm.stopPrank();

vm.startPrank(authorizedUser);

didRegistry.removeVerificationMethod(user, newVm2.fragment);

DIDRegistry.DidState memory finalState = didRegistry.resolveDidState(user);

assertEq(finalState.verificationMethods.length, 2);
}

function test_should_update_verification_method_flags() public {
address user = vm.addr(1);

Expand Down