Merge branch 'Optimus/ClientStorage' into XX-2418/ClientStorage-Registration

.gitignore

@@ -27,3 +27,8 @@ localdev_*
 *.class
 *.aar
 *.jar
+# Ignore test output related to ekv
+.ekv*
+.*test*
+*.1
+*.2

Makefile

@@ -24,12 +24,14 @@ update_release:
 	GOFLAGS="" go get -u gitlab.com/elixxir/crypto@release
 	GOFLAGS="" go get -u gitlab.com/elixxir/comms@release
 	GOFLAGS="" go get -u gitlab.com/xx_network/comms@release
+	GOFLAGS="" go get -u gitlab.com/xx_network/primitives@release	
 
 update_master:
 	GOFLAGS="" go get -u gitlab.com/elixxir/primitives@master
 	GOFLAGS="" go get -u gitlab.com/elixxir/crypto@master
 	GOFLAGS="" go get -u gitlab.com/elixxir/comms@master
 	GOFLAGS="" go get -u gitlab.com/xx_network/comms@master
+	GOFLAGS="" go get -u gitlab.com/xx_network/primitives@master
 
 master: clean update_master build version
 

api/client.go

@@ -28,10 +28,10 @@ import (
 	"gitlab.com/elixxir/crypto/large"
 	"gitlab.com/elixxir/crypto/signature/rsa"
 	"gitlab.com/elixxir/crypto/tls"
-	"gitlab.com/elixxir/primitives/id"
-	"gitlab.com/elixxir/primitives/ndf"
 	"gitlab.com/elixxir/primitives/switchboard"
 	"gitlab.com/xx_network/comms/connect"
+	"gitlab.com/xx_network/primitives/id"
+	"gitlab.com/xx_network/primitives/ndf"
 	goio "io"
 	"path/filepath"
 	"strings"
@@ -446,30 +446,28 @@ type SearchCallback interface {
 func (cl *Client) SearchForUser(emailAddress string,
 	cb SearchCallback, timeout time.Duration) {
 	//see if the user has been searched before, if it has, return it
-	uid, pk := cl.session.GetContactByValue(emailAddress)
+	contact, err := cl.sessionV2.GetContact(emailAddress)
 
-	if uid != nil {
-		cb.Callback(uid.Bytes(), pk, nil)
+	// if we successfully got the contact, return it.
+	// errors can include the email address not existing,
+	// so errors from the GetContact call are ignored
+	if contact != nil && err == nil {
+		cb.Callback(contact.Id.Bytes(), contact.PublicKey, nil)
+		return
 	}
 
 	valueType := "EMAIL"
 	go func() {
-		uid, pubKey, err := bots.Search(valueType, emailAddress, cl.opStatus, timeout)
-		if err == nil && uid != nil && pubKey != nil {
+		contact, err := bots.Search(valueType, emailAddress, cl.opStatus, timeout)
+		if err == nil && contact.Id != nil && contact.PublicKey != nil {
 			cl.opStatus(globals.UDB_SEARCH_BUILD_CREDS)
-			err = cl.registerUserE2E(uid, pubKey)
+			err = cl.registerUserE2E(contact)
 			if err != nil {
-				cb.Callback(uid[:], pubKey, err)
+				cb.Callback(contact.Id.Bytes(), contact.PublicKey, err)
 				return
 			}
 			//store the user so future lookups can find it
-			cl.session.StoreContactByValue(emailAddress, uid, pubKey)
-
-			err = cl.session.StoreSession()
-			if err != nil {
-				cb.Callback(uid[:], pubKey, err)
-				return
-			}
+			err = cl.sessionV2.SetContact(emailAddress, contact)
 
 			// If there is something in the channel then send it; otherwise,
 			// skip over it
@@ -478,7 +476,7 @@ func (cl *Client) SearchForUser(emailAddress string,
 			default:
 			}
 
-			cb.Callback(uid[:], pubKey, err)
+			cb.Callback(contact.Id.Bytes(), contact.PublicKey, err)
 
 		} else {
 			if err == nil {

api/client_test.go

@@ -13,6 +13,7 @@ import (
 	"gitlab.com/elixxir/client/io"
 	"gitlab.com/elixxir/client/keyStore"
 	"gitlab.com/elixxir/client/parse"
+	"gitlab.com/elixxir/client/storage"
 	"gitlab.com/elixxir/client/user"
 	"gitlab.com/elixxir/crypto/csprng"
 	"gitlab.com/elixxir/crypto/cyclic"
@@ -22,7 +23,7 @@ import (
 	"gitlab.com/elixxir/crypto/large"
 	"gitlab.com/elixxir/crypto/signature/rsa"
 	"gitlab.com/elixxir/primitives/format"
-	"gitlab.com/elixxir/primitives/id"
+	"gitlab.com/xx_network/primitives/id"
 	"reflect"
 	"testing"
 	"time"
@@ -177,7 +178,13 @@ func TestRegisterUserE2E(t *testing.T) {
 
 	testClient.session = session
 
-	testClient.registerUserE2E(partner, partnerPubKeyCyclic.Bytes())
+	err = testClient.registerUserE2E(&storage.Contact{
+		Id:        partner,
+		PublicKey: partnerPubKeyCyclic.Bytes(),
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	// Confirm we can get all types of keys
 	km := session.GetKeyStore().GetSendManager(partner)
@@ -243,7 +250,7 @@ func TestRegisterUserE2E(t *testing.T) {
 func TestRegisterUserE2E_CheckAllKeys(t *testing.T) {
 	testClient, err := NewClient(&globals.RamStorage{}, ".ekv-testrege2e-allkeys", "", def)
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 
 	cmixGrp, e2eGrp := getGroups()
@@ -268,7 +275,13 @@ func TestRegisterUserE2E_CheckAllKeys(t *testing.T) {
 
 	testClient.session = session
 
-	testClient.registerUserE2E(partner, partnerPubKeyCyclic.Bytes())
+	err = testClient.registerUserE2E(&storage.Contact{
+		Id:        partner,
+		PublicKey: partnerPubKeyCyclic.Bytes(),
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
 
 	// Generate all keys and confirm they all match
 	keyParams := testClient.GetKeyParams()
@@ -712,8 +725,8 @@ func TestClient_LogoutTimeout(t *testing.T) {
 // Test that if we logout we can logback in.
 func TestClient_LogoutAndLoginAgain(t *testing.T) {
 	//Initialize a client
-	storage := &DummyStorage{LocationA: ".ekv-logoutlogin", StoreA: []byte{'a', 'b', 'c'}}
-	tc, err := NewClient(storage, ".ekv-logoutlogin", "", def)
+	dummyStorage := &DummyStorage{LocationA: ".ekv-logoutlogin", StoreA: []byte{'a', 'b', 'c'}}
+	tc, err := NewClient(dummyStorage, ".ekv-logoutlogin", "", def)
 	if err != nil {
 		t.Errorf("Failed to create new client: %+v", err)
 	}
@@ -750,7 +763,7 @@ func TestClient_LogoutAndLoginAgain(t *testing.T) {
 	}
 
 	//Redefine client with old session files and attempt to login.
-	tc, err = NewClient(storage, ".ekv-logoutlogin", "", def)
+	tc, err = NewClient(dummyStorage, ".ekv-logoutlogin", "", def)
 	if err != nil {
 		t.Errorf("Failed second client initialization: %+v", err)
 	}

api/connect.go

@@ -11,10 +11,10 @@ import (
 	"github.com/pkg/errors"
 	"gitlab.com/elixxir/client/globals"
 	"gitlab.com/elixxir/client/io"
-	"gitlab.com/elixxir/primitives/id"
-	"gitlab.com/elixxir/primitives/ndf"
 	"gitlab.com/elixxir/primitives/version"
 	"gitlab.com/xx_network/comms/connect"
+	"gitlab.com/xx_network/primitives/id"
+	"gitlab.com/xx_network/primitives/ndf"
 )
 
 var ErrNoPermissioning = errors.New("No Permissioning In NDF")

api/mockserver.go

@@ -19,10 +19,10 @@ import (
 	"gitlab.com/elixxir/crypto/e2e"
 	"gitlab.com/elixxir/crypto/large"
 	"gitlab.com/elixxir/primitives/format"
-	"gitlab.com/elixxir/primitives/id"
-	"gitlab.com/elixxir/primitives/ndf"
 	"gitlab.com/xx_network/comms/connect"
 	"gitlab.com/xx_network/comms/messages"
+	"gitlab.com/xx_network/primitives/id"
+	"gitlab.com/xx_network/primitives/ndf"
 	"sync"
 	"time"
 )

api/mockserver_test.go

@@ -17,9 +17,9 @@ import (
 	pb "gitlab.com/elixxir/comms/mixmessages"
 	"gitlab.com/elixxir/comms/notificationBot"
 	"gitlab.com/elixxir/comms/registration"
-	"gitlab.com/elixxir/primitives/id"
-	"gitlab.com/elixxir/primitives/ndf"
 	"gitlab.com/xx_network/comms/connect"
+	"gitlab.com/xx_network/primitives/id"
+	"gitlab.com/xx_network/primitives/ndf"
 	"os"
 	"path/filepath"
 	"strings"

api/ndf_test.go

@@ -12,7 +12,7 @@ import (
 	"encoding/base64"
 	"fmt"
 	"gitlab.com/elixxir/crypto/signature/rsa"
-	"gitlab.com/elixxir/primitives/ndf"
+	"gitlab.com/xx_network/primitives/ndf"
 	"reflect"
 	"testing"
 )

api/notifications.go

@@ -3,7 +3,7 @@ package api
 import (
 	"github.com/pkg/errors"
 	"gitlab.com/elixxir/comms/mixmessages"
-	"gitlab.com/elixxir/primitives/id"
+	"gitlab.com/xx_network/primitives/id"
 )
 
 // RegisterForNotifications sends a message to notification bot indicating it

api/private.go

@@ -13,6 +13,7 @@ import (
 	"gitlab.com/elixxir/client/globals"
 	"gitlab.com/elixxir/client/io"
 	"gitlab.com/elixxir/client/keyStore"
+	"gitlab.com/elixxir/client/storage"
 	"gitlab.com/elixxir/client/user"
 	pb "gitlab.com/elixxir/comms/mixmessages"
 	"gitlab.com/elixxir/crypto/csprng"
@@ -22,9 +23,9 @@ import (
 	"gitlab.com/elixxir/crypto/large"
 	"gitlab.com/elixxir/crypto/signature/rsa"
 	"gitlab.com/elixxir/crypto/xx"
-	"gitlab.com/elixxir/primitives/id"
-	"gitlab.com/elixxir/primitives/ndf"
 	"gitlab.com/xx_network/comms/messages"
+	"gitlab.com/xx_network/primitives/id"
+	"gitlab.com/xx_network/primitives/ndf"
 )
 
 const PermissioningAddrID = "Permissioning"
@@ -208,16 +209,15 @@ func (cl *Client) confirmNonce(UID, nonce []byte,
 	return nil
 }
 
-func (cl *Client) registerUserE2E(partnerID *id.ID,
-	partnerPubKey []byte) error {
+func (cl *Client) registerUserE2E(partner *storage.Contact) error {
 
 	// Check that the returned user is valid
-	if partnerKeyStore := cl.session.GetKeyStore().GetSendManager(partnerID); partnerKeyStore != nil {
+	if partnerKeyStore := cl.session.GetKeyStore().GetSendManager(partner.Id); partnerKeyStore != nil {
 		return errors.New(fmt.Sprintf("UDB searched failed for %v because user has "+
-			"been searched for before", partnerID))
+			"been searched for before", partner.Id))
 	}
 
-	if cl.session.GetCurrentUser().User.Cmp(partnerID) {
+	if cl.session.GetCurrentUser().User.Cmp(partner.Id) {
 		return errors.New("cannot search for yourself on UDB")
 	}
 
@@ -228,11 +228,11 @@ func (cl *Client) registerUserE2E(partnerID *id.ID,
 	// Create user private key and partner public key
 	// in the group
 	privKeyCyclic := cl.session.GetE2EDHPrivateKey()
-	partnerPubKeyCyclic := grp.NewIntFromBytes(partnerPubKey)
+	publicKeyCyclic := grp.NewIntFromBytes(partner.PublicKey)
 
 	// Generate baseKey
 	baseKey, _ := diffieHellman.CreateDHSessionKey(
-		partnerPubKeyCyclic,
+		publicKeyCyclic,
 		privKeyCyclic,
 		grp)
 
@@ -243,7 +243,7 @@ func (cl *Client) registerUserE2E(partnerID *id.ID,
 
 	// Create Send KeyManager
 	km := keyStore.NewManager(baseKey, privKeyCyclic,
-		partnerPubKeyCyclic, partnerID, true,
+		publicKeyCyclic, partner.Id, true,
 		numKeys, keysTTL, params.NumRekeys)
 
 	// Generate Send Keys
@@ -252,7 +252,7 @@ func (cl *Client) registerUserE2E(partnerID *id.ID,
 
 	// Create Receive KeyManager
 	km = keyStore.NewManager(baseKey, privKeyCyclic,
-		partnerPubKeyCyclic, partnerID, false,
+		publicKeyCyclic, partner.Id, false,
 		numKeys, keysTTL, params.NumRekeys)
 
 	// Generate Receive Keys
@@ -265,10 +265,10 @@ func (cl *Client) registerUserE2E(partnerID *id.ID,
 
 	keys := &keyStore.RekeyKeys{
 		CurrPrivKey: privKeyCyclic,
-		CurrPubKey:  partnerPubKeyCyclic,
+		CurrPubKey:  publicKeyCyclic,
 	}
 
-	rkm.AddKeys(partnerID, keys)
+	rkm.AddKeys(partner.Id, keys)
 
 	return nil
 }

api/register.go

@@ -19,8 +19,8 @@ import (
 	"gitlab.com/elixxir/crypto/registration"
 	"gitlab.com/elixxir/crypto/signature/rsa"
 	"gitlab.com/elixxir/crypto/tls"
-	"gitlab.com/elixxir/primitives/id"
-	"gitlab.com/elixxir/primitives/ndf"
+	"gitlab.com/xx_network/primitives/id"
+	"gitlab.com/xx_network/primitives/ndf"
 	"sync"
 	"time"
 )

api/register_test.go

@@ -9,8 +9,8 @@ import (
 	"crypto/sha256"
 	"gitlab.com/elixxir/client/globals"
 	"gitlab.com/elixxir/client/user"
-	"gitlab.com/elixxir/primitives/id"
 	"gitlab.com/xx_network/comms/connect"
+	"gitlab.com/xx_network/primitives/id"
 	"testing"
 )
 

bindings/client.go

@@ -14,7 +14,7 @@ import (
 	"gitlab.com/elixxir/client/globals"
 	"gitlab.com/elixxir/client/parse"
 	"gitlab.com/elixxir/crypto/csprng"
-	"gitlab.com/elixxir/primitives/id"
+	"gitlab.com/xx_network/primitives/id"
 	"io"
 	"math/big"
 	"strings"

bindings/client_test.go

@@ -25,10 +25,10 @@ import (
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/elixxir/crypto/large"
 	"gitlab.com/elixxir/crypto/signature/rsa"
-	"gitlab.com/elixxir/primitives/id"
-	"gitlab.com/elixxir/primitives/ndf"
 	"gitlab.com/xx_network/comms/connect"
 	"gitlab.com/xx_network/comms/messages"
+	"gitlab.com/xx_network/primitives/id"
+	"gitlab.com/xx_network/primitives/ndf"
 	"math/rand"
 	"os"
 	"reflect"

bots/bots.go

@@ -6,9 +6,9 @@ import (
 	"gitlab.com/elixxir/client/io"
 	"gitlab.com/elixxir/client/parse"
 	"gitlab.com/elixxir/client/user"
-	"gitlab.com/elixxir/primitives/id"
 	"gitlab.com/elixxir/primitives/switchboard"
 	"gitlab.com/xx_network/comms/connect"
+	"gitlab.com/xx_network/primitives/id"
 )
 
 var session user.Session

bots/bots_test.go

@@ -20,8 +20,8 @@ import (
 	"gitlab.com/elixxir/crypto/cyclic"
 	"gitlab.com/elixxir/crypto/large"
 	"gitlab.com/elixxir/primitives/format"
-	"gitlab.com/elixxir/primitives/id"
 	"gitlab.com/xx_network/comms/connect"
+	"gitlab.com/xx_network/primitives/id"
 	"os"
 	"strings"
 	"testing"
@@ -126,11 +126,6 @@ func TestRegister(t *testing.T) {
 // TestSearch smoke tests the search function
 func TestSearch(t *testing.T) {
 	publicKeyString := base64.StdEncoding.EncodeToString(pubKey)
-	//uid := id.NewIdFromUInt(26, id.User, t)
-	//serRetUid := base64.StdEncoding.EncodeToString(uid[:])
-	//result, _ := base64.StdEncoding.DecodeString(serRetUid)
-	//t.Fatal(serRetUid)
-	//t.Fatal(len(result))
 
 	// Send response messages from fake UDB in advance
 	searchResponseListener <- "blah@elixxir.io FOUND UR69db14ZyicpZVqJ1HFC5rk9UZ8817aV6+VHmrJpGc= AAAAAAAAABoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD 8oKh7TYG4KxQcBAymoXPBHSD/uga9pX3Mn/jKhvcD8M="
@@ -141,16 +136,19 @@ func TestSearch(t *testing.T) {
 		return
 	}
 
-	searchedUser, _, err := Search("EMAIL", "blah@elixxir.io",
+	searchedUser, err := Search("EMAIL", "blah@elixxir.io",
 		dummySearchState, 30*time.Second)
 	if err != nil {
-		t.Errorf("Error on Search: %s", err.Error())
+		t.Fatalf("Error on Search: %s", err.Error())
 	}
-	if !searchedUser.Cmp(id.NewIdFromUInt(26, id.User, t)) {
+	if !searchedUser.Id.Cmp(id.NewIdFromUInt(26, id.User, t)) {
 		t.Errorf("Search did not return user ID 26! returned %s", searchedUser)
 	}
 	//Test the timeout capabilities
-	searchedUser, _, err = Search("EMAIL", "blah@elixxir.io", dummySearchState, 1*time.Millisecond)
+	searchedUser, err = Search("EMAIL", "blah@elixxir.io", dummySearchState, 1*time.Millisecond)
+	if err == nil {
+		t.Fatal("udb search timeout should have caused error")
+	}
 	if strings.Compare(err.Error(), "UDB search timeout exceeded on user lookup") != 0 {
 		t.Errorf("error: %v", err)
 	}

bots/userDiscovery.go

@@ -16,8 +16,9 @@ import (
 	"gitlab.com/elixxir/client/cmixproto"
 	"gitlab.com/elixxir/client/globals"
 	"gitlab.com/elixxir/client/parse"
+	"gitlab.com/elixxir/client/storage"
 	"gitlab.com/elixxir/crypto/hash"
-	"gitlab.com/elixxir/primitives/id"
+	"gitlab.com/xx_network/primitives/id"
 	"strings"
 	"time"
 )
@@ -38,7 +39,7 @@ func Register(valueType, value string, publicKey []byte, regStatus func(int), ti
 	if valueType == "EMAIL" {
 		value, err = hashAndEncode(strings.ToLower(value))
 		if err != nil {
-			return fmt.Errorf("Could not hash and encode email %s: %+v", value, err)
+			return fmt.Errorf("could not hash and encode email %s: %+v", value, err)
 		}
 	}
 
@@ -114,7 +115,7 @@ func Register(valueType, value string, publicKey []byte, regStatus func(int), ti
 // Search returns a userID and public key based on the search criteria
 // it accepts a valueType of EMAIL and value of an e-mail address, and
 // returns a map of userid -> public key
-func Search(valueType, value string, searchStatus func(int), timeout time.Duration) (*id.ID, []byte, error) {
+func Search(valueType, value string, searchStatus func(int), timeout time.Duration) (*storage.Contact, error) {
 	globals.Log.DEBUG.Printf("Running search for %v, %v", valueType, value)
 
 	searchTimeout := time.NewTimer(timeout)
@@ -123,7 +124,7 @@ func Search(valueType, value string, searchStatus func(int), timeout time.Durati
 	if valueType == "EMAIL" {
 		value, err = hashAndEncode(strings.ToLower(value))
 		if err != nil {
-			return nil, nil, fmt.Errorf("Could not hash and encode email %s: %+v", value, err)
+			return nil, fmt.Errorf("could not hash and encode email %s: %+v", value, err)
 		}
 	}
 
@@ -135,7 +136,7 @@ func Search(valueType, value string, searchStatus func(int), timeout time.Durati
 	})
 	err = sendCommand(&id.UDB, msgBody)
 	if err != nil {
-		return nil, nil, err
+		return nil, err
 	}
 
 	var response string
@@ -149,20 +150,20 @@ func Search(valueType, value string, searchStatus func(int), timeout time.Durati
 		case response = <-searchResponseListener:
 			empty := fmt.Sprintf("SEARCH %s NOTFOUND", value)
 			if response == empty {
-				return nil, nil, nil
+				return nil, nil
 			}
 			if strings.Contains(response, value) {
 				found = true
 			}
 		case <-searchTimeout.C:
-			return nil, nil, errors.New("UDB search timeout exceeded on user lookup")
+			return nil, errors.New("UDB search timeout exceeded on user lookup")
 		}
 	}
 
 	// While search returns more than 1 result, we only process the first
 	cMixUID, keyFP, err := parseSearch(response)
 	if err != nil {
-		return nil, nil, err
+		return nil, err
 	}
 
 	searchStatus(globals.UDB_SEARCH_GETKEY)
@@ -174,7 +175,7 @@ func Search(valueType, value string, searchStatus func(int), timeout time.Durati
 	})
 	err = sendCommand(&id.UDB, msgBody)
 	if err != nil {
-		return nil, nil, err
+		return nil, err
 	}
 
 	// wait for the response to searching for the key against the timeout.
@@ -187,13 +188,16 @@ func Search(valueType, value string, searchStatus func(int), timeout time.Durati
 				found = true
 			}
 		case <-searchTimeout.C:
-			return nil, nil, errors.New("UDB search timeout exceeded on key lookup")
+			return nil, errors.New("UDB search timeout exceeded on key lookup")
 		}
 	}
 
 	publicKey := parseGetKey(response)
 
-	return cMixUID, publicKey, nil
+	return &storage.Contact{
+		Id:        cMixUID,
+		PublicKey: publicKey,
+	}, nil
 }
 
 func hashAndEncode(s string) (string, error) {

cmd/root.go

@@ -22,9 +22,9 @@ import (
 	"gitlab.com/elixxir/client/parse"
 	"gitlab.com/elixxir/client/user"
 	"gitlab.com/elixxir/crypto/signature/rsa"
-	"gitlab.com/elixxir/primitives/id"
 	"gitlab.com/elixxir/primitives/switchboard"
 	"gitlab.com/elixxir/primitives/utils"
+	"gitlab.com/xx_network/primitives/id"
 	"io/ioutil"
 	"os"
 	"strconv"

cmd/udb.go

@@ -9,7 +9,7 @@ package cmd
 import (
 	"gitlab.com/elixxir/client/api"
 	"gitlab.com/elixxir/client/globals"
-	"gitlab.com/elixxir/primitives/id"
+	"gitlab.com/xx_network/primitives/id"
 	"strings"
 	"time"
 )

crypto/encryptdecrypt_test.go

@@ -16,8 +16,8 @@ import (
 	"gitlab.com/elixxir/crypto/hash"
 	"gitlab.com/elixxir/crypto/large"
 	"gitlab.com/elixxir/primitives/format"
-	"gitlab.com/elixxir/primitives/id"
 	"gitlab.com/xx_network/comms/connect"
+	"gitlab.com/xx_network/primitives/id"
 	"golang.org/x/crypto/blake2b"
 	"os"
 	"testing"