added option to run with unregistered namespaces

Also a few minor fixes such that server binary starts again.

1 files changed, 31 insertions, 25 deletions

diff --git a/log_parameters.go b/log_parameters.go
index 86ac0cc..9c23fa6 100644
--- a/log_parameters.go
+++ b/log_parameters.go
@@ -12,37 +12,43 @@ import (
 
 // LogParameters is a collection of log parameters
 type LogParameters struct {
-	LogId      *types.Namespace     // log identifier
-	LogIdBytes []byte               // serialized log id
-	TreeId     int64                // used internally by Trillian
-	Prefix     string               // e.g., "test" for <base>/test
-	MaxRange   int64                // max entries per get-entries request
-	Submitters *types.NamespacePool // trusted submitters
-	Witnesses  *types.NamespacePool // trusted witnesses
-	Deadline   time.Duration        // gRPC deadline
-	Interval   time.Duration        // cosigning sth frequency
-	HashType   crypto.Hash          // hash function used by Trillian
-	Signer     crypto.Signer        // access to Ed25519 private key
+	LogId           *types.Namespace     // log identifier
+	LogIdBytes      []byte               // serialized log id
+	LogIdStr        string               // serialized log id (hex)
+	TreeId          int64                // used internally by Trillian
+	Prefix          string               // e.g., "test" for <base>/test
+	MaxRange        int64                // max entries per get-entries request
+	SubmitterPolicy bool                 // if we have a submitter policy (true means that namespaces must be registered)
+	WitnessPolicy   bool                 // if we have a witness policy (true means that namespaces must be registered)
+	Submitters      *types.NamespacePool // trusted submitters
+	Witnesses       *types.NamespacePool // trusted witnesses
+	Deadline        time.Duration        // gRPC deadline
+	Interval        time.Duration        // cosigning sth frequency
+	HashType        crypto.Hash          // hash function used by Trillian
+	Signer          crypto.Signer        // access to Ed25519 private key
 }
 
 // NewLogParameters creates newly initialized log parameters
-func NewLogParameters(signer crypto.Signer, logId *types.Namespace, treeId int64, prefix string, submitters, witnesses *types.NamespacePool, maxRange int64, interval, deadline time.Duration) (*LogParameters, error) {
+func NewLogParameters(signer crypto.Signer, logId *types.Namespace, treeId int64, prefix string, submitters, witnesses *types.NamespacePool, maxRange int64, interval, deadline time.Duration, submitterPolicy, witnessPolicy bool) (*LogParameters, error) {
 	logIdBytes, err := types.Marshal(*logId)
 	if err != nil {
 		return nil, fmt.Errorf("Marshal failed for log identifier: %v", err)
 	}
 	return &LogParameters{
-		LogId:      logId,
-		TreeId:     treeId,
-		Prefix:     prefix,
-		MaxRange:   maxRange,
-		Submitters: submitters,
-		Witnesses:  witnesses,
-		Deadline:   deadline,
-		Interval:   interval,
-		HashType:   crypto.SHA256,
-		Signer:     signer,
-		LogIdBytes: logIdBytes,
+		LogId:           logId,
+		LogIdBytes:      logIdBytes,
+		LogIdStr:        fmt.Sprintf("%x", logIdBytes),
+		TreeId:          treeId,
+		Prefix:          prefix,
+		MaxRange:        maxRange,
+		SubmitterPolicy: submitterPolicy,
+		WitnessPolicy:   witnessPolicy,
+		Submitters:      submitters,
+		Witnesses:       witnesses,
+		Deadline:        deadline,
+		Interval:        interval,
+		HashType:        crypto.SHA256,
+		Signer:          signer,
 	}, nil
 }
 
@@ -56,8 +62,8 @@ func (lp *LogParameters) SignTreeHeadV1(th *types.TreeHeadV1) (*types.StItem, er
 	if err != nil {
 		return nil, fmt.Errorf("Sign failed: %v", err)
 	}
-	lastSthTimestamp.Set(float64(time.Now().Unix()), string(lp.LogIdBytes))
-	lastSthSize.Set(float64(th.TreeSize), string(lp.LogIdBytes))
+	lastSthTimestamp.Set(float64(time.Now().Unix()), lp.LogIdStr)
+	lastSthSize.Set(float64(th.TreeSize), lp.LogIdStr)
 	return &types.StItem{
 		Format: types.StFormatSignedTreeHeadV1,
 		SignedTreeHeadV1: &types.SignedTreeHeadV1{