Add command line parameter to define E2E key generation parameters

README.md

@@ -55,6 +55,7 @@ Optional args:
 |--registrationaddr|-a|Address:Port for connecting to the registration server|-a "localhost:11420"|
 |--dummyfrequency| |How often dummy messages should be sent per second. This flag is likely to be replaced when we implement better dummy message sending.|--dummyfrequency 0.5|
 |--end2end| |Send messages with E2E encryption to destination user|--end2end|
+|--keyParams| |Set E2E key generation parameters. Pass values in comma separated list, with the following order: MinKeys,MaxKeys,NumRekeys,TTLScalar,MinNumKeys|--keyParams 100,200,32,1.2,50|
 
 ##Project Structure
 

api/client.go

@@ -403,6 +403,10 @@ func (cl *Client) GetCurrentUser() *id.User {
 	return cl.sess.GetCurrentUser().User
 }
 
+func (cl *Client) GetKeyParams() *keyStore.KeyParams {
+	return cl.sess.GetKeyStore().GetKeyParams()
+}
+
 // Logout closes the connection to the server at this time and does
 // nothing with the user id. In the future this will release resources
 // and safely release any sensitive memory.

api/client_test.go

@@ -301,7 +301,7 @@ func TestRegisterUserE2E_CheckAllKeys(t *testing.T) {
 	testClient.registerUserE2E(partner, partnerPubKeyCyclic.Bytes())
 
 	// Generate all keys and confirm they all match
-	keyParams := session.GetKeyStore().GetKeyParams()
+	keyParams := testClient.GetKeyParams()
 	baseKey, _ := diffieHellman.CreateDHSessionKey(partnerPubKeyCyclic, myPrivKeyCyclic, grp)
 	keyTTL, numKeys := e2e.GenerateKeyTTL(baseKey.GetLargeInt(),
 		keyParams.MinKeys, keyParams.MaxKeys, keyParams.TTLParams)

cmd/root.go

@@ -31,6 +31,7 @@ import (
 	"log"
 	"math/big"
 	"os"
+	"strconv"
 	"sync/atomic"
 	"time"
 )
@@ -52,6 +53,7 @@ var registrationAddr string
 var registrationCode string
 var userEmail string
 var end2end bool
+var keyParams []string
 var client *api.Client
 
 // Execute adds all child commands to the root command and sets flags
@@ -173,6 +175,40 @@ func sessionInitialization() *id.User {
 	return uid
 }
 
+func setKeyParams() {
+	minKeys, err := strconv.Atoi(keyParams[0])
+	if err != nil {
+		return
+	}
+
+	maxKeys, err := strconv.Atoi(keyParams[1])
+	if err != nil {
+		return
+	}
+
+	numRekeys, err := strconv.Atoi(keyParams[2])
+	if err != nil {
+		return
+	}
+
+	ttlScalar, err := strconv.ParseFloat(keyParams[3], 64)
+	if err != nil {
+		return
+	}
+
+	minNumKeys, err := strconv.Atoi(keyParams[4])
+	if err != nil {
+		return
+	}
+
+	params := client.GetKeyParams()
+	params.MinKeys = uint16(minKeys)
+	params.MaxKeys = uint16(maxKeys)
+	params.NumRekeys = uint16(numRekeys)
+	params.TTLScalar = ttlScalar
+	params.MinNumKeys = uint16(minNumKeys)
+}
+
 type FallbackListener struct {
 	messagesReceived int64
 }
@@ -274,6 +310,10 @@ var rootCmd = &cobra.Command{
 		SetCertPaths(gwCertPath, registrationCertPath)
 
 		userID := sessionInitialization()
+		// Set Key parameters if defined
+		if len(keyParams) == 5 {
+			setKeyParams()
+		}
 		// Set up the listeners for both of the types the client needs for
 		// the integration test
 		// Normal text messages
@@ -454,6 +494,10 @@ func init() {
 
 	rootCmd.PersistentFlags().BoolVarP(&end2end, "end2end", "", false,
 		"Send messages with E2E encryption to destination user")
+
+	rootCmd.PersistentFlags().StringArrayVarP(&keyParams, "keyParams", "",
+		make([]string, 0), "Define key generation parameters. Pass values in comma separated list"+
+			" in the following order: MinKeys,MaxKeys,NumRekeys,TTLScalar,MinNumKeys")
 }
 
 // Sets the cert paths in comms