refactor: disabled JSON-LD checks for VPs with JWT VCs by default

pkg/doc/verifiable/presentation.go

@@ -350,12 +350,13 @@ func (rp *rawPresentation) UnmarshalJSON(data []byte) error {
 
 // presentationOpts holds options for the Verifiable Presentation decoding.
 type presentationOpts struct {
-	publicKeyFetcher   PublicKeyFetcher
-	disabledProofCheck bool
-	ldpSuites          []verifier.SignatureSuite
-	strictValidation   bool
-	requireVC          bool
-	requireProof       bool
+	publicKeyFetcher    PublicKeyFetcher
+	disabledProofCheck  bool
+	ldpSuites           []verifier.SignatureSuite
+	strictValidation    bool
+	requireVC           bool
+	requireProof        bool
+	disableJSONLDChecks bool
 
 	jsonldCredentialOpts
 }
@@ -402,6 +403,14 @@ func WithPresJSONLDDocumentLoader(documentLoader jsonld.DocumentLoader) Presenta
 	}
 }
 
+// WithDisabledJSONLDChecks disables JSON-LD checks for VP parsing.
+// By default, JSON-LD checks are enabled.
+func WithDisabledJSONLDChecks() PresentationOpt {
+	return func(opts *presentationOpts) {
+		opts.disableJSONLDChecks = true
+	}
+}
+
 // ParsePresentation creates an instance of Verifiable Presentation by reading a JSON document from bytes.
 // It also applies miscellaneous options like custom decoders or settings of schema validation.
 func ParsePresentation(vpData []byte, opts ...PresentationOpt) (*Presentation, error) {
@@ -548,6 +557,10 @@ func validateVP(data []byte, opts *presentationOpts) error {
 		return err
 	}
 
+	if opts.disableJSONLDChecks {
+		return nil
+	}
+
 	return validateVPJSONLD(data, opts)
 }
 

pkg/doc/verifiable/presentation_test.go

@@ -113,6 +113,9 @@ const validPresentationWithCustomFields = `
 }
 `
 
+//go:embed testdata/validPresentationWithJWTVC.jsonld
+var validPresentationWithJWTVC []byte //nolint:gochecknoglobals
+
 //go:embed testdata/context/presentation_submission_v1.jsonld
 var presentationSubmissionV1 []byte //nolint:gochecknoglobals
 
@@ -293,6 +296,25 @@ func TestParsePresentation(t *testing.T) {
 		require.EqualError(t, err, "JSON-LD doc has different structure after compaction")
 		require.Nil(t, vp)
 	})
+
+	t.Run("parsing VP with a JWT VC succeeds", func(t *testing.T) {
+		loader := createTestDocumentLoader(t, ldcontext.Document{
+			URL:     "https://trustbloc.github.io/context/vc/presentation-exchange-submission-v1.jsonld",
+			Content: presentationSubmissionV1,
+		})
+
+		vp, err := ParsePresentation(validPresentationWithJWTVC, WithPresDisabledProofCheck(),
+			WithPresJSONLDDocumentLoader(loader))
+		require.NoError(t, err)
+		require.NotNil(t, vp)
+	})
+
+	t.Run("parsing VP with a JWT VC with required JSON-LD checks succeeds", func(t *testing.T) {
+		vp, err := ParsePresentation(validPresentationWithJWTVC, WithPresDisabledProofCheck(),
+			WithDisabledJSONLDChecks())
+		require.NoError(t, err)
+		require.NotNil(t, vp)
+	})
 }
 
 func TestValidateVP_Context(t *testing.T) {

pkg/doc/verifiable/testdata/validPresentationWithJWTVC.jsonld

@@ -0,0 +1,29 @@
+{
+   "@context":[
+      "https://www.w3.org/2018/credentials/v1",
+      "https://identity.foundation/presentation-exchange/submission/v1"
+   ],
+   "presentation_submission":{
+      "id":"0137f0ec-6676-4123-a374-4cc3a4262458",
+      "definition_id":"32f54163-7166-48f1-93d8-ff217bdb0153",
+      "descriptor_map":[
+         {
+            "id":"VerifiedEmployee",
+            "format":"jwt_vp",
+            "path":"$",
+            "path_nested":{
+               "id":"VerifiedEmployee",
+               "format":"jwt_vc",
+               "path":"$.verifiableCredential[0]"
+            }
+         }
+      ]
+   },
+   "type":[
+      "VerifiablePresentation",
+      "PresentationSubmission"
+   ],
+   "verifiableCredential":[
+      "eyJhbGciOiJFUzI1NksiLCJraWQiOiJkaWQ6b3JiOnVBQUE6RWlEVHhIVzBuUXljYU04ZmNmNG42YmxSa0VNM2VaYWV0dEtuT2VjSFpVU1BKdyMxNDE0YTZjMy02N2MzLTRlNDItYmY1Ny00OTAwNTUwZDc3YjIifQ.eyJleHAiOjE3MDg4MDgwMTEsImlhdCI6MTY3NzI3MjAxMSwiaXNzIjoiZGlkOm9yYjp1QUFBOkVpRFR4SFcwblF5Y2FNOGZjZjRuNmJsUmtFTTNlWmFldHRLbk9lY0haVVNQSnciLCJqdGkiOiJ1cm46dXVpZDo4MjkxNzY3Ni0yNDJlLTQxZGYtOGQ1My1mZDg5ZTQ2OTU0Y2QiLCJuYmYiOjE2NzcyNzIwMTEsInN1YiI6ImRpZDppb246RWlEQjNjWUVYVXdBY2drUTd2WHlpNE5qb0VzTVJyU1FFaGdUR1Bnb3JHYnBSdzpleUprWld4MFlTSTZleUp3WVhSamFHVnpJanBiZXlKaFkzUnBiMjRpT2lKaFpHUXRjSFZpYkdsakxXdGxlWE1pTENKd2RXSnNhV05MWlhseklqcGJleUpwWkNJNklqSmFOelpqWldFMmJYbHZSM2RzUWtoYVNqaHpkRTlmU1ZJNGRXaGtZbEl3UjA5WVYxTk9lWEl0U1UwaUxDSndkV0pzYVdOTFpYbEtkMnNpT25zaVkzSjJJam9pUldReU5UVXhPU0lzSW10MGVTSTZJazlMVUNJc0luZ2lPaUowVUZGM1pWa3pUSEJrVm5KdE0xQkRUVzR3YTNCa2VFSXhZbkJ3V0Vwc1kyTkJWWFpGTlhkeFpGbEpJbjBzSW5CMWNuQnZjMlZ6SWpwYkltRjFkR2hsYm5ScFkyRjBhVzl1SWl3aVlYTnpaWEowYVc5dVRXVjBhRzlrSWwwc0luUjVjR1VpT2lKS2MyOXVWMlZpUzJWNU1qQXlNQ0o5WFgxZExDSjFjR1JoZEdWRGIyMXRhWFJ0Wlc1MElqb2lSV2xDWVcxTVZHOUpSVE5uVURaNlVrbEpjRzFVT0RKSFVGTXhPR1JHV204elFsUk9kV056VFdoaE5tSjZkeUo5TENKemRXWm1hWGhFWVhSaElqcDdJbVJsYkhSaFNHRnphQ0k2SWtWcFExOXZRMk5mWkZKb1NYTTNlRTFwYmxGTFpYaDBaMUZSY1hKYWFVVmFORkEwY3pGbFVqWnRObVI0ZVZFaUxDSnlaV052ZG1WeWVVTnZiVzFwZEcxbGJuUWlPaUpGYVVGVGJVeDFXa2syU0VkdlprSmFkRWMwTURWRllXTkdNRVpsYXpOSFZtRnBUMHBHZEhWMFkweGlNbUZCSW4wc0luUjVjR1VpT2lKamNtVmhkR1VpZlEiLCJ2YyI6eyJAY29udGV4dCI6WyJodHRwczovL3d3dy53My5vcmcvMjAxOC9jcmVkZW50aWFscy92MSIsImh0dHBzOi8vdzNpZC5vcmcvdmMvc3RhdHVzLWxpc3QvMjAyMS92MSIsImh0dHBzOi8vdzNjLWNjZy5naXRodWIuaW8vbGRzLWp3czIwMjAvY29udGV4dHMvbGRzLWp3czIwMjAtdjEuanNvbiJdLCJjcmVkZW50aWFsU3RhdHVzIjp7ImlkIjoidXJuOnV1aWQ6NDY4YTIxNDEtOTc2My00OTg5LWEwNWEtMTQxZjc2MDcyOThmIiwic3RhdHVzTGlzdENyZWRlbnRpYWwiOiJodHRwOi8vbG9jYWxob3N0OjgwNzUvaXNzdWVyL3Byb2ZpbGVzL2JhbmtfaXNzdWVyL2NyZWRlbnRpYWxzL3N0YXR1cy8xIiwic3RhdHVzTGlzdEluZGV4IjoiNSIsInN0YXR1c1B1cnBvc2UiOiJyZXZvY2F0aW9uIiwidHlwZSI6IlN0YXR1c0xpc3QyMDIxRW50cnkifSwiY3JlZGVudGlhbFN1YmplY3QiOnsiZGlzcGxheU5hbWUiOiJKb2huIERvZSIsImdpdmVuTmFtZSI6IkpvaG4iLCJpZCI6ImRpZDppb246RWlEQjNjWUVYVXdBY2drUTd2WHlpNE5qb0VzTVJyU1FFaGdUR1Bnb3JHYnBSdzpleUprWld4MFlTSTZleUp3WVhSamFHVnpJanBiZXlKaFkzUnBiMjRpT2lKaFpHUXRjSFZpYkdsakxXdGxlWE1pTENKd2RXSnNhV05MWlhseklqcGJleUpwWkNJNklqSmFOelpqWldFMmJYbHZSM2RzUWtoYVNqaHpkRTlmU1ZJNGRXaGtZbEl3UjA5WVYxTk9lWEl0U1UwaUxDSndkV0pzYVdOTFpYbEtkMnNpT25zaVkzSjJJam9pUldReU5UVXhPU0lzSW10MGVTSTZJazlMVUNJc0luZ2lPaUowVUZGM1pWa3pUSEJrVm5KdE0xQkRUVzR3YTNCa2VFSXhZbkJ3V0Vwc1kyTkJWWFpGTlhkeFpGbEpJbjBzSW5CMWNuQnZjMlZ6SWpwYkltRjFkR2hsYm5ScFkyRjBhVzl1SWl3aVlYTnpaWEowYVc5dVRXVjBhRzlrSWwwc0luUjVjR1VpT2lKS2MyOXVWMlZpUzJWNU1qQXlNQ0o5WFgxZExDSjFjR1JoZEdWRGIyMXRhWFJ0Wlc1MElqb2lSV2xDWVcxTVZHOUpSVE5uVURaNlVrbEpjRzFVT0RKSFVGTXhPR1JHV204elFsUk9kV056VFdoaE5tSjZkeUo5TENKemRXWm1hWGhFWVhSaElqcDdJbVJsYkhSaFNHRnphQ0k2SWtWcFExOXZRMk5mWkZKb1NYTTNlRTFwYmxGTFpYaDBaMUZSY1hKYWFVVmFORkEwY3pGbFVqWnRObVI0ZVZFaUxDSnlaV052ZG1WeWVVTnZiVzFwZEcxbGJuUWlPaUpGYVVGVGJVeDFXa2syU0VkdlprSmFkRWMwTURWRllXTkdNRVpsYXpOSFZtRnBUMHBHZEhWMFkweGlNbUZCSW4wc0luUjVjR1VpT2lKamNtVmhkR1VpZlEiLCJqb2JUaXRsZSI6IlNvZnR3YXJlIERldmVsb3BlciIsIm1haWwiOiJqb2huLmRvZUBmb28uYmFyIiwicGhvdG8iOiJkYXRhLVVSTC1lbmNvZGVkIGltYWdlIiwicHJlZmVycmVkTGFuZ3VhZ2UiOiJFbmdsaXNoIiwic3VybmFtZSI6IkRvZSJ9LCJleHBpcmF0aW9uRGF0ZSI6IjIwMjQtMDItMjRUMjA6NTM6MzFaIiwiaWQiOiJ1cm46dXVpZDo4MjkxNzY3Ni0yNDJlLTQxZGYtOGQ1My1mZDg5ZTQ2OTU0Y2QiLCJpc3N1YW5jZURhdGUiOiIyMDIzLTAyLTI0VDIwOjUzOjMxWiIsImlzc3VlciI6eyJpZCI6ImRpZDpvcmI6dUFBQTpFaURUeEhXMG5ReWNhTThmY2Y0bjZibFJrRU0zZVphZXR0S25PZWNIWlVTUEp3IiwibmFtZSI6IkJhbmsgSXNzdWVyIn0sInR5cGUiOlsiVmVyaWZpYWJsZUNyZWRlbnRpYWwiLCJWZXJpZmllZEVtcGxveWVlIl19fQ.ZrxhchIBHyy1_b1J7TTkAmMEj97E4kPFIWJe__P5RipijjPIrMwtBpw1yz3W89f2PBNc4JNmepHyRmqP39Je3g"
+   ]
+}