commit df88a2e37bc4769dc941e797e5fcb6167bcef150
author Asim Shankar <ashankar@google.com> Tue Oct 21 17:20:28 2014 -0700
committer Asim Shankar <ashankar@google.com> Tue Oct 21 17:20:30 2014 -0700
tree 9766ae8fa69af378cca9390a13e1ed1e5ea6dbe8
parent 9c374c2abd55344750c8b095cccbc12c6cb59dcd

veyron/tools/principal: Dump out certificate details in `dumpblessings`

Change-Id: I0fa353dd9c9084a7de429ffa7d9d1e7076b54ec1

tools/principal/test.sh

diff --git a/tools/principal/test.sh b/tools/principal/test.sh
index d0a18d0..72eb84a 100755
--- a/tools/principal/test.sh
+++ b/tools/principal/test.sh
@@ -21,8 +21,12 @@
     sed -e "s/\([0-9a-f]\{2\}:\)\{15\}[0-9a-f]\{2\}/XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX/g"
 }
 
+rmcaveats() {
+    sed -e "s/security.unixTimeExpiryCaveat([^)]*)/security.unixTimeExpiryCaveat/"
+}
+
 dumpblessings() {
-    ./principal dumpblessings "$1" | rmpublickey
+    ./principal dumpblessings "$1" | rmpublickey | rmcaveats
 }
 
 main() {
@@ -68,7 +72,9 @@
   cat >want <<EOF
 Blessings          : alicereborn(0 caveats)
 PublicKey          : XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX
-Certificates       : 1 chains with (#certificates, #caveats) = (1, 0)
+Certificate chains : 1
+Chain #0 (1 certificates). Root certificate public key: XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX
+  Certificate #0: alicereborn with 0 caveats
 EOF
   if ! diff got want; then
   	shell_test::fail "line ${LINENO}"
@@ -78,7 +84,11 @@
   cat >want <<EOF
 Blessings          : alice/friend(1 caveats)
 PublicKey          : XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX
-Certificates       : 1 chains with (#certificates, #caveats) = (2, 1)
+Certificate chains : 1
+Chain #0 (2 certificates). Root certificate public key: XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX
+  Certificate #0: alice with 0 caveats
+  Certificate #1: friend with 1 caveat
+    (0) security.unixTimeExpiryCaveat
 EOF
   if ! diff got want; then
 	shell_test::fail "line ${LINENO}"
@@ -88,7 +98,13 @@
   cat >want <<EOF
 Blessings          : bob(0 caveats)#alice/friend(1 caveats)
 PublicKey          : XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX
-Certificates       : 2 chains with (#certificates, #caveats) = (1, 0) + (2, 1)
+Certificate chains : 2
+Chain #0 (1 certificates). Root certificate public key: XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX
+  Certificate #0: bob with 0 caveats
+Chain #1 (2 certificates). Root certificate public key: XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX:XX
+  Certificate #0: alice with 0 caveats
+  Certificate #1: friend with 1 caveat
+    (0) security.unixTimeExpiryCaveat
 EOF
   if ! diff got want; then
 	shell_test::fail "line ${LINENO}"