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

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: hyperledger-archives/aries-framework-go
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f2be589e047194bdfe4ff0e6f34e99c4acba9580
Choose a base ref
..
head repository: hyperledger-archives/aries-framework-go
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: c5a7638d6a818c72de08be78f7ea07cd3faf1b53
Choose a head ref
Showing with 11,812 additions and 1,311 deletions.
  1. +1 −1 .repolint.json
  2. +49 −18 pkg/client/didexchange/client_test.go
  3. +5 −2 pkg/client/didexchange/event.go
  4. +443 −0 pkg/client/legacyconnection/client.go
  5. +1,467 −0 pkg/client/legacyconnection/client_test.go
  6. +22 −0 pkg/client/legacyconnection/doc.go
  7. +14 −0 pkg/client/legacyconnection/event.go
  8. +159 −0 pkg/client/legacyconnection/example_test.go
  9. +69 −0 pkg/client/legacyconnection/models.go
  10. +23 −2 pkg/controller/command/connection/command_test.go
  11. +20 −3 pkg/controller/command/didexchange/command_test.go
  12. +4 −0 pkg/controller/command/errors.go
  13. +498 −0 pkg/controller/command/legacyconnection/command.go
  14. +1,049 −0 pkg/controller/command/legacyconnection/command_test.go
  15. +334 −0 pkg/controller/command/legacyconnection/models.go
  16. +23 −2 pkg/controller/command/verifiable/command.go
  17. +62 −0 pkg/controller/command/verifiable/command_test.go
  18. +19 −0 pkg/controller/controller.go
  19. +1 −0 pkg/controller/rest/didexchange/models.go
  20. +262 −0 pkg/controller/rest/legacyconnection/models.go
  21. +264 −0 pkg/controller/rest/legacyconnection/operation.go
  22. +609 −0 pkg/controller/rest/legacyconnection/operation_test.go
  23. +8 −4 pkg/crypto/tinkcrypto/cl_crypto.go
  24. +1 −2 pkg/crypto/tinkcrypto/cl_crypto_test.go
  25. +19 −17 pkg/crypto/tinkcrypto/withkms_test.go
  26. +345 −0 pkg/crypto/webkms/cl_remotecrypto_test.go
  27. +166 −15 pkg/crypto/webkms/remotecrypto.go
  28. +32 −35 pkg/crypto/webkms/remotecrypto_test.go
  29. +19 −3 pkg/didcomm/common/middleware/middleware_test.go
  30. +16 −0 pkg/didcomm/common/model/event.go
  31. +6 −4 pkg/didcomm/common/service/destination.go
  32. +94 −56 pkg/didcomm/common/service/destination_default.go
  33. +0 −5 pkg/didcomm/common/service/destination_interop.go
  34. +13 −0 pkg/didcomm/common/service/destination_test.go
  35. +17 −3 pkg/didcomm/dispatcher/inbound/inbound_message_handler.go
  36. +6 −2 pkg/didcomm/packager/packager.go
  37. +31 −15 pkg/didcomm/packager/packager_test.go
  38. +1 −2 pkg/didcomm/packer/anoncrypt/pack.go
  39. +2 −1 pkg/didcomm/packer/anoncrypt/pack_test.go
  40. +1 −2 pkg/didcomm/packer/authcrypt/pack.go
  41. +4 −2 pkg/didcomm/packer/authcrypt/pack_test.go
  42. +23 −7 pkg/didcomm/packer/legacy/anoncrypt/anoncrypt_test.go
  43. +22 −1 pkg/didcomm/packer/legacy/authcrypt/authcrypt_test.go
  44. +20 −4 pkg/didcomm/protocol/decorator/decorator_test.go
  45. +1 −9 pkg/didcomm/protocol/didexchange/event.go
  46. +20 −3 pkg/didcomm/protocol/didexchange/service_test.go
  47. +4 −2 pkg/didcomm/protocol/didexchange/states_test.go
  48. +2 −3 pkg/didcomm/protocol/legacyconnection/keys.go
  49. +84 −0 pkg/didcomm/protocol/legacyconnection/models.go
  50. +110 −0 pkg/didcomm/protocol/legacyconnection/models_test.go
  51. +31 −19 pkg/didcomm/protocol/legacyconnection/service.go
  52. +105 −13 pkg/didcomm/protocol/legacyconnection/service_test.go
  53. +32 −28 pkg/didcomm/protocol/legacyconnection/states.go
  54. +48 −42 pkg/didcomm/protocol/legacyconnection/states_test.go
  55. +47 −0 pkg/didcomm/protocol/legacyconnection/testdata/valid_conn_data.jsonld
  56. +4 −2 pkg/didcomm/protocol/middleware/presentproof/middlewares_test.go
  57. +3 −1 pkg/didcomm/protocol/outofband/service.go
  58. +1 −1 pkg/didcomm/transport/http/inbound.go
  59. +45 −31 pkg/didcomm/transport/http/inbound_test.go
  60. +3 −2 pkg/didcomm/transport/http/outbound.go
  61. +77 −0 pkg/doc/cl/api.go
  62. +64 −0 pkg/doc/cl/model.go
  63. +228 −0 pkg/doc/cl/ursa/crypto_test.go
  64. +373 −0 pkg/doc/cl/ursa/helpers.go
  65. +100 −0 pkg/doc/cl/ursa/issuer.go
  66. +141 −0 pkg/doc/cl/ursa/prover.go
  67. +64 −0 pkg/doc/cl/ursa/verifier.go
  68. +10 −5 pkg/doc/cm/credentialapplication.go
  69. +3 −3 pkg/doc/cm/credentialfulfillment.go
  70. +106 −49 pkg/doc/cm/credentialmanifest.go
  71. +145 −85 pkg/doc/cm/credentialmanifest_test.go
  72. +9 −9 pkg/doc/cm/resolve.go
  73. +17 −0 pkg/doc/cm/testdata/credential_manifest_drivers_license_with_no_display_or_styles.json
  74. +11 −3 pkg/doc/did/doc.go
  75. +116 −0 pkg/doc/did/legacy.go
  76. +93 −0 pkg/doc/did/legacy_test.go
  77. +19 −10 pkg/doc/jwt/verifier.go
  78. +4 −1 pkg/doc/signature/signer/signer_test.go
  79. +4 −1 pkg/doc/signature/suite/ecdsasecp256k1signature2019/public_key_verifier_test.go
  80. +4 −1 pkg/doc/signature/suite/ed25519signature2018/public_key_verifier_test.go
  81. +5 −3 pkg/doc/signature/suite/ed25519signature2018/suite_crypto_test.go
  82. +4 −1 pkg/doc/signature/suite/ed25519signature2020/public_key_verifier_test.go
  83. +6 −6 pkg/doc/signature/suite/ed25519signature2020/suite_crypto_test.go
  84. +5 −5 pkg/doc/signature/suite/jsonwebsignature2020/public_key_verifier_test.go
  85. +4 −3 pkg/doc/signature/suite/jsonwebsignature2020/suite_crypto_test.go
  86. +4 −1 pkg/doc/signature/verifier/public_key_verifier_test.go
  87. +1 −0 pkg/doc/util/kmsdidkey/kmsdidkey.go
  88. +21 −4 pkg/doc/util/kmsdidkey/kmsdidkey_test.go
  89. +15 −1 pkg/doc/util/signature/internal/signer/crypto_signer.go
  90. +15 −8 pkg/doc/util/signature/internal/signer/crypto_signer_test.go
  91. +3 −1 pkg/doc/util/signature/signer_test.go
  92. +52 −11 pkg/doc/verifiable/credential.go
  93. +3 −0 pkg/doc/verifiable/credential_jwt.go
  94. +9 −0 pkg/doc/verifiable/credential_jwt_proof_test.go
  95. +4 −0 pkg/doc/verifiable/credential_test.go
  96. +2 −0 pkg/doc/verifiable/embedded_proof.go
  97. +35 −1 pkg/doc/verifiable/example_credential_test.go
  98. +6 −4 pkg/doc/verifiable/presentation.go
  99. +4 −1 pkg/doc/verifiable/support_test.go
  100. +2 −0 pkg/doc/verifiable/test-suite/verifiable_suite_test.go
  101. +11 −1 pkg/framework/aries/default.go
  102. +21 −6 pkg/framework/aries/framework.go
  103. +23 −2 pkg/framework/aries/framework_test.go
  104. +68 −0 pkg/internal/didkeyutil/util.go
  105. +116 −0 pkg/internal/didkeyutil/util_test.go
  106. +38 −19 pkg/internal/gomocks/kms/mocks.gen.go
  107. +35 −6 pkg/kms/api.go
  108. +56 −0 pkg/kms/ariesProviderWrapper.go
  109. +36 −0 pkg/kms/key_opts.go
  110. +8 −13 pkg/kms/localkms/crypto_box_test.go
  111. +94 −0 pkg/kms/localkms/keytemplate.go
  112. +21 −0 pkg/kms/localkms/keytemplate_factory.go
  113. +36 −0 pkg/kms/localkms/keytemplate_factory_ursa.go
  114. +26 −115 pkg/kms/localkms/localkms.go
  115. +3 −3 pkg/kms/localkms/localkms_reader.go
  116. +11 −13 pkg/kms/localkms/localkms_reader_test.go
  117. +79 −69 pkg/kms/localkms/localkms_test.go
  118. +133 −0 pkg/kms/localkms/localkms_ursa_test.go
  119. +4 −5 pkg/kms/localkms/localkms_writer.go
  120. +24 −29 pkg/kms/localkms/localkms_writer_test.go
  121. +17 −0 pkg/kms/localkms/privkey_import.go
  122. +9 −27 pkg/kms/localkms/privkey_import_test.go
  123. +18 −3 pkg/kms/localkms/pubkey_reader.go
  124. +16 −1 pkg/kms/localkms/pubkey_writer.go
  125. +15 −7 pkg/kms/webkms/remotekms.go
  126. +6 −0 pkg/kms/webkms/remotekms_test.go
  127. +239 −0 pkg/mock/didcomm/protocol/legacyconnection/mock_legacyconnection.go
  128. +1 −0 pkg/mock/didcomm/protocol/mock_protocol.go
  129. +17 −9 pkg/mock/kms/mock_kms.go
  130. +0 −7 pkg/mock/provider/mock_provider.go
  131. +20 −18 pkg/store/connection/connection_lookup.go
  132. +0 −92 pkg/store/wrapper/prefix/prefix_wrapper.go
  133. +0 −200 pkg/store/wrapper/prefix/prefix_wrapper_test.go
  134. +20 −4 pkg/vdr/peer/creator_test.go
  135. +13 −3 pkg/wallet/contents_test.go
  136. +3 −2 pkg/wallet/didcomm.go
  137. +31 −9 pkg/wallet/kmsclient.go
  138. +97 −8 pkg/wallet/kmsclient_test.go
  139. +17 −1 pkg/wallet/models.go
  140. +6 −1 pkg/wallet/storage_test.go
  141. +67 −5 pkg/wallet/wallet.go
  142. +407 −0 pkg/wallet/wallet_test.go
  143. +1 −1 scripts/check_go_integration.sh
  144. +4 −0 test/bdd/bddtests_test.go
  145. +20 −0 test/bdd/features/jwt.feature
  146. +70 −0 test/bdd/features/wallet_jsonld.feature
  147. +2 −2 test/bdd/go.mod
  148. +1 −0 test/bdd/go.sum
  149. +120 −0 test/bdd/pkg/jwt/credential.go
  150. +49 −0 test/bdd/pkg/jwt/did.go
  151. +150 −0 test/bdd/pkg/jwt/jwt_steps.go
  152. +78 −0 test/bdd/pkg/jwt/presentation.go
  153. +28 −0 test/bdd/pkg/jwt/signer.go
  154. +5 −45 test/bdd/pkg/waci/common.go
  155. +3 −2 test/bdd/pkg/waci/waci_issuance_didcomm_v1_sdk_steps.go
  156. +3 −2 test/bdd/pkg/waci/waci_issuance_didcomm_v2_sdk_steps.go
  157. +24 −0 test/bdd/pkg/walletjsonld/agent.go
  158. +264 −0 test/bdd/pkg/walletjsonld/credential.go
  159. +98 −0 test/bdd/pkg/walletjsonld/did.go
  160. +121 −0 test/bdd/pkg/walletjsonld/presentation.go
  161. +32 −0 test/bdd/pkg/walletjsonld/query.go
  162. +28 −0 test/bdd/pkg/walletjsonld/signer.go
  163. +26 −0 test/bdd/pkg/walletjsonld/testdata/presentation_definition_fmt.json
  164. +16 −0 test/bdd/pkg/walletjsonld/testdata/query_by_example_fmt.json
  165. +100 −0 test/bdd/pkg/walletjsonld/wallet.go
  166. +136 −0 test/bdd/pkg/walletjsonld/wallet_steps.go
2 changes: 1 addition & 1 deletion .repolint.json
Original file line number Diff line number Diff line change
@@ -98,7 +98,7 @@
"!**/mocks/*.go",
"!**/third_party/**"
],
"lineCount": 7,
"lineCount": 8,
"patterns": ["Copyright", "License"],
"flags": "i"
}
67 changes: 49 additions & 18 deletions pkg/client/didexchange/client_test.go
Original file line number Diff line number Diff line change
@@ -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"
@@ -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{
@@ -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{
@@ -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{},
},
@@ -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{},
@@ -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{},
},
@@ -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{},
@@ -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{},
},
@@ -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{},
@@ -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)
7 changes: 5 additions & 2 deletions pkg/client/didexchange/event.go
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
/*
Copyright SecureKey Technologies Inc. All Rights Reserved.
Copyright Avast Software. All Rights Reserved.
SPDX-License-Identifier: Apache-2.0
*/

package didexchange

import "github.com/hyperledger/aries-framework-go/pkg/didcomm/protocol/didexchange"
import (
"github.com/hyperledger/aries-framework-go/pkg/didcomm/common/model"
)

// Event properties related api. This can be used to cast Generic event properties to DID Exchange specific props.
type Event didexchange.Event
type Event model.Event
Loading