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

Enable direct post for mdocs #265

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Enable direct post for mdocs #265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion src/WalletFramework.Oid4Vc/Oid4Vci/CredRequest/Implementations/CredentialRequestService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,13 @@ await authorizationRequest.Match(
Some: _ =>
{
if (format == "mso_mdoc")
sessionTranscript = authorizationRequest.UnwrapOrThrow(new Exception()).ToVpHandover()
{
var mdocGeneratedNonce = Nonce.GenerateNonce();
sessionTranscript = authorizationRequest
.UnwrapOrThrow()
.ToVpHandover(mdocGeneratedNonce)
.ToSessionTranscript();
}
return Task.CompletedTask;
},
None: async () =>
Expand Down
32 changes: 23 additions & 9 deletions src/WalletFramework.Oid4Vc/Oid4Vp/Models/Oid4VpHandover.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,14 @@
using WalletFramework.MdocLib.Security;
using WalletFramework.MdocLib.Security.Abstractions;
using static WalletFramework.Core.Encoding.Sha256Hash;
using static WalletFramework.Oid4Vc.Oid4Vp.Models.Nonce;

namespace WalletFramework.Oid4Vc.Oid4Vp.Models;

public record Oid4VpHandover(
Sha256Hash ClientIdSha256Hash,
Sha256Hash ResponseUriSha256Hash,
// TODO: Nonce from AuthRequest has weak type
string Nonce,
Nonce MdocGeneratedNonce) : IHandover
string Nonce) : IHandover
{
public CBORObject ToCbor()
{
Expand All @@ -36,25 +34,41 @@ public CBORObject ToCbor()

public static class Oid4VpHandoverFun
{
public static Oid4VpHandover ToVpHandover(this AuthorizationRequest request)
public static Oid4VpHandover ToVpHandover(this AuthorizationRequest request, Option<Nonce> mdocGeneratedNonce)
{
var mdocGeneratedNonce = GenerateNonce();

var clientIdToHash = CBORObject.NewArray();
var clientId = CBORObject.FromObject(request.ClientId);
clientIdToHash.Add(clientId);
clientIdToHash.Add(mdocGeneratedNonce.AsBase64Url.ToString());
mdocGeneratedNonce.Match(
nonce =>
{
clientIdToHash.Add(nonce.AsBase64Url.ToString());
},
() =>
{
clientIdToHash.Add(string.Empty);
});

var clientIdToHashBytes = clientIdToHash.EncodeToBytes();

var responseUriToHash = CBORObject.NewArray();
var responseUri = CBORObject.FromObject(request.ResponseUri);
responseUriToHash.Add(responseUri);
responseUriToHash.Add(mdocGeneratedNonce.AsBase64Url.ToString());
mdocGeneratedNonce.Match(
nonce =>
{
responseUriToHash.Add(nonce.AsBase64Url.ToString());
},
() =>
{
responseUriToHash.Add(string.Empty);
});

var responseUriToHashBytes = responseUriToHash.EncodeToBytes();

var clientIdHash = ComputeHash(clientIdToHashBytes);
var responseUriHash = ComputeHash(responseUriToHashBytes);

return new Oid4VpHandover(clientIdHash, responseUriHash, request.Nonce, mdocGeneratedNonce);
return new Oid4VpHandover(clientIdHash, responseUriHash, request.Nonce);
}
}
21 changes: 17 additions & 4 deletions src/WalletFramework.Oid4Vc/Oid4Vp/Services/Oid4VpClientService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,9 +172,16 @@ from path in field.Path.Select(path => path.TrimStart('$', '.'))
.ToDictionary(group => group.Key, group => group.ToList());

var mdoc = mdocRecord.Mdoc.SelectivelyDisclose(toDisclose);

mdocNonce = authorizationRequest.ResponseMode switch
{
AuthorizationRequest.DirectPost => Option<Nonce>.None,
AuthorizationRequest.DirectPostJwt => Nonce.GenerateNonce(),
_ => throw new ArgumentOutOfRangeException(nameof(authorizationRequest.ResponseMode))
};

var handover = authorizationRequest.ToVpHandover();
mdocNonce = handover.MdocGeneratedNonce;
var handover = authorizationRequest.ToVpHandover(mdocNonce);

var sessionTranscript = handover.ToSessionTranscript();
var authenticatedMdoc = await _mdocAuthenticationService.Authenticate(
mdoc, sessionTranscript, mdocRecord.KeyId);
Expand Down Expand Up @@ -418,9 +425,15 @@ from path in field.Path.Select(path => path.TrimStart('$', '.'))
.ToDictionary(group => group.Key, group => group.ToList());

var mdoc = mdocRecord.Mdoc.SelectivelyDisclose(toDisclose);

mdocNonce = authorizationRequest.ResponseMode switch
{
AuthorizationRequest.DirectPost => Option<Nonce>.None,
AuthorizationRequest.DirectPostJwt => Nonce.GenerateNonce(),
_ => throw new ArgumentOutOfRangeException(nameof(authorizationRequest.ResponseMode))
};

var handover = authorizationRequest.ToVpHandover();
mdocNonce = handover.MdocGeneratedNonce;
var handover = authorizationRequest.ToVpHandover(mdocNonce);
var sessionTranscript = handover.ToSessionTranscript();

var deviceNamespaces =
Expand Down
Loading