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

test: refactor bdd tests to use new wallet cli #1566

Merged
merged 1 commit into from
Dec 30, 2023
Merged

test: refactor bdd tests to use new wallet cli #1566

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
9 changes: 1 addition & 8 deletions component/wallet-cli/cmd/oidc4vci_cmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ type oidc4vciCommandFlags struct {
enableTracing bool
proxyURL string
trustRegistryURL string
attestationVP string
}

func NewOIDC4VCICommand() *cobra.Command {
Expand Down Expand Up @@ -177,9 +176,7 @@ func NewOIDC4VCICommand() *cobra.Command {
oidc4vci.WithCredentialType(flags.credentialType),
oidc4vci.WithCredentialFormat(flags.credentialFormat),
oidc4vci.WithClientID(flags.clientID),
oidc4vci.WithWalletSignatureType(w.SignatureType()),
oidc4vci.WithTrustRegistryURL(flags.trustRegistryURL),
oidc4vci.WithAttestationVP(flags.attestationVP),
}

if walletInitiatedFlow {
Expand All @@ -196,10 +193,7 @@ func NewOIDC4VCICommand() *cobra.Command {
walletDIDIndex = len(w.DIDs()) - 1
}

walledDIDInfo := w.DIDs()[walletDIDIndex]

opts = append(opts, oidc4vci.WithWalletDID(walledDIDInfo.ID))
opts = append(opts, oidc4vci.WithWalletKMSKeyID(walledDIDInfo.KeyID))
opts = append(opts, oidc4vci.WithWalletDIDIndex(walletDIDIndex))

switch flags.grantType {
case authorizationCodeGrantType:
Expand Down Expand Up @@ -307,7 +301,6 @@ func NewOIDC4VCICommand() *cobra.Command {
cmd.Flags().StringVar(&flags.pin, "pin", "", "pin for pre-authorized code flow")
cmd.Flags().BoolVar(&flags.enableDiscoverableClientID, "enable-discoverable-client-id", false, "enables discoverable client id scheme for dynamic client registration")
cmd.Flags().StringVar(&flags.trustRegistryURL, "trust-registry-url", "", "if supplied, wallet will run issuer verification in trust registry")
cmd.Flags().StringVar(&flags.attestationVP, "attestation-vp", "", "wallet attestation vp in jwt format")

cmd.Flags().BoolVar(&flags.enableTracing, "enable-tracing", false, "enables http tracing")
cmd.Flags().StringVar(&flags.proxyURL, "proxy-url", "", "proxy url for http client")
Expand Down
5 changes: 3 additions & 2 deletions component/wallet-cli/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ require (
github.com/golang/mock v1.6.0
github.com/google/uuid v1.3.0
github.com/henvic/httpretty v0.1.0
github.com/jinzhu/copier v0.3.5
github.com/makiuchi-d/gozxing v0.1.1
github.com/ory/dockertest/v3 v3.9.1
github.com/piprate/json-gold v0.5.1-0.20230111113000-6ddbe6e6f19f
Expand All @@ -22,10 +23,12 @@ require (
github.com/syndtr/goleveldb v1.0.0
github.com/trustbloc/did-go v1.0.2-0.20231117120416-ed019bda587f
github.com/trustbloc/kms-go v1.0.1-0.20231116141347-14d6bea5727a
github.com/trustbloc/logutil-go v1.0.0-rc1
github.com/trustbloc/vc-go v1.0.3-0.20231117124429-a8a3b24ef734
github.com/trustbloc/vcs v0.0.0-00010101000000-000000000000
github.com/valyala/fastjson v1.6.3
go.mongodb.org/mongo-driver v1.11.4
go.uber.org/zap v1.23.0
golang.org/x/oauth2 v0.7.0
)

Expand Down Expand Up @@ -148,7 +151,6 @@ require (
github.com/tidwall/pretty v1.2.1 // indirect
github.com/tidwall/sjson v1.2.5 // indirect
github.com/trustbloc/bbs-signature-go v1.0.1 // indirect
github.com/trustbloc/logutil-go v1.0.0-rc1 // indirect
github.com/trustbloc/sidetree-go v0.0.0-20231117115139-d71ec9786d12 // indirect
github.com/valyala/bytebufferpool v1.0.0 // indirect
github.com/valyala/fasttemplate v1.2.1 // indirect
Expand All @@ -164,7 +166,6 @@ require (
go.opentelemetry.io/otel/trace v1.14.0 // indirect
go.uber.org/atomic v1.9.0 // indirect
go.uber.org/multierr v1.8.0 // indirect
go.uber.org/zap v1.23.0 // indirect
golang.org/x/crypto v0.12.0 // indirect
golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect
golang.org/x/mod v0.12.0 // indirect
Expand Down
76 changes: 38 additions & 38 deletions component/wallet-cli/pkg/oidc4vci/oidc4vci_flow.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import (
"github.com/trustbloc/did-go/doc/did"
vdrapi "github.com/trustbloc/did-go/vdr/api"
"github.com/trustbloc/kms-go/doc/jose"
"github.com/trustbloc/kms-go/spi/kms"
"github.com/trustbloc/kms-go/wrapper/api"
"github.com/trustbloc/vc-go/jwt"
"github.com/trustbloc/vc-go/presexch"
Expand All @@ -40,7 +41,6 @@ import (
"github.com/trustbloc/vcs/component/wallet-cli/pkg/wallet"
"github.com/trustbloc/vcs/component/wallet-cli/pkg/walletrunner/consent"
"github.com/trustbloc/vcs/component/wallet-cli/pkg/wellknown"
vcs "github.com/trustbloc/vcs/pkg/doc/verifiable"
kmssigner "github.com/trustbloc/vcs/pkg/kms/signer"
"github.com/trustbloc/vcs/pkg/restapi/v1/common"
issuerv1 "github.com/trustbloc/vcs/pkg/restapi/v1/issuer"
Expand Down Expand Up @@ -85,6 +85,8 @@ type Flow struct {
issuerState string
pin string
vc *verifiable.Credential
walletKeyID string
walletKeyType kms.KeyType
}

type provider interface {
Expand Down Expand Up @@ -129,10 +131,16 @@ func NewFlow(p provider, opts ...Opt) (*Flow, error) {
return nil, fmt.Errorf("issuer state not set")
}
default:
return nil, fmt.Errorf("unsupported flow type: %d", o.flowType)
return nil, fmt.Errorf("unsupported flow type: %s", o.flowType)
}

walletDID, err := did.Parse(o.walletDID)
if o.walletDIDIndex < 0 || o.walletDIDIndex >= len(p.Wallet().DIDs()) {
return nil, fmt.Errorf("invalid wallet did index: %d", o.walletDIDIndex)
}

walletDIDInfo := p.Wallet().DIDs()[o.walletDIDIndex]

walletDID, err := did.Parse(walletDIDInfo.ID)
if err != nil {
return nil, fmt.Errorf("parse wallet did: %w", err)
}
Expand All @@ -142,15 +150,17 @@ func NewFlow(p provider, opts ...Opt) (*Flow, error) {
return nil, fmt.Errorf("resolve wallet did: %w", err)
}

signer, err := p.CryptoSuite().FixedKeyMultiSigner(o.walletKMSKeyID)
signer, err := p.CryptoSuite().FixedKeyMultiSigner(walletDIDInfo.KeyID)
if err != nil {
return nil, fmt.Errorf("get signer for key %s: %w", o.walletKMSKeyID, err)
return nil, fmt.Errorf("get signer for key %s: %w", walletDIDInfo.KeyID, err)
}

signatureType := p.Wallet().SignatureType()

jwsSigner := jwssigner.NewJWSSigner(
docResolution.DIDDocument.VerificationMethod[0].ID,
string(o.walletSignatureType),
kmssigner.NewKMSSigner(signer, o.walletSignatureType, nil),
string(signatureType),
kmssigner.NewKMSSigner(signer, signatureType, nil),
)

return &Flow{
Expand All @@ -160,6 +170,8 @@ func NewFlow(p provider, opts ...Opt) (*Flow, error) {
signer: jwsSigner,
wallet: p.Wallet(),
wellKnownService: p.WellKnownService(),
walletKeyID: walletDIDInfo.KeyID,
walletKeyType: walletDIDInfo.KeyType,
flowType: o.flowType,
credentialOffer: o.credentialOffer,
credentialType: o.credentialType,
Expand All @@ -181,7 +193,7 @@ func (f *Flow) GetVC() *verifiable.Credential {
}

func (f *Flow) Run(ctx context.Context) error {
slog.Info("running OIDC4VCI flow",
slog.Info("Running OIDC4VCI flow",
"flow_type", f.flowType,
"credential_offer_uri", f.credentialOffer,
"credential_type", f.credentialType,
Expand Down Expand Up @@ -230,7 +242,7 @@ func (f *Flow) Run(ctx context.Context) error {
return fmt.Errorf("credential offer is empty")
}

slog.Info("validate issuer", "url", f.trustRegistryURL)
slog.Info("Validating issuer", "url", f.trustRegistryURL)

credentialOffer := credentialOfferResponse.Credentials[0]

Expand Down Expand Up @@ -277,12 +289,14 @@ func (f *Flow) Run(ctx context.Context) error {
return err
}

ctx = context.WithValue(ctx, oauth2.HTTPClient, f.httpClient)

token, err = f.exchangeAuthorizationCodeForAccessToken(ctx, oauthClient, authCode)
if err != nil {
return err
}
} else if f.flowType == FlowTypePreAuthorizedCode {
slog.Info("getting access token",
slog.Info("Getting access token",
"grant_type", preAuthorizedCodeGrantType,
"client_id", f.clientID,
"pre-authorized_code", preAuthorizationGrant.PreAuthorizedCode,
Expand Down Expand Up @@ -368,7 +382,7 @@ func (f *Flow) Run(ctx context.Context) error {
}

func (f *Flow) parseCredentialOfferURI(uri string) (*oidc4ci.CredentialOfferResponse, error) {
slog.Info("parsing credential offer URI",
slog.Info("Parsing credential offer URI",
"uri", uri,
)

Expand All @@ -386,7 +400,7 @@ func (f *Flow) parseCredentialOfferURI(uri string) (*oidc4ci.CredentialOfferResp
}

func (f *Flow) getAuthorizationCode(oauthClient *oauth2.Config, issuerState string) (string, error) {
slog.Info("getting authorization code",
slog.Info("Getting authorization code",
"client_id", oauthClient.ClientID,
"scopes", oauthClient.Scopes,
"redirect_uri", oauthClient.RedirectURL,
Expand Down Expand Up @@ -542,7 +556,7 @@ func (f *Flow) exchangeAuthorizationCodeForAccessToken(
oauthClient *oauth2.Config,
authCode string,
) (*oauth2.Token, error) {
slog.Info("exchanging authorization code for access token",
slog.Info("Exchanging authorization code for access token",
"grant_type", "authorization_code",
"client_id", oauthClient.ClientID,
"auth_code", authCode,
Expand Down Expand Up @@ -610,6 +624,8 @@ func (f *Flow) getAttestationVP() (string, error) {
return "", fmt.Errorf("create vp: %w", err)
}

attestationVP.ID = uuid.New().String()

claims, err := attestationVP.JWTClaims([]string{}, false)
if err != nil {
return "", fmt.Errorf("get attestation claims: %w", err)
Expand Down Expand Up @@ -638,7 +654,8 @@ func (f *Flow) getVC(
credentialIssuer string,
) (*verifiable.Credential, error) {
credentialEndpoint := wellKnown.CredentialEndpoint
slog.Info("getting credential",

slog.Info("Getting credential",
"credential_endpoint", credentialEndpoint,
"credential_issuer", credentialIssuer,
)
Expand Down Expand Up @@ -726,6 +743,10 @@ func (f *Flow) getVC(
return nil, fmt.Errorf("parse credential: %w", err)
}

slog.Info("Credential received",
"vc", string(vcBytes),
)

if err = f.handleIssuanceAck(wellKnown, &credentialResp, token); err != nil {
return nil, err
}
Expand Down Expand Up @@ -841,11 +862,8 @@ type options struct {
userPassword string
issuerState string
pin string
walletDID string
walletKMSKeyID string
walletSignatureType vcs.SignatureType
trustRegistryURL string
attestationVP string
walletDIDIndex int
}

type Opt func(opts *options)
Expand Down Expand Up @@ -922,32 +940,14 @@ func WithPin(pin string) Opt {
}
}

func WithWalletDID(walletDID string) Opt {
return func(opts *options) {
opts.walletDID = walletDID
}
}

func WithWalletKMSKeyID(keyID string) Opt {
return func(opts *options) {
opts.walletKMSKeyID = keyID
}
}

func WithWalletSignatureType(walletSignatureType vcs.SignatureType) Opt {
return func(opts *options) {
opts.walletSignatureType = walletSignatureType
}
}

func WithTrustRegistryURL(url string) Opt {
return func(opts *options) {
opts.trustRegistryURL = url
}
}

func WithAttestationVP(jwtVP string) Opt {
func WithWalletDIDIndex(idx int) Opt {
return func(opts *options) {
opts.attestationVP = jwtVP
opts.walletDIDIndex = idx
}
}
Loading
Loading