fix: Added key id ref bypass on strict validation (#837)

* Loosened id ref * Removed redundant
cheqd · Jan 13, 2025 · 5f68c5d · 5f68c5d
1 parent 6babe91
commit 5f68c5d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/x/did/types/diddoc_diddoc.go b/x/did/types/diddoc_diddoc.go
@@ -96,7 +96,7 @@ func (didDoc DidDoc) Validate(allowedNamespaces []string) error {
 			IsUniqueStrList(), validation.Each(IsDIDUrl(allowedNamespaces, Empty, Empty, Required), HasPrefix(didDoc.Id)),
 		),
 		validation.Field(&didDoc.AssertionMethod,
-			IsUniqueStrList(), validation.Each(IsAssertionMethod(allowedNamespaces, didDoc))),
+			IsUniqueStrList(), validation.Each(IsAssertionMethod(allowedNamespaces, didDoc, false))),
 		validation.Field(&didDoc.CapabilityInvocation,
 			IsUniqueStrList(), validation.Each(IsDIDUrl(allowedNamespaces, Empty, Empty, Required), HasPrefix(didDoc.Id)),
 		),

diff --git a/x/did/types/diddoc_diddoc_test.go b/x/did/types/diddoc_diddoc_test.go
@@ -273,7 +273,7 @@ var _ = DescribeTable("DIDDoc Validation tests", func(testCase DIDDocTestCase) {
 				},
 				AssertionMethod: []string{fmt.Sprintf("%s#fragment", ValidTestDID), func() string {
 					b, _ := json.Marshal(AssertionMethodJSONUnescaped{
-						Id:              fmt.Sprintf("%s#fragment", ValidTestDID),
+						Id:              fmt.Sprintf("%s#fragment-1", ValidTestDID),
 						Type:            "Ed25519VerificationKey2018",
 						Controller:      ValidTestDID,
 						PublicKeyBase58: &ValidEd25519VerificationKey2018VerificationMaterial, // arbitrarily chosen, loosely validated

diff --git a/x/did/types/validate.go b/x/did/types/validate.go
@@ -107,7 +107,7 @@ func IsDIDUrl(allowedNamespaces []string, pathRule, queryRule, fragmentRule Vali
 	})
 }
 
-func IsAssertionMethod(allowedNamespaces []string, didDoc DidDoc) *CustomErrorRule {
+func IsAssertionMethod(allowedNamespaces []string, didDoc DidDoc, bypass bool) *CustomErrorRule {
 	return NewCustomErrorRule(func(value interface{}) error {
 		casted, ok := value.(string)
 		if !ok {
@@ -126,7 +126,7 @@ func IsAssertionMethod(allowedNamespaces []string, didDoc DidDoc) *CustomErrorRu
 			}
 
 			return validation.ValidateStruct(&result,
-				validation.Field(&result.Id, validation.Required, IsAssertionMethod(allowedNamespaces, didDoc)),
+				validation.Field(&result.Id, validation.Required, IsAssertionMethod(allowedNamespaces, didDoc, true)),
 				validation.Field(&result.Controller, validation.Required, IsDID(allowedNamespaces)),
 			)
 		}
@@ -136,6 +136,10 @@ func IsAssertionMethod(allowedNamespaces []string, didDoc DidDoc) *CustomErrorRu
 			return errors.New("assertionMethod should be a valid DIDUrl or an Escaped JSON string with id, type and controller values")
 		}
 
+		if bypass {
+			return nil
+		}
+
 		for _, v := range didDoc.VerificationMethod {
 			if v.Id == casted {
 				return nil