Skip to content
This repository has been archived by the owner on Mar 27, 2024. It is now read-only.

Commit

Permalink
Merge branch 'main' into cl-crypto-srv
Browse files Browse the repository at this point in the history
  • Loading branch information
@sudeshrshetty
sudeshrshetty committed Aug 18, 2022
2 parents a56c6a7 + 5e75e60 commit 22c7c76
Show file tree
Hide file tree
Showing 60 changed files with 793 additions and 660 deletions.
67 changes: 49 additions & 18 deletions pkg/client/didexchange/client_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ import (
mockprovider "github.com/hyperledger/aries-framework-go/pkg/mock/provider"
mockstore "github.com/hyperledger/aries-framework-go/pkg/mock/storage"
mockvdr "github.com/hyperledger/aries-framework-go/pkg/mock/vdr"
"github.com/hyperledger/aries-framework-go/pkg/secretlock"
"github.com/hyperledger/aries-framework-go/pkg/secretlock/noop"
"github.com/hyperledger/aries-framework-go/pkg/store/connection"
"github.com/hyperledger/aries-framework-go/pkg/vdr/peer"
Expand Down Expand Up @@ -182,7 +183,9 @@ func TestClient_CreateInvitation(t *testing.T) {
require.NoError(t, err)
require.NotNil(t, svc)

store := mockstore.NewMockStoreProvider()
store, err := kms.NewAriesProviderWrapper(mockstore.NewMockStoreProvider())
require.NoError(t, err)

km := newKMS(t, store)

c, err := New(&mockprovider.Provider{
Expand Down Expand Up @@ -217,7 +220,9 @@ func TestClient_CreateInvitation(t *testing.T) {
require.NoError(t, err)
require.NotNil(t, svc)

store := mockstore.NewMockStoreProvider()
store, err := kms.NewAriesProviderWrapper(mockstore.NewMockStoreProvider())
require.NoError(t, err)

km := newKMS(t, store)

c, err := New(&mockprovider.Provider{
Expand Down Expand Up @@ -1206,11 +1211,16 @@ func TestClient_QueryConnectionsByParams(t *testing.T) { // nolint: gocyclo

func TestServiceEvents(t *testing.T) {
protocolStateStore := mockstore.NewMockStoreProvider()
store := mockstore.NewMockStoreProvider()
km := newKMS(t, store)
ariesStore := mockstore.NewMockStoreProvider()
kmsStore, err := kms.NewAriesProviderWrapper(ariesStore)
require.NoError(t, err)

km := newKMS(t, kmsStore)

didExSvc, err := didexchange.New(&mockprotocol.MockProvider{
ProtocolStateStoreProvider: protocolStateStore,
StoreProvider: store,
StoreProvider: ariesStore,
KMSStore: kmsStore,
ServiceMap: map[string]interface{}{
mediator.Coordination: &mockroute.MockMediatorSvc{},
},
Expand All @@ -1223,7 +1233,7 @@ func TestServiceEvents(t *testing.T) {
// create the client
c, err := New(&mockprovider.Provider{
ProtocolStateStorageProviderValue: protocolStateStore,
StorageProviderValue: store,
StorageProviderValue: ariesStore,
ServiceMap: map[string]interface{}{
didexchange.DIDExchange: didExSvc,
mediator.Coordination: &mockroute.MockMediatorSvc{},
Expand Down Expand Up @@ -1303,10 +1313,14 @@ func TestServiceEvents(t *testing.T) {
}

func TestAcceptExchangeRequest(t *testing.T) {
store := mockstore.NewMockStoreProvider()
km := newKMS(t, store)
ariesStore := mockstore.NewMockStoreProvider()
kmsStore, err := kms.NewAriesProviderWrapper(ariesStore)
require.NoError(t, err)

km := newKMS(t, kmsStore)
didExSvc, err := didexchange.New(&mockprotocol.MockProvider{
StoreProvider: store,
StoreProvider: ariesStore,
KMSStore: kmsStore,
ServiceMap: map[string]interface{}{
mediator.Coordination: &mockroute.MockMediatorSvc{},
},
Expand All @@ -1319,7 +1333,7 @@ func TestAcceptExchangeRequest(t *testing.T) {
// create the client
c, err := New(&mockprovider.Provider{
ProtocolStateStorageProviderValue: mockstore.NewMockStoreProvider(),
StorageProviderValue: store,
StorageProviderValue: ariesStore,
ServiceMap: map[string]interface{}{
didexchange.DIDExchange: didExSvc,
mediator.Coordination: &mockroute.MockMediatorSvc{},
Expand Down Expand Up @@ -1401,10 +1415,14 @@ func TestAcceptExchangeRequest(t *testing.T) {
}

func TestAcceptInvitation(t *testing.T) {
store := mockstore.NewMockStoreProvider()
km := newKMS(t, store)
ariesStore := mockstore.NewMockStoreProvider()
kmsStore, err := kms.NewAriesProviderWrapper(ariesStore)
require.NoError(t, err)

km := newKMS(t, kmsStore)
didExSvc, err := didexchange.New(&mockprotocol.MockProvider{
StoreProvider: store,
StoreProvider: ariesStore,
KMSStore: kmsStore,
ServiceMap: map[string]interface{}{
mediator.Coordination: &mockroute.MockMediatorSvc{},
},
Expand All @@ -1417,7 +1435,7 @@ func TestAcceptInvitation(t *testing.T) {
// create the client
c, err := New(&mockprovider.Provider{
ProtocolStateStorageProviderValue: mockstore.NewMockStoreProvider(),
StorageProviderValue: store,
StorageProviderValue: ariesStore,
ServiceMap: map[string]interface{}{
didexchange.DIDExchange: didExSvc,
mediator.Coordination: &mockroute.MockMediatorSvc{},
Expand Down Expand Up @@ -1532,12 +1550,25 @@ func getSigningKey() did.VerificationMethod {
return did.VerificationMethod{Value: pub[:], Type: "Ed25519VerificationKey2018"}
}

func newKMS(t *testing.T, store spi.Provider) kms.KeyManager {
type mockKMSProvider struct {
kmsStore kms.Store
secretLockService secretlock.Service
}

func (m *mockKMSProvider) StorageProvider() kms.Store {
return m.kmsStore
}

func (m *mockKMSProvider) SecretLock() secretlock.Service {
return m.secretLockService
}

func newKMS(t *testing.T, store kms.Store) kms.KeyManager {
t.Helper()

kmsProv := &mockprotocol.MockProvider{
StoreProvider: store,
CustomLock: &noop.NoLock{},
kmsProv := &mockKMSProvider{
kmsStore: store,
secretLockService: &noop.NoLock{},
}

customKMS, err := localkms.New("local-lock://primary/test/", kmsProv)
Expand Down
23 changes: 20 additions & 3 deletions pkg/client/legacyconnection/client_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import (
mockprovider "github.com/hyperledger/aries-framework-go/pkg/mock/provider"
mockstore "github.com/hyperledger/aries-framework-go/pkg/mock/storage"
mockvdr "github.com/hyperledger/aries-framework-go/pkg/mock/vdr"
"github.com/hyperledger/aries-framework-go/pkg/secretlock"
"github.com/hyperledger/aries-framework-go/pkg/secretlock/noop"
"github.com/hyperledger/aries-framework-go/pkg/store/connection"
"github.com/hyperledger/aries-framework-go/pkg/vdr/peer"
Expand Down Expand Up @@ -1435,12 +1436,28 @@ func getSigningKey() did.VerificationMethod {
return did.VerificationMethod{Value: pub[:], Type: "Ed25519VerificationKey2018"}
}

type kmsProvider struct {
store kms.Store
secretLockService secretlock.Service
}

func (k *kmsProvider) StorageProvider() kms.Store {
return k.store
}

func (k *kmsProvider) SecretLock() secretlock.Service {
return k.secretLockService
}

func newKMS(t *testing.T, store spi.Provider) kms.KeyManager {
t.Helper()

kmsProv := &mockprotocol.MockProvider{
StoreProvider: store,
CustomLock: &noop.NoLock{},
kmsStore, err := kms.NewAriesProviderWrapper(store)
require.NoError(t, err)

kmsProv := &kmsProvider{
store: kmsStore,
secretLockService: &noop.NoLock{},
}

customKMS, err := localkms.New("local-lock://primary/test/", kmsProv)
Expand Down
25 changes: 23 additions & 2 deletions pkg/controller/command/connection/command_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
mockprovider "github.com/hyperledger/aries-framework-go/pkg/mock/provider"
mockstore "github.com/hyperledger/aries-framework-go/pkg/mock/storage"
mockvdr "github.com/hyperledger/aries-framework-go/pkg/mock/vdr"
"github.com/hyperledger/aries-framework-go/pkg/secretlock"
"github.com/hyperledger/aries-framework-go/pkg/secretlock/noop"
"github.com/hyperledger/aries-framework-go/pkg/store/connection"
didstore "github.com/hyperledger/aries-framework-go/pkg/store/did"
Expand Down Expand Up @@ -279,6 +280,19 @@ func TestCommand_SetConnectionToDIDCommV2(t *testing.T) {
})
}

type kmsProvider struct {
storageProvider kms.Store
secretLock secretlock.Service
}

func (k kmsProvider) StorageProvider() kms.Store {
return k.storageProvider
}

func (k kmsProvider) SecretLock() secretlock.Service {
return k.secretLock
}

func TestCommand_RotateDID(t *testing.T) {
t.Parallel()

Expand Down Expand Up @@ -327,9 +341,16 @@ func TestCommand_RotateDID(t *testing.T) {
require.NoError(t, err)

prov.VDRegistryValue = vdr.New(vdr.WithVDR(peerVDR))
prov.SecretLockValue = &noop.NoLock{}

prov.KMSValue, err = localkms.New("foo://bar", prov)
kmsStore, err := kms.NewAriesProviderWrapper(prov.StorageProviderValue)
require.NoError(t, err)

kmsProvider := &kmsProvider{
storageProvider: kmsStore,
secretLock: &noop.NoLock{},
}

prov.KMSValue, err = localkms.New("foo://bar", kmsProvider)
require.NoError(t, err)

connStore, err := connection.NewRecorder(prov)
Expand Down
23 changes: 20 additions & 3 deletions pkg/controller/command/didexchange/command_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ import (
mockprovider "github.com/hyperledger/aries-framework-go/pkg/mock/provider"
mockstore "github.com/hyperledger/aries-framework-go/pkg/mock/storage"
mockvdr "github.com/hyperledger/aries-framework-go/pkg/mock/vdr"
"github.com/hyperledger/aries-framework-go/pkg/secretlock"
"github.com/hyperledger/aries-framework-go/pkg/secretlock/noop"
"github.com/hyperledger/aries-framework-go/pkg/store/connection"
"github.com/hyperledger/aries-framework-go/pkg/vdr/peer"
Expand Down Expand Up @@ -1016,12 +1017,28 @@ func toBytes(t *testing.T, v interface{}) []byte {
return bits
}

type kmsProvider struct {
store kms.Store
secretLockService secretlock.Service
}

func (k *kmsProvider) StorageProvider() kms.Store {
return k.store
}

func (k *kmsProvider) SecretLock() secretlock.Service {
return k.secretLockService
}

func newKMS(t *testing.T, store spi.Provider) kms.KeyManager {
t.Helper()

kmsProv := &protocol.MockProvider{
StoreProvider: store,
CustomLock: &noop.NoLock{},
kmsStore, err := kms.NewAriesProviderWrapper(store)
require.NoError(t, err)

kmsProv := &kmsProvider{
store: kmsStore,
secretLockService: &noop.NoLock{},
}

customKMS, err := localkms.New("local-lock://primary/test/", kmsProv)
Expand Down
23 changes: 20 additions & 3 deletions pkg/controller/command/legacyconnection/command_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ import (
mockprovider "github.com/hyperledger/aries-framework-go/pkg/mock/provider"
mockstore "github.com/hyperledger/aries-framework-go/pkg/mock/storage"
mockvdr "github.com/hyperledger/aries-framework-go/pkg/mock/vdr"
"github.com/hyperledger/aries-framework-go/pkg/secretlock"
"github.com/hyperledger/aries-framework-go/pkg/secretlock/noop"
"github.com/hyperledger/aries-framework-go/pkg/store/connection"
"github.com/hyperledger/aries-framework-go/pkg/vdr/peer"
Expand Down Expand Up @@ -1017,12 +1018,28 @@ func toBytes(t *testing.T, v interface{}) []byte {
return bits
}

type kmsProvider struct {
store kms.Store
secretLockService secretlock.Service
}

func (k *kmsProvider) StorageProvider() kms.Store {
return k.store
}

func (k *kmsProvider) SecretLock() secretlock.Service {
return k.secretLockService
}

func newKMS(t *testing.T, store spi.Provider) kms.KeyManager {
t.Helper()

kmsProv := &protocol.MockProvider{
StoreProvider: store,
CustomLock: &noop.NoLock{},
kmsStore, err := kms.NewAriesProviderWrapper(store)
require.NoError(t, err)

kmsProv := &kmsProvider{
store: kmsStore,
secretLockService: &noop.NoLock{},
}

customKMS, err := localkms.New("local-lock://primary/test/", kmsProv)
Expand Down
36 changes: 19 additions & 17 deletions pkg/crypto/tinkcrypto/withkms_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,21 @@ import (
mockstorage "github.com/hyperledger/aries-framework-go/pkg/mock/storage"
"github.com/hyperledger/aries-framework-go/pkg/secretlock"
"github.com/hyperledger/aries-framework-go/pkg/secretlock/noop"
"github.com/hyperledger/aries-framework-go/spi/storage"
)

type kmsProvider struct {
store kms.Store
secretLockService secretlock.Service
}

func (k *kmsProvider) StorageProvider() kms.Store {
return k.store
}

func (k *kmsProvider) SecretLock() secretlock.Service {
return k.secretLockService
}

func TestSignVerifyKeyTypes(t *testing.T) {
testCases := []struct {
name string
Expand All @@ -44,9 +56,12 @@ func TestSignVerifyKeyTypes(t *testing.T) {

for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
kmsStorage, err := localkms.New("local-lock://test/master/key/", &mockProvider{
storeProvider: mockstorage.NewMockStoreProvider(),
secretLock: &noop.NoLock{},
kmsStore, err := kms.NewAriesProviderWrapper(mockstorage.NewMockStoreProvider())
require.NoError(t, err)

kmsStorage, err := localkms.New("local-lock://test/master/key/", &kmsProvider{
store: kmsStore,
secretLockService: &noop.NoLock{},
})
require.NoError(t, err)

Expand Down Expand Up @@ -77,16 +92,3 @@ func TestSignVerifyKeyTypes(t *testing.T) {
})
}
}

type mockProvider struct {
storeProvider storage.Provider
secretLock secretlock.Service
}

func (m *mockProvider) StorageProvider() storage.Provider {
return m.storeProvider
}

func (m *mockProvider) SecretLock() secretlock.Service {
return m.secretLock
}
22 changes: 19 additions & 3 deletions pkg/didcomm/common/middleware/middleware_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1052,12 +1052,28 @@ func TestDIDRotator_verifyJWSAndPayload(t *testing.T) {
})
}

type kmsProvider struct {
kmsStore kms.Store
secretLockService secretlock.Service
}

func (k *kmsProvider) StorageProvider() kms.Store {
return k.kmsStore
}

func (k *kmsProvider) SecretLock() secretlock.Service {
return k.secretLockService
}

func createMockProvider(t *testing.T) *mockProvider {
t.Helper()

kmsStorage, err := localkms.New("local-lock://test/master/key/", &mockProvider{
storeProvider: mockstorage.NewMockStoreProvider(),
secretLock: &noop.NoLock{},
kmsStore, err := kms.NewAriesProviderWrapper(mockstorage.NewMockStoreProvider())
require.NoError(t, err)

kmsStorage, err := localkms.New("local-lock://test/master/key/", &kmsProvider{
kmsStore: kmsStore,
secretLockService: &noop.NoLock{},
})
require.NoError(t, err)

Expand Down
Loading

0 comments on commit 22c7c76

Please sign in to comment.