WIP

ud/channelIDTracking.go

@@ -186,6 +186,8 @@ func newclientIDTracker(comms channelLeaseComms, host *connect.Host, username st
 	}
 
 	return &clientIDTracker{
+		kv:                kv,
+		rngSource:         rngSource,
 		registrationDisk:  &reg,
 		receptionIdentity: &receptionIdentity,
 		username:          username,
@@ -271,6 +273,7 @@ func (c *clientIDTracker) requestChannelLease() (int64, []byte, error) {
 	if err != nil {
 		return 0, nil, err
 	}
+
 	rng := c.rngSource.GetStream()
 	userPubKey := c.registrationDisk.GetPublicKey()
 	fSig, err := channel.SignChannelIdentityRequest(userPubKey, time.Unix(0, ts), privKey, rng)

ud/channelIDTracking_test.go

@@ -22,6 +22,8 @@ import (
 func TestChannelIDTracking(t *testing.T) {
 	rngGen := fastRNG.NewStreamGenerator(1000, 10, csprng.NewSystemRNG)
 
+	t.Logf("rngGen: %v", rngGen)
+
 	// AddHost
 	stream := rngGen.GetStream()
 	privKey, err := rsa.GenerateKey(stream, 1024)
@@ -61,38 +63,28 @@ func TestChannelIDTracking(t *testing.T) {
 	kv := versioned.NewKV(ekv.MakeMemstore())
 	comms := new(mockComms)
 	username := "Alice"
-	// doesn't work:
-	//username, err := m.store.GetUsername()
-	//require.NoError(t, err)
 
 	udPubKeyBytes := m.user.GetCmix().GetInstance().
 		GetPartialNdf().Get().UDB.DhPubKey
 
-	myTestClientIDTracker := newclientIDTracker(comms, host, username,
-		kv, m.user.GetReceptionIdentity(), ed25519.PublicKey(udPubKeyBytes), rngGen)
-
-	//stopper, err := myTestClientIDTracker.Start()
-	//require.NoError(t, err)
+	myTestClientIDTracker := newclientIDTracker(
+		comms, host, username,
+		kv, m.user.GetReceptionIdentity(),
+		ed25519.PublicKey(udPubKeyBytes), rngGen)
 
-	err = myTestClientIDTracker.register()
+	rsaPrivKey, err := myTestClientIDTracker.receptionIdentity.GetRSAPrivateKey()
 	require.NoError(t, err)
 
-	require.Equal(t, myTestClientIDTracker.GetUsername(), username)
+	comms.SetUserRSAPubKey(rsaPrivKey.GetPublic())
+	comms.SetUserEd25519PubKey(myTestClientIDTracker.registrationDisk.GetPublicKey())
 
-	signature, lease := myTestClientIDTracker.GetChannelValidationSignature()
-	t.Logf("signature %x lease %v", signature, lease)
+	//sig, _ := myTestClientIDTracker.registrationDisk.GetLeaseSignature()
+	// XXX bad signature
+	sig := make([]byte, 64)
+	stream.Read(sig)
 
-	chanPubKey := myTestClientIDTracker.GetChannelPubkey()
-	t.Logf("channel public key: %x", chanPubKey)
+	comms.SetLeaseSignature(sig)
 
-	message := []byte("hello world")
-	signature2, err := myTestClientIDTracker.SignChannelMessage(message)
+	err = myTestClientIDTracker.register()
 	require.NoError(t, err)
-
-	t.Logf("signature2: %x", signature2)
-
-	//_ = myTestClientIDTracker.ValidateChannelMessage(username, lease, pubKey, authorIDSignature)
-
-	//err = stopper.Close()
-	//require.NoError(t, err)
 }

ud/mockComms_test.go

 package ud
 
 import (
-	pb "gitlab.com/elixxir/comms/mixmessages"
+	"crypto/ed25519"
+	"fmt"
+	"time"
+
 	"gitlab.com/xx_network/comms/connect"
 	"gitlab.com/xx_network/comms/messages"
+	"gitlab.com/xx_network/crypto/signature/rsa"
 	"gitlab.com/xx_network/primitives/id"
+
+	pb "gitlab.com/elixxir/comms/mixmessages"
+	"gitlab.com/elixxir/crypto/channel"
 )
 
 type mockComms struct {
 	udHost                  *connect.Host
+	userRsaPub              *rsa.PublicKey
+	userEd25519PubKey       []byte
+	udLeaseEd25519Signature []byte
 }
 
 func (m mockComms) SendRegisterUser(host *connect.Host, message *pb.UDBUserRegistration) (*messages.Ack, error) {
@@ -45,6 +55,39 @@ func (m mockComms) GetHost(hostId *id.ID) (*connect.Host, bool) {
 	return m.udHost, true
 }
 
+func (m *mockComms) SetUserRSAPubKey(userRsaPub *rsa.PublicKey) {
+	m.userRsaPub = userRsaPub
+}
+
+func (m *mockComms) SetUserEd25519PubKey(key ed25519.PublicKey) {
+	m.userEd25519PubKey = []byte(key)
+}
+
+func (m *mockComms) SetLeaseSignature(signature []byte) {
+	m.udLeaseEd25519Signature = signature
+}
+
 func (m mockComms) SendChannelLeaseRequest(host *connect.Host, message *pb.ChannelLeaseRequest) (*pb.ChannelLeaseResponse, error) {
-	return nil, nil
+
+	fmt.Printf("message sig: %x\n", message.UserPubKeyRSASignature)
+	fmt.Printf("rsa pub key: %v\n", m.userRsaPub)
+	err := channel.VerifyChannelIdentityRequest(message.UserPubKeyRSASignature,
+		message.UserEd25519PubKey,
+		time.Now(),
+		time.Unix(0, message.Timestamp),
+		m.userRsaPub)
+
+	if err != nil {
+		panic(err)
+	}
+
+	d, _ := time.ParseDuration("4h30m")
+
+	response := &pb.ChannelLeaseResponse{
+		Lease:                   time.Now().Add(d).UnixNano(),
+		UserEd25519PubKey:       m.userEd25519PubKey,
+		UDLeaseEd25519Signature: m.udLeaseEd25519Signature,
+	}
+
+	return response, nil
 }