feat: Enforce EDV document ID format in EDVFormatProvider

Signed-off-by: Derek Trider <Derek.Trider@securekey.com>
hyperledger-archives · Oct 26, 2020 · 2cd41c3 · 2cd41c3
1 parent f8f6921
commit 2cd41c3
Show file tree

Hide file tree

Showing 16 changed files with 391 additions and 154 deletions.
diff --git a/component/storage/jsindexeddb/jsindexeddb.go b/component/storage/jsindexeddb/jsindexeddb.go
@@ -197,7 +197,7 @@ func (s *store) Delete(k string) error {
 }
 
 // TODO #2229 - implement query method.
-func (s *store) Query(query string) (storage.StoreIterator, error) {
+func (s *store) Query(name, value string) (storage.StoreIterator, error) {
 	return nil, storage.ErrQueryingNotSupported
 }
 

diff --git a/component/storage/leveldb/leveldb_store.go b/component/storage/leveldb/leveldb_store.go
@@ -112,7 +112,7 @@ type leveldbStore struct {
 }
 
 // TODO #2227 - implement query method.
-func (s *leveldbStore) Query(_ string) (storage.StoreIterator, error) {
+func (s *leveldbStore) Query(name, value string) (storage.StoreIterator, error) {
 	return nil, storage.ErrQueryingNotSupported
 }
 

diff --git a/pkg/didcomm/protocol/didexchange/service_test.go b/pkg/didcomm/protocol/didexchange/service_test.go
@@ -716,7 +716,7 @@ type mockStore struct {
 	put    func(string, []byte) error
 	get    func(string) ([]byte, error)
 	delete func(string) error
-	query  func(string) (storage.StoreIterator, error)
+	query  func(string, string) (storage.StoreIterator, error)
 }
 
 // Put stores the key and the record.
@@ -734,8 +734,8 @@ func (m *mockStore) Delete(k string) error {
 	return m.delete(k)
 }
 
-func (m *mockStore) Query(query string) (storage.StoreIterator, error) {
-	return m.query(query)
+func (m *mockStore) Query(name, value string) (storage.StoreIterator, error) {
+	return m.query(name, value)
 }
 
 // Search returns storage iterator.

diff --git a/pkg/didcomm/protocol/outofband/service_test.go b/pkg/didcomm/protocol/outofband/service_test.go
@@ -1273,7 +1273,7 @@ func (s *stubStore) Delete(k string) error {
 	panic("implement me")
 }
 
-func (s *stubStore) Query(query string) (storage.StoreIterator, error) {
+func (s *stubStore) Query(name, value string) (storage.StoreIterator, error) {
 	panic("implement me")
 }
 

diff --git a/pkg/internal/gomocks/storage/mocks.go b/pkg/internal/gomocks/storage/mocks.go
diff --git a/pkg/mock/storage/mock_store.go b/pkg/mock/storage/mock_store.go
@@ -136,7 +136,7 @@ func (s *MockStore) Delete(k string) error {
 }
 
 // Query returns a mocked store iterator and error value.
-func (s *MockStore) Query(_ string) (storage.StoreIterator, error) {
+func (s *MockStore) Query(indexKey, indexValue string) (storage.StoreIterator, error) {
 	return s.QueryReturnValue, s.ErrQuery
 }
 

diff --git a/pkg/storage/edv/documentprocessor/documentprocessor.go b/pkg/storage/edv/documentprocessor/documentprocessor.go
@@ -43,7 +43,8 @@ func New(jweEncrypter jose.Encrypter, jweDecrypter jose.Decrypter) *DocumentProc
 }
 
 // Encrypt creates a new encrypted document based off of the given structured document.
-func (a *DocumentProcessor) Encrypt(structuredDocument *edv.StructuredDocument) (*edv.EncryptedDocument, error) {
+func (a *DocumentProcessor) Encrypt(structuredDocument *edv.StructuredDocument,
+	indexedAttributes []edv.IndexedAttributeCollection) (*edv.EncryptedDocument, error) {
 	structuredDocumentBytes, err := a.marshal(structuredDocument)
 	if err != nil {
 		return nil, fmt.Errorf(failMarshalStructuredDocument, err)
@@ -60,8 +61,9 @@ func (a *DocumentProcessor) Encrypt(structuredDocument *edv.StructuredDocument)
 	}
 
 	encryptedDoc := edv.EncryptedDocument{
-		ID:  structuredDocument.ID,
-		JWE: []byte(serializedJWE),
+		ID:                          structuredDocument.ID,
+		IndexedAttributeCollections: indexedAttributes,
+		JWE:                         []byte(serializedJWE),
 	}
 
 	return &encryptedDoc, nil

diff --git a/pkg/storage/edv/documentprocessor/documentprocessor_test.go b/pkg/storage/edv/documentprocessor/documentprocessor_test.go
@@ -43,15 +43,15 @@ func TestAriesDocumentProcessor_Encrypt(t *testing.T) {
 		documentProcessor := DocumentProcessor{marshal: failingMarshal}
 		require.NotNil(t, documentProcessor)
 
-		encryptedDocument, err := documentProcessor.Encrypt(nil)
+		encryptedDocument, err := documentProcessor.Encrypt(nil, nil)
 		require.EqualError(t, err, fmt.Errorf(failMarshalStructuredDocument, errFailingMarshal).Error())
 		require.Nil(t, encryptedDocument)
 	})
 	t.Run("Fail to encrypt structured document", func(t *testing.T) {
 		documentProcessor := New(&failingEncrypter{}, nil)
 		require.NotNil(t, documentProcessor)
 
-		encryptedDocument, err := documentProcessor.Encrypt(createStructuredDocument())
+		encryptedDocument, err := documentProcessor.Encrypt(createStructuredDocument(), nil)
 		require.EqualError(t, err, fmt.Errorf(failEncryptStructuredDocument, errFailingEncrypter).Error())
 		require.Nil(t, encryptedDocument)
 	})
@@ -145,7 +145,7 @@ func createStructuredDocument() *edv.StructuredDocument {
 func createEncryptedDocument(t *testing.T, documentProcessor *DocumentProcessor) *edv.EncryptedDocument {
 	structuredDocument := createStructuredDocument()
 
-	encryptedDocument, err := documentProcessor.Encrypt(structuredDocument)
+	encryptedDocument, err := documentProcessor.Encrypt(structuredDocument, nil)
 	require.NoError(t, err)
 	require.NotNil(t, encryptedDocument)