correcting bit shift when checking for flag validity

identity-com · Oct 2, 2023 · a63e2ab · a63e2ab
1 parent 0faea7f
commit a63e2ab
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/DidRegistry.sol b/src/DidRegistry.sol
@@ -110,6 +110,7 @@ contract DIDRegistry is IDidRegistry, Initializable, UUPSUpgradeable, OwnableUpg
     function addVerificationMethod(address didIdentifier, VerificationMethod calldata verificationMethod) onlyNonGenerativeDid(didIdentifier) onlyAuthorizedKeys(didIdentifier) public {
 
         require(!_doesFragmentExist(didIdentifier, verificationMethod.fragment), "Fragment already exist");
+        require(_isValidFlag(verificationMethod.flags), "Attempted to add unsupported flag");
 
         // Apply a bitmask on the verificationMethodFlags
         bool hasOwnershipFlag =  _hasFlag(verificationMethod.flags, VerificationMethodFlagBitMask.OWNERSHIP_PROOF);
@@ -360,6 +361,6 @@ contract DIDRegistry is IDidRegistry, Initializable, UUPSUpgradeable, OwnableUpg
 
     function _isValidFlag(uint16 flags) internal pure returns(bool) {
         // Shifts the input flag by the amount of flags avalible.
-        return uint16(type(VerificationMethodFlagBitMask).max) >> uint16(flags) == 0;
+        return uint16(flags) >> (uint16(type(VerificationMethodFlagBitMask).max) + 1) == 0;
     }
 }
diff --git a/test/DidRegistryVerificationMethodTest.sol b/test/DidRegistryVerificationMethodTest.sol
@@ -160,7 +160,7 @@ contract DidRegistryVerificationMethodTest is DidRegistryTest {
         didRegistry.updateVerificationMethodFlags(user, 'default', uint16(uint16(1) << uint16(DIDRegistry.VerificationMethodFlagBitMask.DID_DOC_HIDDEN)));
     }
 
-    function test__revert_should_not_allow_adding_unknown_flag_to_verification_method() public {
+    function test_revert_should_not_allow_adding_unknown_flag_to_verification_method() public {
         address user = vm.addr(1);
 
         vm.startPrank(user); // Send transaction as the user
@@ -171,7 +171,7 @@ contract DidRegistryVerificationMethodTest is DidRegistryTest {
         DIDRegistry.VerificationMethod memory defaultVerificationMethod = didState.verificationMethods[0];
 
         // Add none supported flag
-        uint16 newFlags = defaultVerificationMethod.flags & uint16(uint16(1) << uint16(type(DIDRegistry.VerificationMethodFlagBitMask).max) + 1);
+        uint16 newFlags = defaultVerificationMethod.flags | uint16(uint16(1) << uint16(type(DIDRegistry.VerificationMethodFlagBitMask).max) + 2);
 
         vm.expectRevert("Attempted to add unsupported flag");
         didRegistry.updateVerificationMethodFlags(user, defaultVerificationMethod.fragment, newFlags);