add workarounds for mdoc to allow malformed strucure for now

Signed-off-by: Johannes Tuerk <johannes.tuerk@lissi.id>

Author: JoTiTu

src/WalletFramework.MdocLib/IssuerSigned.cs

@@ -22,12 +22,10 @@ private IssuerSigned(NameSpaces nameSpaces, IssuerAuth issuerAuth)
     private static IssuerSigned Create(NameSpaces nameSpaces, IssuerAuth issuerAuth) =>
         new(nameSpaces, issuerAuth);
 
-    internal static Validation<IssuerSigned> ValidIssuerSigned(CBORObject mdoc) =>
-        mdoc.GetByLabel(IssuerSignedLabel).OnSuccess(issuerSigned =>
-            Valid(Create)
-                .Apply(ValidNameSpaces(issuerSigned))
-                .Apply(ValidIssuerAuth(issuerSigned))
-            );
+    public static Validation<IssuerSigned> ValidIssuerSigned(CBORObject issuerSigned) => 
+        Valid(Create)
+            .Apply(ValidNameSpaces(issuerSigned))
+            .Apply(ValidIssuerAuth(issuerSigned));
 
     public CBORObject Encode()
     {
@@ -39,3 +37,13 @@ public CBORObject Encode()
         return cbor;
     }
 }
+
+public static class IssuerSignedFun
+{
+    // TODO: This is only a hack currently, the doctype of the mdoc and the mso must be validated normally
+    public static Mdoc ToMdoc(this IssuerSigned issuerSigned)
+    {
+        var docType = issuerSigned.IssuerAuth.Payload.DocType;
+        return new Mdoc(docType, issuerSigned);
+    }
+}

src/WalletFramework.MdocLib/Mdoc.cs

@@ -20,7 +20,7 @@ public record Mdoc
     // TODO: mdoc authentication
     // public DeviceSigned DeviceSigned { get; }
 
-    private Mdoc(DocType docType, IssuerSigned issuerSigned)
+    public Mdoc(DocType docType, IssuerSigned issuerSigned)
     {
         DocType = docType;
         IssuerSigned = issuerSigned;
@@ -68,12 +68,55 @@ public static Validation<Mdoc> ValidMdoc(string base64UrlencodedCborByteString)
         return 
             from bytes in decodeBase64Url(base64UrlencodedCborByteString)
             from cbor in parseCborByteString(bytes)
+            from issuerSigned in cbor.GetByLabel(IssuerSignedLabel)
             from mdoc in Valid(Create)
                 .Apply(ValidDoctype(cbor))
-                .Apply(ValidIssuerSigned(cbor))
+                .Apply(ValidIssuerSigned(issuerSigned))
             from validMdoc in validateIntegrity(mdoc)
             select validMdoc;
     }
+    
+    //TODO: Workaround because PId Issuer only implemented issuer signed, Delete this overload when PID Issuer is fixed!!
+    public static Validation<Mdoc> FromIssuerSigned(string base64UrlencodedCborByteString)
+    {
+        var decodeBase64Url = new Func<string, Validation<byte[]>>(str =>
+        {
+            try
+            {
+                return Base64UrlEncoder.DecodeBytes(str)!;
+            }
+            catch (Exception e)
+            {
+                return new InvalidBase64UrlEncodingError(e);
+            }
+        });
+
+        var parseCborByteString = new Func<byte[], Validation<CBORObject>>(bytes =>
+        {
+            try
+            {
+                return CBORObject.DecodeFromBytes(bytes);
+            }
+            catch (Exception e)
+            {
+                return new InvalidCborByteStringError("mdocResponse", e);
+            }
+        });
+        
+        var validateIntegrity = new List<Validator<Mdoc>>
+            {
+                MdocFun.DocTypeMatches,
+                MdocFun.DigestsMatch
+            }
+            .AggregateValidators();
+
+        return 
+            from bytes in decodeBase64Url(base64UrlencodedCborByteString)
+            from cbor in parseCborByteString(bytes)
+            from issuerSigned in ValidIssuerSigned(cbor)
+            from validMdoc in validateIntegrity(issuerSigned.ToMdoc())
+            select validMdoc;
+    }
 
     public record InvalidBase64UrlEncodingError(Exception E) : Error("String is not Base64UrlEncoded", E);
 }

src/WalletFramework.MdocVc/MdocRecord.cs

@@ -75,12 +75,12 @@ public static class MdocRecordFun
     public static MdocRecord DecodeFromJson(JObject json)
     {
         var id = json[nameof(RecordBase.Id)]!.ToString();
-
+        
         var mdocStr = json[MdocJsonKey]!.ToString();
         var mdoc = Mdoc
             .ValidMdoc(mdocStr)
             .UnwrapOrThrow(new InvalidOperationException($"The MdocRecord with ID: {id} is corrupt"));
-
+        
         var displays =
             from jToken in json.GetByKey(MdocDisplaysJsonKey).ToOption()
             from jArray in jToken.ToJArray().ToOption()

src/WalletFramework.Oid4Vc/Oid4Vci/CredResponse/Mdoc/EncodedMdoc.cs

@@ -25,7 +25,7 @@ public static Validation<EncodedMdoc> ValidEncodedMdoc(JValue mdoc)
         var str = mdoc.ToString(CultureInfo.InvariantCulture);
 
         return MdocLib.Mdoc
-            .ValidMdoc(str)
+            .FromIssuerSigned(str)
             .OnSuccess(mdoc1 => new EncodedMdoc(str, mdoc1));
     }
 }