Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion e2e-tests/browser/chrome.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,15 @@ package browser
import (
"context"
"github.com/chromedp/chromedp"
"github.com/chromedp/chromedp/remote"
)

func NewChrome(headless bool) (context.Context, context.CancelFunc) {
var execCtx context.Context
var execCtxCancel context.CancelFunc
if headless {
// TODO: Fix acceptInsecureCerts for headless
execCtx, execCtxCancel = chromedp.NewRemoteAllocator(context.Background(), "http://localhost:9222")
execCtx, execCtxCancel = remote.NewAllocator(context.Background(), "http://localhost:9222")
} else {
options := append(chromedp.DefaultExecAllocatorOptions[:],
chromedp.Flag("headless", false),
Expand Down
4 changes: 2 additions & 2 deletions e2e-tests/browser/openid4vp_employeecredential/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ func Test_UserAccessToken_EmployeeCredential(t *testing.T) {

subjectVerifier, _, openid4vpClientA := setupNode(t, ctx, nodeAClientConfig)
subjectRequester, didRequester, openid4vpClientB := setupNode(t, ctx, nodeBClientConfig)
err := chromedp.Run(ctx, chromedp.Navigate("about:blank"))
err := chromedp.Do(ctx, chromedp.Navigate("about:blank"))
require.NoError(t, err)
// Request an access token with user from verifying organization
userDetails := iamAPI.UserDetails{
Expand All @@ -72,7 +72,7 @@ func Test_UserAccessToken_EmployeeCredential(t *testing.T) {
redirectSession, err := openid4vpClientB.RequesterUserAccessToken(subjectRequester, subjectVerifier, userDetails, oauth2Scope)
require.NoError(t, err)
// Navigate browser to redirect URL, which performs the OAuth2 authorization code flow
err = chromedp.Run(ctx, chromedp.Navigate(redirectSession.RedirectUri))
err = chromedp.Do(ctx, chromedp.Navigate(redirectSession.RedirectUri))
require.NoError(t, err)
// The browser was now successfully redirected back to the redirect URI (actually the node's public / URL),
// indicating the flow was successful. We can now retrieve the access token.
Expand Down
35 changes: 21 additions & 14 deletions e2e-tests/browser/rfc019_selfsigned/apps/selfsigned.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,23 +58,30 @@ func (s SelfSigned) Start(organizationDID string, employee EmployeeInfo) (*SelfS
return nil, err
}
result := SelfSignedSession{ID: sessionID}
err = chromedp.Run(s.Context,
chromedp.Navigate(webURL),
chromedp.Text("#contract", &result.Contract),
chromedp.Text("#employee-identifier", &result.EmployeeIdentifier),
chromedp.Text("#employee-name", &result.EmployeeName),
chromedp.Text("#employee-role", &result.EmployeeRole),
)
return &result, err
if err = chromedp.Do(s.Context, chromedp.Navigate(webURL)); err != nil {
return &result, err
}
for _, field := range []struct {
selector string
target *string
}{
{"#contract", &result.Contract},
{"#employee-identifier", &result.EmployeeIdentifier},
{"#employee-name", &result.EmployeeName},
{"#employee-role", &result.EmployeeRole},
} {
if *field.target, err = chromedp.Run(s.Context, chromedp.Text(field.selector)); err != nil {
return &result, err
}
}
return &result, nil
}

func (s SelfSigned) Accept() (string, error) {
var text string
err := chromedp.Run(s.Context,
chromedp.Click("#accept-button"),
chromedp.Text("//main", &text),
)
return text, err
if err := chromedp.Do(s.Context, chromedp.Click("#accept-button")); err != nil {
return "", err
}
return chromedp.Run(s.Context, chromedp.Text("//main"))
}

func (s SelfSigned) GetSessionStatus(sessionID string) (string, *authAPI.VerifiablePresentation, error) {
Expand Down
92 changes: 46 additions & 46 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ module github.com/nuts-foundation/nuts-node/v6
go 1.27.2

require (
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.23.2
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.23.3
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.14.1
github.com/PaesslerAG/jsonpath v0.1.2-0.20230323094847-3484786d6f97
github.com/alicebob/miniredis/v2 v2.39.0
github.com/avast/retry-go/v4 v4.7.0
github.com/cbroglie/mustache v1.4.2
github.com/chromedp/chromedp v0.16.0
github.com/chromedp/chromedp v0.20.1
github.com/dlclark/regexp2 v1.12.0
github.com/go-redis/redismock/v9 v9.2.0
github.com/goodsign/monday v1.0.2
Expand All @@ -22,7 +22,7 @@ require (
github.com/knadh/koanf/providers/file v1.2.1
github.com/knadh/koanf/providers/posflag v1.0.2
github.com/knadh/koanf/providers/structs v1.0.1
github.com/knadh/koanf/v2 v2.3.7
github.com/knadh/koanf/v2 v2.3.8
github.com/labstack/echo/v4 v4.16.0
github.com/mdp/qrterminal/v3 v3.2.1
github.com/mr-tron/base58 v1.3.0
Expand All @@ -36,18 +36,18 @@ require (
github.com/nuts-foundation/sqlite v1.0.0
// check the oapi-codegen tool version in the makefile when upgrading the runtime
github.com/oapi-codegen/runtime v1.7.0
github.com/piprate/json-gold v0.8.0
github.com/piprate/json-gold v0.9.1
github.com/pressly/goose/v3 v3.28.0
github.com/privacybydesign/irmago v0.19.2
github.com/prometheus/client_golang v1.24.1
github.com/prometheus/client_golang v1.25.0
github.com/prometheus/client_model v0.6.3
github.com/redis/go-redis/v9 v9.22.0
github.com/redis/go-redis/v9 v9.23.0
github.com/santhosh-tekuri/jsonschema v1.2.4
github.com/sirupsen/logrus v1.10.2
github.com/spf13/cobra v1.10.2
github.com/spf13/pflag v1.0.10
github.com/stretchr/testify v1.12.1
github.com/twmb/murmur3 v1.2.0
github.com/twmb/murmur3 v1.2.1
go.etcd.io/bbolt v1.5.0
go.uber.org/atomic v1.12.0
go.uber.org/goleak v1.3.0
Expand All @@ -66,7 +66,7 @@ require (

require (
filippo.io/edwards25519 v1.2.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v1.12.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v1.13.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.5.0
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.2.0 // indirect
github.com/AzureAD/microsoft-authentication-library-for-go v1.9.0 // indirect
Expand All @@ -82,8 +82,7 @@ require (
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/cespare/xxhash v1.1.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/chromedp/cdproto v0.0.0-20260714215040-dc233986426f // indirect
github.com/chromedp/sysutil v1.1.0 // indirect
github.com/chromedp/cdproto v0.157.8 // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.1
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
Expand All @@ -100,9 +99,6 @@ require (
github.com/go-redsync/redsync/v4 v4.16.0 // indirect
github.com/go-sql-driver/mysql v1.10.0 // indirect
github.com/go-viper/mapstructure/v2 v2.5.0 // indirect
github.com/gobwas/httphead v0.1.0 // indirect
github.com/gobwas/pool v0.2.1 // indirect
github.com/gobwas/ws v1.4.0 // indirect
github.com/goccy/go-json v0.10.6 // indirect
github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
github.com/golang-jwt/jwt/v5 v5.3.1 // indirect
Expand All @@ -124,7 +120,7 @@ require (
github.com/jackc/puddle/v2 v2.2.2 // indirect
github.com/jinzhu/inflection v1.0.0 // indirect
github.com/jinzhu/now v1.1.5 // indirect
github.com/klauspost/compress v1.20.0 // indirect
github.com/klauspost/compress v1.20.1 // indirect
github.com/knadh/koanf/maps v0.1.2 // indirect
github.com/kylelemons/godebug v1.1.0 // indirect
github.com/labstack/gommon v0.5.0 // indirect
Expand Down Expand Up @@ -155,7 +151,7 @@ require (
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
github.com/pquerna/cachecontrol v0.2.0
github.com/privacybydesign/gabi v0.0.0-20221212095008-68a086907750 // indirect
github.com/prometheus/common v0.70.1 // indirect
github.com/prometheus/common v0.72.0 // indirect
github.com/prometheus/procfs v0.22.0 // indirect
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
github.com/robfig/cron/v3 v3.0.1 // indirect
Expand Down Expand Up @@ -183,7 +179,7 @@ require (
golang.org/x/sys v0.48.0 // indirect
golang.org/x/term v0.46.0 // indirect
golang.org/x/text v0.42.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20260831171406-18b4a7587f8a // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20260928230214-8a89bd6388cc // indirect
gopkg.in/Regis24GmbH/go-diacritics.v2 v2.0.3 // indirect
gorm.io/gorm v1.31.2
modernc.org/mathutil v1.7.1 // indirect
Expand All @@ -194,67 +190,71 @@ require (

require (
code.dny.dev/ssrf v0.3.0
github.com/aws/aws-sdk-go-v2 v1.47.1
github.com/aws/aws-sdk-go-v2/config v1.33.6
github.com/aws/aws-sdk-go-v2/feature/rds/auth v1.7.4
github.com/aws/aws-sdk-go-v2 v1.47.2
github.com/aws/aws-sdk-go-v2/config v1.33.8
github.com/aws/aws-sdk-go-v2/feature/rds/auth v1.7.5
github.com/bradfitz/gomemcache v0.0.0-20250403215159-8d39553ac7cf
github.com/chromedp/chromedp/remote v0.2.0
github.com/daangn/minimemcached v1.2.1
github.com/eko/gocache/lib/v4 v4.4.0
github.com/eko/gocache/store/go_cache/v4 v4.2.10
github.com/eko/gocache/store/memcache/v4 v4.2.10
github.com/eko/gocache/store/redis/v4 v4.2.12
github.com/lestrrat-go/jwx/v3 v3.3.0
github.com/patrickmn/go-cache v2.1.0+incompatible
github.com/uptrace/opentelemetry-go-extra/otelgorm v0.3.2
go.opentelemetry.io/contrib/bridges/otellogrus v0.20.1
github.com/uptrace/opentelemetry-go-extra/otelgorm v0.4.0
go.opentelemetry.io/contrib/bridges/otellogrus v0.21.0
go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho v0.71.0
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.71.0
go.opentelemetry.io/otel v1.46.0
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.22.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.46.0
go.opentelemetry.io/otel/sdk v1.46.0
go.opentelemetry.io/otel/sdk/log v0.22.0
go.opentelemetry.io/otel/trace v1.46.0
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.72.0
go.opentelemetry.io/otel v1.47.0
go.opentelemetry.io/otel/exporters/otlp/otlplog/otlploghttp v0.23.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.47.0
go.opentelemetry.io/otel/sdk v1.47.0
go.opentelemetry.io/otel/sdk/log v1.47.0
go.opentelemetry.io/otel/trace v1.47.0
)

require (
github.com/antithesishq/antithesis-sdk-go v0.8.0-default-no-op // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.20.6 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.20.1 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.5.4 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.8.4 // indirect
github.com/aws/aws-sdk-go-v2/internal/v4a v1.5.4 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.19 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.14.4 // indirect
github.com/aws/aws-sdk-go-v2/service/signin v1.10.1 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.38.1 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.43.1 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.51.1 // indirect
github.com/aws/smithy-go v1.28.1 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.20.8 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.20.2 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.5.5 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.8.5 // indirect
github.com/aws/aws-sdk-go-v2/internal/v4a v1.5.5 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.20 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.14.5 // indirect
github.com/aws/aws-sdk-go-v2/service/signin v1.10.3 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.38.3 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.43.3 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.51.3 // indirect
github.com/aws/smithy-go v1.28.4 // indirect
github.com/benbjohnson/clock v1.3.0 // indirect
github.com/cayleygraph/quad v1.3.0 // indirect
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
github.com/felixge/httpsnoop v1.1.0 // indirect
github.com/go-json-experiment/json v0.0.0-20260623181947-01eb4420fa68 // indirect
github.com/go-logr/logr v1.4.4 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/gobwas/httphead v0.1.0 // indirect
github.com/gobwas/pool v0.2.1 // indirect
github.com/gobwas/ws v1.4.0 // indirect
github.com/google/go-tpm v0.9.8 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.30.0 // indirect
github.com/klauspost/cpuid/v2 v2.2.10 // indirect
github.com/klauspost/cpuid/v2 v2.4.0 // indirect
github.com/lestrrat-go/dsig v1.4.0 // indirect
github.com/lestrrat-go/dsig-secp256k1 v1.0.0 // indirect
github.com/lestrrat-go/httprc/v3 v3.0.6 // indirect
github.com/lestrrat-go/option/v2 v2.0.0 // indirect
github.com/rs/zerolog v1.26.1 // indirect
github.com/uptrace/opentelemetry-go-extra/otelsql v0.3.2 // indirect
github.com/uptrace/opentelemetry-go-extra/otelsql v0.4.0 // indirect
github.com/valyala/fastjson v1.6.10 // indirect
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.46.0 // indirect
go.opentelemetry.io/otel/log v0.22.0 // indirect
go.opentelemetry.io/otel/metric v1.46.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.47.0 // indirect
go.opentelemetry.io/otel/log v1.47.0 // indirect
go.opentelemetry.io/otel/metric v1.47.0 // indirect
go.opentelemetry.io/proto/otlp v1.11.0 // indirect
go.yaml.in/yaml/v3 v3.0.5 // indirect
golang.org/x/exp v0.0.0-20260824195058-e88cd73687aa // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20260819154853-08b0e4226688 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20260928230214-8a89bd6388cc // indirect
modernc.org/libc v1.77.1 // indirect
)
Loading
Loading