Enable did:jwk resolving (#2396)

vdr/didjwk/resolver.go

@@ -31,6 +31,9 @@ import (
 	"github.com/lestrrat-go/jwx/jwk"
 )
 
+// MethodName is the name of this DID method.
+const MethodName = "jwk"
+
 var _ types.DIDResolver = (*Resolver)(nil)
 
 // Resolver is a DID resolver for the did:jwk method.

vdr/vdr.go

@@ -30,6 +30,7 @@ import (
 	"fmt"
 	"github.com/nuts-foundation/nuts-node/crypto/hash"
 	"github.com/nuts-foundation/nuts-node/storage"
+	"github.com/nuts-foundation/nuts-node/vdr/didjwk"
 	"github.com/nuts-foundation/nuts-node/vdr/didnuts"
 	didnutsStore "github.com/nuts-foundation/nuts-node/vdr/didnuts/didstore"
 	"github.com/nuts-foundation/nuts-node/vdr/didservice"
@@ -99,6 +100,7 @@ func (r *VDR) Configure(_ core.ServerConfig) error {
 	// Register DID methods
 	r.didResolver.Register(didnuts.MethodName, &didnuts.Resolver{Store: r.store})
 	r.didResolver.Register(didweb.MethodName, didweb.NewResolver())
+	r.didResolver.Register(didjwk.MethodName, didjwk.NewResolver())
 
 	// Initiate the routines for auto-updating the data.
 	r.networkAmbassador.Configure()

vdr/vdr_test.go

@@ -20,8 +20,13 @@ package vdr
 
 import (
 	"context"
+	"crypto/ecdsa"
+	"crypto/elliptic"
+	"crypto/rand"
+	"encoding/base64"
 	"encoding/json"
 	"errors"
+	"github.com/lestrrat-go/jwx/jwk"
 	"github.com/nuts-foundation/nuts-node/audit"
 	"github.com/nuts-foundation/nuts-node/core"
 	"github.com/nuts-foundation/nuts-node/vdr/didnuts"
@@ -522,6 +527,29 @@ func TestVDR_Configure(t *testing.T) {
 		assert.NotNil(t, doc)
 		assert.NotNil(t, md)
 	})
+	t.Run("it can resolve using did:jwk", func(t *testing.T) {
+		privateKey, _ := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
+		expectedJWK, err := jwk.New(privateKey.Public())
+		require.NoError(t, err)
+
+		jwkBytes, _ := json.Marshal(expectedJWK)
+		inputDIDString := "did:jwk:" + base64.URLEncoding.EncodeToString(jwkBytes)
+		inputDID, err := did.ParseDID(inputDIDString)
+		require.NoError(t, err)
+
+		instance := NewVDR(nil, nil, nil, nil)
+		err = instance.Configure(core.ServerConfig{})
+		require.NoError(t, err)
+
+		doc, md, err := instance.Resolver().Resolve(*inputDID, nil)
+
+		assert.NoError(t, err)
+		assert.NotNil(t, doc)
+		assert.NotNil(t, md)
+		// Basic assertion on the actual key
+		require.Len(t, doc.VerificationMethod, 1)
+		assert.Equal(t, "P-256", doc.VerificationMethod[0].PublicKeyJwk["crv"])
+	})
 }
 
 type roundTripperFunc func(*http.Request) (*http.Response, error)