From a574014756d3f8b80b5355654dd13907cf4a3d2e Mon Sep 17 00:00:00 2001
From: Rick Carback <rick@privategrity.com>
Date: Tue, 6 Aug 2019 00:15:28 +0000
Subject: [PATCH] disable permissioning so we have a passing test

---
 basice2e/permissioning.yaml | 6 +++++-
 basice2e/run.sh             | 2 +-
 basice2e/server-1.yaml      | 2 +-
 basice2e/server-2.yaml      | 2 +-
 basice2e/server-3.yaml      | 2 +-
 basice2e/server-4.yaml      | 2 +-
 basice2e/server-5.yaml      | 2 +-
 7 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/basice2e/permissioning.yaml b/basice2e/permissioning.yaml
index e87a22d..6923ee7 100644
--- a/basice2e/permissioning.yaml
+++ b/basice2e/permissioning.yaml
@@ -18,7 +18,11 @@ dbAddress: ""
 
 # List of Node registration codes (in order of network placement)
 registrationCodes:
-  - ""
+  - "AAAA"
+  - "BBBB"
+  - "CCCC"
+  - "DDDD"
+  - "EEEE"
 
 # === REQUIRED FOR ENABLING TLS ===
 # Path to the registration server private key file
diff --git a/basice2e/run.sh b/basice2e/run.sh
index afb4097..06be476 100755
--- a/basice2e/run.sh
+++ b/basice2e/run.sh
@@ -33,7 +33,7 @@ echo "$PERMCMD -- $PIDVAL"
 for SERVERID in $(seq 5 -1 1)
 do
     IDX=$(($SERVERID - 1))
-    SERVERCMD="../bin/server -v -i $IDX --roundBufferTimeout 300s --config server-$SERVERID.yaml --keyPairOverride dsa.json"
+    SERVERCMD="../bin/server --disablePermissioning -v -i $IDX --roundBufferTimeout 300s --config server-$SERVERID.yaml --keyPairOverride dsa.json"
     if [ $SERVERID -eq 4 ]; then
         sleep 15 # This will force a CDE timeout
     fi
diff --git a/basice2e/server-1.yaml b/basice2e/server-1.yaml
index 88ad75f..96d144f 100644
--- a/basice2e/server-1.yaml
+++ b/basice2e/server-1.yaml
@@ -43,7 +43,7 @@ permissioning:
   paths:
     cert: ""
   address: "localhost:18000"
-  registrationCode: ""
+  registrationCode: "AAAA"
   publicKey: "-----BEGIN PUBLIC KEY-----\nMIIDNTCCAiwCggEBAJ22+1lRtmu2/h4UDx0s5VAjdBYf1lON8WSCGGQvC1xIyPek\nGq36GHMkuHZ0+hgisA8ez4E2lD18VXVyZOWhpE/+AS6ZNuAMHT6TELAcfReYBdMF\niyqfS7b5cWv+YRfGtbPMTZvjQRBK1KgK1slOAF9LmT4U8JHrUXQ78zBQw43iNVZ+\nGzTD1qXAzqoaDzaCE8PRmEPQtLCdy5/HLTnI3kHxvxTUu0Vjyig3FiHK0zJLai05\nIUW+v6x0iAUjb1yi/pK4cc2PnDbTKStVCcqMqneirfx7/XfdpvcRJadFb+oVPkMy\nVqImHGoG7TaTeX55lfrVqrvPvj7aJ0HjdUBK4lsCIQDywxGTdM52yTVpkLRlN0oX\n8j+e01CJvZafYcbd6ZmMHwKCAQBcf/awb48UP+gohDNJPkdpxNmIrOW+JaDiSAln\nBxbGE9ewzuaTL4+qfETSyyRSPaU/vk9uw1lYktGqWMQyigbEahVmLn6qcDod7Pi7\nstBdvi65VsFCozhmHRBGHA0TVHIIUFfzSUMJ/6c8YR94syrbtXQMNhyfNb6QmX2y\nAU4u9apheC9Sq+uL1kMsTdCXvFQjsoXa+2DcNk6BYfSio1rKOhCxxNIDzHakcKM6\n/cvdkpWYWavYtW4XJSUteOrGbnG6muPx3SSHGZh0OTzU2DIYaABlR2Dh40wJ5NFV\nF5+ewNxEc/mWvc5u7Ryr7YtvEW962c9QXfD5mONKsnUUsP/nAoIBAQCTyv8fEcAA\nD0B3f5owQ9YTkIelBuTfRYSSTlprDw7cvvAtB72N+Mqv7v+eHgwZgp8litEn/l2n\nr8eI1UODFgBiOXq7INgKjDSu1zM4FcFJ2O6pCcF0NgJGWgfVTLuS6nW0kgAss9rj\nHSkRkJjHTbixeNSruFcqZ4B5CMtgyJKa4LajIlbet/+XPbs4GlaF6M8e0RKbuA3Q\nbbnSHwQDj7A9i4CvAbQKsGu8HFGFpBl+rqJ5YA4wqS9HhWcMgmCZCcKtGeRcXaoq\nsxaBsbk13sZHgUnJ3f2W2F1qR2D+Q9XC1NM9tc3GtgFQKFwxvUMFGOTKZziaJP2z\nk/AYVzv2LJ6N\n-----END PUBLIC KEY-----\n"
 groups:
   cmix:
diff --git a/basice2e/server-2.yaml b/basice2e/server-2.yaml
index 5a9cfe9..c51f802 100644
--- a/basice2e/server-2.yaml
+++ b/basice2e/server-2.yaml
@@ -43,7 +43,7 @@ permissioning:
   paths:
     cert: ""
   address: "localhost:18000"
-  registrationCode: ""
+  registrationCode: "BBBB"
   publicKey: "-----BEGIN PUBLIC KEY-----\nMIIDNTCCAiwCggEBAJ22+1lRtmu2/h4UDx0s5VAjdBYf1lON8WSCGGQvC1xIyPek\nGq36GHMkuHZ0+hgisA8ez4E2lD18VXVyZOWhpE/+AS6ZNuAMHT6TELAcfReYBdMF\niyqfS7b5cWv+YRfGtbPMTZvjQRBK1KgK1slOAF9LmT4U8JHrUXQ78zBQw43iNVZ+\nGzTD1qXAzqoaDzaCE8PRmEPQtLCdy5/HLTnI3kHxvxTUu0Vjyig3FiHK0zJLai05\nIUW+v6x0iAUjb1yi/pK4cc2PnDbTKStVCcqMqneirfx7/XfdpvcRJadFb+oVPkMy\nVqImHGoG7TaTeX55lfrVqrvPvj7aJ0HjdUBK4lsCIQDywxGTdM52yTVpkLRlN0oX\n8j+e01CJvZafYcbd6ZmMHwKCAQBcf/awb48UP+gohDNJPkdpxNmIrOW+JaDiSAln\nBxbGE9ewzuaTL4+qfETSyyRSPaU/vk9uw1lYktGqWMQyigbEahVmLn6qcDod7Pi7\nstBdvi65VsFCozhmHRBGHA0TVHIIUFfzSUMJ/6c8YR94syrbtXQMNhyfNb6QmX2y\nAU4u9apheC9Sq+uL1kMsTdCXvFQjsoXa+2DcNk6BYfSio1rKOhCxxNIDzHakcKM6\n/cvdkpWYWavYtW4XJSUteOrGbnG6muPx3SSHGZh0OTzU2DIYaABlR2Dh40wJ5NFV\nF5+ewNxEc/mWvc5u7Ryr7YtvEW962c9QXfD5mONKsnUUsP/nAoIBAQCTyv8fEcAA\nD0B3f5owQ9YTkIelBuTfRYSSTlprDw7cvvAtB72N+Mqv7v+eHgwZgp8litEn/l2n\nr8eI1UODFgBiOXq7INgKjDSu1zM4FcFJ2O6pCcF0NgJGWgfVTLuS6nW0kgAss9rj\nHSkRkJjHTbixeNSruFcqZ4B5CMtgyJKa4LajIlbet/+XPbs4GlaF6M8e0RKbuA3Q\nbbnSHwQDj7A9i4CvAbQKsGu8HFGFpBl+rqJ5YA4wqS9HhWcMgmCZCcKtGeRcXaoq\nsxaBsbk13sZHgUnJ3f2W2F1qR2D+Q9XC1NM9tc3GtgFQKFwxvUMFGOTKZziaJP2z\nk/AYVzv2LJ6N\n-----END PUBLIC KEY-----\n"
 groups:
   cmix:
diff --git a/basice2e/server-3.yaml b/basice2e/server-3.yaml
index 519b137..8bd743e 100644
--- a/basice2e/server-3.yaml
+++ b/basice2e/server-3.yaml
@@ -43,7 +43,7 @@ permissioning:
   paths:
     cert: ""
   address: "localhost:18000"
-  registrationCode: ""
+  registrationCode: "CCCC"
   publicKey: "-----BEGIN PUBLIC KEY-----\nMIIDNTCCAiwCggEBAJ22+1lRtmu2/h4UDx0s5VAjdBYf1lON8WSCGGQvC1xIyPek\nGq36GHMkuHZ0+hgisA8ez4E2lD18VXVyZOWhpE/+AS6ZNuAMHT6TELAcfReYBdMF\niyqfS7b5cWv+YRfGtbPMTZvjQRBK1KgK1slOAF9LmT4U8JHrUXQ78zBQw43iNVZ+\nGzTD1qXAzqoaDzaCE8PRmEPQtLCdy5/HLTnI3kHxvxTUu0Vjyig3FiHK0zJLai05\nIUW+v6x0iAUjb1yi/pK4cc2PnDbTKStVCcqMqneirfx7/XfdpvcRJadFb+oVPkMy\nVqImHGoG7TaTeX55lfrVqrvPvj7aJ0HjdUBK4lsCIQDywxGTdM52yTVpkLRlN0oX\n8j+e01CJvZafYcbd6ZmMHwKCAQBcf/awb48UP+gohDNJPkdpxNmIrOW+JaDiSAln\nBxbGE9ewzuaTL4+qfETSyyRSPaU/vk9uw1lYktGqWMQyigbEahVmLn6qcDod7Pi7\nstBdvi65VsFCozhmHRBGHA0TVHIIUFfzSUMJ/6c8YR94syrbtXQMNhyfNb6QmX2y\nAU4u9apheC9Sq+uL1kMsTdCXvFQjsoXa+2DcNk6BYfSio1rKOhCxxNIDzHakcKM6\n/cvdkpWYWavYtW4XJSUteOrGbnG6muPx3SSHGZh0OTzU2DIYaABlR2Dh40wJ5NFV\nF5+ewNxEc/mWvc5u7Ryr7YtvEW962c9QXfD5mONKsnUUsP/nAoIBAQCTyv8fEcAA\nD0B3f5owQ9YTkIelBuTfRYSSTlprDw7cvvAtB72N+Mqv7v+eHgwZgp8litEn/l2n\nr8eI1UODFgBiOXq7INgKjDSu1zM4FcFJ2O6pCcF0NgJGWgfVTLuS6nW0kgAss9rj\nHSkRkJjHTbixeNSruFcqZ4B5CMtgyJKa4LajIlbet/+XPbs4GlaF6M8e0RKbuA3Q\nbbnSHwQDj7A9i4CvAbQKsGu8HFGFpBl+rqJ5YA4wqS9HhWcMgmCZCcKtGeRcXaoq\nsxaBsbk13sZHgUnJ3f2W2F1qR2D+Q9XC1NM9tc3GtgFQKFwxvUMFGOTKZziaJP2z\nk/AYVzv2LJ6N\n-----END PUBLIC KEY-----\n"
 groups:
   cmix:
diff --git a/basice2e/server-4.yaml b/basice2e/server-4.yaml
index 29349a9..73dc374 100644
--- a/basice2e/server-4.yaml
+++ b/basice2e/server-4.yaml
@@ -43,7 +43,7 @@ permissioning:
   paths:
     cert: ""
   address: "localhost:18000"
-  registrationCode: ""
+  registrationCode: "DDDD"
   publicKey: "-----BEGIN PUBLIC KEY-----\nMIIDNTCCAiwCggEBAJ22+1lRtmu2/h4UDx0s5VAjdBYf1lON8WSCGGQvC1xIyPek\nGq36GHMkuHZ0+hgisA8ez4E2lD18VXVyZOWhpE/+AS6ZNuAMHT6TELAcfReYBdMF\niyqfS7b5cWv+YRfGtbPMTZvjQRBK1KgK1slOAF9LmT4U8JHrUXQ78zBQw43iNVZ+\nGzTD1qXAzqoaDzaCE8PRmEPQtLCdy5/HLTnI3kHxvxTUu0Vjyig3FiHK0zJLai05\nIUW+v6x0iAUjb1yi/pK4cc2PnDbTKStVCcqMqneirfx7/XfdpvcRJadFb+oVPkMy\nVqImHGoG7TaTeX55lfrVqrvPvj7aJ0HjdUBK4lsCIQDywxGTdM52yTVpkLRlN0oX\n8j+e01CJvZafYcbd6ZmMHwKCAQBcf/awb48UP+gohDNJPkdpxNmIrOW+JaDiSAln\nBxbGE9ewzuaTL4+qfETSyyRSPaU/vk9uw1lYktGqWMQyigbEahVmLn6qcDod7Pi7\nstBdvi65VsFCozhmHRBGHA0TVHIIUFfzSUMJ/6c8YR94syrbtXQMNhyfNb6QmX2y\nAU4u9apheC9Sq+uL1kMsTdCXvFQjsoXa+2DcNk6BYfSio1rKOhCxxNIDzHakcKM6\n/cvdkpWYWavYtW4XJSUteOrGbnG6muPx3SSHGZh0OTzU2DIYaABlR2Dh40wJ5NFV\nF5+ewNxEc/mWvc5u7Ryr7YtvEW962c9QXfD5mONKsnUUsP/nAoIBAQCTyv8fEcAA\nD0B3f5owQ9YTkIelBuTfRYSSTlprDw7cvvAtB72N+Mqv7v+eHgwZgp8litEn/l2n\nr8eI1UODFgBiOXq7INgKjDSu1zM4FcFJ2O6pCcF0NgJGWgfVTLuS6nW0kgAss9rj\nHSkRkJjHTbixeNSruFcqZ4B5CMtgyJKa4LajIlbet/+XPbs4GlaF6M8e0RKbuA3Q\nbbnSHwQDj7A9i4CvAbQKsGu8HFGFpBl+rqJ5YA4wqS9HhWcMgmCZCcKtGeRcXaoq\nsxaBsbk13sZHgUnJ3f2W2F1qR2D+Q9XC1NM9tc3GtgFQKFwxvUMFGOTKZziaJP2z\nk/AYVzv2LJ6N\n-----END PUBLIC KEY-----\n"
 groups:
   cmix:
diff --git a/basice2e/server-5.yaml b/basice2e/server-5.yaml
index f81fabb..f4de53c 100644
--- a/basice2e/server-5.yaml
+++ b/basice2e/server-5.yaml
@@ -43,7 +43,7 @@ permissioning:
   paths:
     cert: ""
   address: "localhost:18000"
-  registrationCode: ""
+  registrationCode: "EEEE"
   publicKey: "-----BEGIN PUBLIC KEY-----\nMIIDNTCCAiwCggEBAJ22+1lRtmu2/h4UDx0s5VAjdBYf1lON8WSCGGQvC1xIyPek\nGq36GHMkuHZ0+hgisA8ez4E2lD18VXVyZOWhpE/+AS6ZNuAMHT6TELAcfReYBdMF\niyqfS7b5cWv+YRfGtbPMTZvjQRBK1KgK1slOAF9LmT4U8JHrUXQ78zBQw43iNVZ+\nGzTD1qXAzqoaDzaCE8PRmEPQtLCdy5/HLTnI3kHxvxTUu0Vjyig3FiHK0zJLai05\nIUW+v6x0iAUjb1yi/pK4cc2PnDbTKStVCcqMqneirfx7/XfdpvcRJadFb+oVPkMy\nVqImHGoG7TaTeX55lfrVqrvPvj7aJ0HjdUBK4lsCIQDywxGTdM52yTVpkLRlN0oX\n8j+e01CJvZafYcbd6ZmMHwKCAQBcf/awb48UP+gohDNJPkdpxNmIrOW+JaDiSAln\nBxbGE9ewzuaTL4+qfETSyyRSPaU/vk9uw1lYktGqWMQyigbEahVmLn6qcDod7Pi7\nstBdvi65VsFCozhmHRBGHA0TVHIIUFfzSUMJ/6c8YR94syrbtXQMNhyfNb6QmX2y\nAU4u9apheC9Sq+uL1kMsTdCXvFQjsoXa+2DcNk6BYfSio1rKOhCxxNIDzHakcKM6\n/cvdkpWYWavYtW4XJSUteOrGbnG6muPx3SSHGZh0OTzU2DIYaABlR2Dh40wJ5NFV\nF5+ewNxEc/mWvc5u7Ryr7YtvEW962c9QXfD5mONKsnUUsP/nAoIBAQCTyv8fEcAA\nD0B3f5owQ9YTkIelBuTfRYSSTlprDw7cvvAtB72N+Mqv7v+eHgwZgp8litEn/l2n\nr8eI1UODFgBiOXq7INgKjDSu1zM4FcFJ2O6pCcF0NgJGWgfVTLuS6nW0kgAss9rj\nHSkRkJjHTbixeNSruFcqZ4B5CMtgyJKa4LajIlbet/+XPbs4GlaF6M8e0RKbuA3Q\nbbnSHwQDj7A9i4CvAbQKsGu8HFGFpBl+rqJ5YA4wqS9HhWcMgmCZCcKtGeRcXaoq\nsxaBsbk13sZHgUnJ3f2W2F1qR2D+Q9XC1NM9tc3GtgFQKFwxvUMFGOTKZziaJP2z\nk/AYVzv2LJ6N\n-----END PUBLIC KEY-----\n"
 groups:
   cmix:
-- 
GitLab