From 2e5f7827e836efe95e9ff4f16ee4c425a0c94ac4 Mon Sep 17 00:00:00 2001 From: Anatol Pomozov Date: Fri, 29 Oct 2021 19:04:37 -0700 Subject: [PATCH] Do not add keyboard password to fido2 test asset It simplifies the test a little bit and avoids flooding console with "Enter password" prompts. --- tests/generate_asset_systemd_fido2.sh | 2 ++ tests/integration_test.go | 5 +---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/generate_asset_systemd_fido2.sh b/tests/generate_asset_systemd_fido2.sh index b1a80af6..c6f80ab9 100644 --- a/tests/generate_asset_systemd_fido2.sh +++ b/tests/generate_asset_systemd_fido2.sh @@ -26,3 +26,5 @@ sudo mount /dev/mapper/$LUKS_DEV_NAME $dir sudo chown $USER $dir mkdir $dir/sbin cp assets/init $dir/sbin/init + +sudo cryptsetup -v luksKillSlot $lodev 0 \ No newline at end of file diff --git a/tests/integration_test.go b/tests/integration_test.go index d115f78f..b8bf1694 100644 --- a/tests/integration_test.go +++ b/tests/integration_test.go @@ -885,7 +885,7 @@ func TestBooster(t *testing.T) { checkVMState: func(vm *vmtest.Qemu, t *testing.T) { pin := "1111" // there can be multiple Yubikeys, iterate over all "Enter PIN" requests - re, err := regexp.Compile(`(Enter PIN for /dev/hidraw|Hello, booster!|Enter passphrase for luks-b12cbfef-da87-429f-ac96-7dda7232c189:)`) + re, err := regexp.Compile(`(Enter PIN for /dev/hidraw|Hello, booster!)`) require.NoError(t, err) loop: for { @@ -893,9 +893,6 @@ func TestBooster(t *testing.T) { require.NoError(t, err) switch matches[0] { - case "Enter passphrase for luks-b12cbfef-da87-429f-ac96-7dda7232c189:": - require.NoError(t, vm.ConsoleWrite("fakepassword\n")) // print something to make this prompt go away - continue loop case "Enter PIN for /dev/hidraw": require.NoError(t, vm.ConsoleWrite(pin+"\n")) case "Hello, booster!":