M2m

.github/workflows/test.yaml

@@ -13,7 +13,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.18
+          go-version: 1.21
 
       - name: Install coveralls dependencies
         run: |

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.19-alpine AS build
+FROM golang:1.21-alpine AS build
 
 WORKDIR /go/src/app
 COPY ./ ./
@@ -8,9 +8,10 @@ RUN apk add build-base
 RUN go get -d -v ./...
 RUN go build -v .
 
-FROM golang:1.19-alpine
+FROM golang:1.21-alpine
 
 WORKDIR /go/src/app
+
 COPY --from=build /go/src/app/views /go/src/app/views
 COPY --from=build /go/src/app/VCVerifier /go/src/app/VCVerifier
 COPY --from=build /go/src/app/server.yaml /go/src/app/server.yaml

common/clock.go

@@ -0,0 +1,13 @@
+package common
+
+import "time"
+
+type Clock interface {
+	Now() time.Time
+}
+
+type RealClock struct{}
+
+func (RealClock) Now() time.Time {
+	return time.Now()
+}

common/metadata.go

@@ -0,0 +1,21 @@
+package common
+
+const TYPE_CODE = "authorization_code"
+const TYPE_VP_TOKEN = "vp_token"
+
+type OpenIDProviderMetadata struct {
+	Issuer                                 string   `json:"issuer"`
+	AuthorizationEndpoint                  string   `json:"authorization_endpoint"`
+	TokenEndpoint                          string   `json:"token_endpoint"`
+	PresentationDefinitionEndpoint         string   `json:"presentation_definition_endpoint,omitempty"`
+	JwksUri                                string   `json:"jwks_uri"`
+	ScopesSupported                        []string `json:"scopes_supported"`
+	ResponseTypesSupported                 []string `json:"response_types_supported"`
+	ResponseModeSupported                  []string `json:"response_mode_supported,omitempty"`
+	GrantTypesSupported                    []string `json:"grant_types_supported,omitempty"`
+	SubjectTypesSupported                  []string `json:"subject_types_supported"`
+	IdTokenSigningAlgValuesSupported       []string `json:"id_token_signing_alg_values_supported"`
+	RequestObjectSigningAlgValuesSupported []string `json:"request_object_signing_alg_values_supported,omitempty"`
+	RequestParameterSupported              bool     `json:"request_parameter_supported,omitempty"`
+	TokenEndpointAuthMethodsSupported      []string `json:"token_endpoint_auth_methods_supported,omitempty"`
+}

common/tokenSigner.go

@@ -0,0 +1,16 @@
+package common
+
+import (
+	"github.com/lestrrat-go/jwx/jwa"
+	"github.com/lestrrat-go/jwx/jwt"
+)
+
+type TokenSigner interface {
+	Sign(t jwt.Token, alg jwa.SignatureAlgorithm, key interface{}, options ...jwt.SignOption) ([]byte, error)
+}
+
+type JwtTokenSigner struct{}
+
+func (JwtTokenSigner) Sign(t jwt.Token, alg jwa.SignatureAlgorithm, key interface{}, options ...jwt.SignOption) ([]byte, error) {
+	return jwt.Sign(t, alg, key, options...)
+}

config/config.go

@@ -9,6 +9,7 @@ type Configuration struct {
 	SSIKit     SSIKit     `mapstructure:"ssiKit"`
 	Logging    Logging    `mapstructure:"logging"`
 	ConfigRepo ConfigRepo `mapstructure:"configRepo"`
+	M2M        M2M        `mapstructure:"m2m"`
 }
 
 // configuration to be used by the ssiKit configuration
@@ -19,6 +20,8 @@ type SSIKit struct {
 
 // general configuration to run the application
 type Server struct {
+	// host name of the verifier
+	Host string `mapstructure:"host"`
 	// port to bind the server
 	Port int `mapstructure:"port" default:"8080"`
 	// directory to read the template(s) from
@@ -27,6 +30,24 @@ type Server struct {
 	StaticDir string `mapstructure:"staticDir" default:"views/static/"`
 }
 
+// configuration for M2M interaction
+type M2M struct {
+	// auth enabled for M2M interactions
+	AuthEnabled bool `mapstructure:"authEnabled"`
+	// path to the signing key(in pem format)
+	KeyPath string `mapstructure:"keyPath"`
+	// path to the credential to be used for auth
+	CredentialPath string `mapstructure:"credentialPath"`
+	// id of the verifier when retrieving tokens
+	ClientId string `mapstructure:"clientId"`
+	// verification method to be provided for the ld-proof
+	VerificationMethod string `mapstructure:"verificationMethod" default:"JsonWebKey2020"`
+	// signature type to be provided for the ld-proof
+	SignatureType string `mapstructure:"signatureType" default:"JsonWebSignature2020"`
+	// type of the provided key
+	KeyType string `mapstructure:"keyType" default:"RSAPS256"`
+}
+
 // logging config
 type Logging struct {
 	// loglevel to be used - can be DEBUG, INFO, WARN or ERROR

config/data/config_test.yaml

@@ -25,6 +25,8 @@ verifier:
 ssiKit:
   auditorURL: http://waltid:7003
 
+m2m: 
+  authEnabled: false
 configRepo:
   services: 
     - id: testService

config/provider_test.go

@@ -59,8 +59,8 @@ func Test_ReadConfig(t *testing.T) {
 							Id:               "testService",
 							DefaultOidcScope: "someScope",
 							ServiceScopes: map[string][]Credential{
-								"someScope": []Credential{
-									Credential{
+								"someScope": {
+									{
 										Type:                     "VerifiableCredential",
 										TrustedParticipantsLists: []string{"https://tir-pdc.gaia-x.fiware.dev"},
 										TrustedIssuersLists:      []string{"https://til-pdc.gaia-x.fiware.dev"},
@@ -70,6 +70,7 @@ func Test_ReadConfig(t *testing.T) {
 						},
 					},
 				},
+				M2M: M2M{AuthEnabled: false, VerificationMethod: "JsonWebKey2020", SignatureType: "JsonWebSignature2020", KeyType: "RSAPS256"},
 			},
 			false,
 		}, {
@@ -92,6 +93,7 @@ func Test_ReadConfig(t *testing.T) {
 					LogRequests: true,
 					PathsToSkip: nil,
 				},
+				M2M: M2M{AuthEnabled: false, VerificationMethod: "JsonWebKey2020", SignatureType: "JsonWebSignature2020", KeyType: "RSAPS256"},
 			},
 			false,
 		},

go.mod

@@ -1,78 +1,109 @@
 module github.com/fiware/VCVerifier
 
-go 1.19
+go 1.21
 
 require (
 	github.com/bxcodec/httpcache v1.0.0-beta.3
 	github.com/deepmap/oapi-codegen v1.12.3
 	github.com/foolin/goview v0.3.0
 	github.com/gin-contrib/cors v1.4.0
-	github.com/gin-gonic/gin v1.9.0
+	github.com/gin-gonic/gin v1.9.1
 	github.com/google/go-cmp v0.6.0
+	github.com/google/uuid v1.3.0
 	github.com/gookit/config/v2 v2.2.1
 	github.com/hellofresh/health-go/v5 v5.0.0
 	github.com/lestrrat-go/jwx v1.2.25
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/patrickmn/go-cache v2.1.0+incompatible
-	github.com/stretchr/testify v1.8.2
+	github.com/piprate/json-gold v0.5.1-0.20230111113000-6ddbe6e6f19f
+	github.com/stretchr/testify v1.8.4
+	github.com/trustbloc/did-go v1.1.0
+	github.com/trustbloc/kms-go v1.1.0
+	github.com/trustbloc/vc-go v1.1.0
 	golang.org/x/exp v0.0.0-20231006140011-7918f672742d
 )
 
 require (
+	github.com/IBM/mathlib v0.0.3-0.20231011094432-44ee0eb539da // indirect
+	github.com/VictoriaMetrics/fastcache v1.5.7 // indirect
 	github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/bits-and-blooms/bitset v1.2.0 // indirect
+	github.com/bits-and-blooms/bitset v1.7.0 // indirect
+	github.com/btcsuite/btcd/btcec/v2 v2.1.3 // indirect
+	github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce // indirect
 	github.com/bxcodec/gotcha v1.0.0-beta.8 // indirect
 	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+	github.com/consensys/bavard v0.1.13 // indirect
+	github.com/consensys/gnark-crypto v0.12.1 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
+	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
 	github.com/fatih/color v1.14.1 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.2 // indirect
+	github.com/go-jose/go-jose/v3 v3.0.1-0.20221117193127-916db76e8214 // indirect
 	github.com/goccy/go-yaml v1.10.0 // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/google/uuid v1.3.0 // indirect
+	github.com/golang/snappy v0.0.4 // indirect
+	github.com/google/tink/go v1.7.0 // indirect
 	github.com/gookit/color v1.5.2 // indirect
 	github.com/gookit/goutil v0.6.6 // indirect
+	github.com/hyperledger/fabric-amcl v0.0.0-20230602173724-9e02669dceb2 // indirect
 	github.com/imdario/mergo v0.3.13 // indirect
-	github.com/kr/pretty v0.3.1 // indirect
+	github.com/kilic/bls12-381 v0.1.1-0.20210503002446-7b7597926c69 // indirect
 	github.com/lestrrat-go/backoff/v2 v2.0.8 // indirect
-	github.com/lestrrat-go/blackmagic v1.0.1 // indirect
+	github.com/lestrrat-go/blackmagic v1.0.2 // indirect
 	github.com/lestrrat-go/httpcc v1.0.1 // indirect
 	github.com/lestrrat-go/iter v1.0.2 // indirect
 	github.com/lestrrat-go/option v1.0.1 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
+	github.com/mmcloughlin/addchain v0.4.0 // indirect
+	github.com/mr-tron/base58 v1.2.0 // indirect
+	github.com/multiformats/go-base32 v0.1.0 // indirect
+	github.com/multiformats/go-base36 v0.1.0 // indirect
+	github.com/multiformats/go-multibase v0.2.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/pquerna/cachecontrol v0.1.0 // indirect
 	github.com/prometheus/client_golang v1.14.0 // indirect
 	github.com/prometheus/client_model v0.3.0 // indirect
 	github.com/prometheus/common v0.37.0 // indirect
 	github.com/prometheus/procfs v0.8.0 // indirect
+	github.com/teserakt-io/golang-ed25519 v0.0.0-20210104091850-3888c087a4c8 // indirect
+	github.com/tidwall/gjson v1.14.3 // indirect
+	github.com/tidwall/match v1.1.1 // indirect
+	github.com/tidwall/pretty v1.2.0 // indirect
+	github.com/tidwall/sjson v1.1.4 // indirect
+	github.com/trustbloc/bbs-signature-go v1.0.1 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
+	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
+	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
+	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
 	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
 	go.opentelemetry.io/otel v1.10.0 // indirect
 	go.opentelemetry.io/otel/trace v1.10.0 // indirect
 	golang.org/x/sync v0.1.0 // indirect
-	golang.org/x/term v0.6.0 // indirect
+	golang.org/x/term v0.15.0 // indirect
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
+	rsc.io/tmplfunc v0.0.3 // indirect
 )
 
 require (
-	github.com/bytedance/sonic v1.8.5 // indirect
+	github.com/bytedance/sonic v1.9.1 // indirect
 	github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
 	github.com/fiware/dsba-pdp v0.0.0-20230215083849-cf2b4c3daacf
 	github.com/gin-contrib/sse v0.1.0 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/go-playground/validator/v10 v10.14.1 // indirect
-	github.com/goccy/go-json v0.10.1 // indirect
+	github.com/goccy/go-json v0.10.2 // indirect
+	github.com/golang-jwt/jwt/v4 v4.5.0
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
 	github.com/leodido/go-urn v1.2.4 // indirect
 	github.com/mattn/go-isatty v0.0.19 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/pelletier/go-toml/v2 v2.0.7 // indirect
+	github.com/pelletier/go-toml/v2 v2.0.8 // indirect
 	github.com/penglongli/gin-metrics v0.1.10
 	github.com/procyon-projects/chrono v1.1.2
 	github.com/sirupsen/logrus v1.9.3
@@ -81,10 +112,10 @@ require (
 	github.com/ugorji/go/codec v1.2.11 // indirect
 	github.com/valyala/fasttemplate v1.2.2
 	golang.org/x/arch v0.5.0 // indirect
-	golang.org/x/crypto v0.7.0 // indirect
-	golang.org/x/net v0.8.0 // indirect
-	golang.org/x/sys v0.13.0 // indirect
-	golang.org/x/text v0.8.0 // indirect
+	golang.org/x/crypto v0.16.0 // indirect
+	golang.org/x/net v0.10.0 // indirect
+	golang.org/x/sys v0.15.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
 	google.golang.org/protobuf v1.30.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )