From 7649c9f00b14390e08fb90a4318378058c2d0a3c Mon Sep 17 00:00:00 2001 From: Tom Limoncelli Date: Mon, 15 May 2017 11:10:01 -0400 Subject: [PATCH] Fix https://github.com/StackExchange/blackbox/issues/193 Add unit tests to tools/confidence_test.sh to verify admin operations work. --- bin/blackbox_list_admins | 2 +- tools/confidence_test.sh | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/bin/blackbox_list_admins b/bin/blackbox_list_admins index b90d7cc..465e0a4 100755 --- a/bin/blackbox_list_admins +++ b/bin/blackbox_list_admins @@ -5,4 +5,4 @@ # set -e source "${0%/*}/_blackbox_common.sh" -cat "$BB_ADMINS_FILE" +cat "$BB_ADMINS" diff --git a/tools/confidence_test.sh b/tools/confidence_test.sh index 4e69eb7..d816e73 100755 --- a/tools/confidence_test.sh +++ b/tools/confidence_test.sh @@ -84,6 +84,10 @@ PHASE 'and adds herself as an admin.' blackbox_addadmin alice@example.com git commit -m'NEW ADMIN: alice@example.com' keyrings/live/pubring.??? keyrings/live/trustdb.gpg keyrings/live/blackbox-admins.txt +make_self_deleting_tempfile adminlist1 +blackbox_list_admins >"$adminlist1" +assert_file_md5hash "$adminlist1" "aa1db827772e1d51d453b844394b7617" + PHASE 'Bob arrives.' @@ -112,6 +116,10 @@ echo '========== Bob enrolls himself too.' blackbox_addadmin bob@example.com git commit -m'NEW ADMIN: alice@example.com' keyrings/live/pubring.??? keyrings/live/trustdb.gpg keyrings/live/blackbox-admins.txt +make_self_deleting_tempfile adminlist2 +blackbox_list_admins >"$adminlist2" +assert_file_md5hash "$adminlist2" "0b82b0b3c96e6e5dd5faf60493fe5cf7" + PHASE 'Alice does the second part to enroll bob.' become_alice @@ -217,6 +225,10 @@ PHASE 'Bob removes Alice.' blackbox_removeadmin alice@example.com assert_line_not_exists 'alice@example.com' keyrings/live/blackbox-admins.txt +make_self_deleting_tempfile adminlist3 +blackbox_list_admins >"$adminlist3" +assert_file_md5hash "$adminlist3" "aadbfafd76ea66ff40dbfd239a69067f" + PHASE 'Bob reencrypts files so alice can not access them.' blackbox_update_all_files @@ -391,6 +403,10 @@ fi # Cleanup: blackbox_removeadmin abba@notarealuser.com +make_self_deleting_tempfile adminlist4 +blackbox_list_admins >"$adminlist4" +assert_file_md5hash "$adminlist4" "aadbfafd76ea66ff40dbfd239a69067f" + # TODO: Create a new directory. "git clone" the repo into it.