Merge pull request #1271 from mulkieran/catch-KeyboardInterrupt-during-password-entry

Catch BaseException during password input

Author: mulkieran

src/stratis_cli/_actions/_utils.py

@@ -215,8 +215,8 @@ def get_pass(prompt: str) -> str:
     password = None
     try:
         password = sys.stdin.readline()
-    except Exception as err:  # pragma: no cover
-        if old_attrs is not None:
+    except BaseException as err:
+        if old_attrs is not None:  # pragma: no cover
             termios.tcsetattr(sys.stdin, termios.TCSAFLUSH, old_attrs)
         raise err
 

tests/integration/key/test_set.py

@@ -15,6 +15,9 @@
 Test 'set'.
 """
 
+# isort: STDLIB
+from unittest.mock import patch
+
 # isort: LOCAL
 from stratis_cli import StratisCliErrorCodes
 from stratis_cli._errors import (
@@ -127,3 +130,15 @@ def test_set_key_capture_key_empty_error(self):
             _ERROR,
             stdin="\n\n",
         )
+
+    def test_key_set_capture_key_keyboard_interrupt(self):
+        """
+        Test coverage when a KeyboardInterrupt is sent while setting a
+        passphrase. It's not possible to test that terminal is set back
+        to correct value very easily in this infrastructure; but probably
+        just exercising the code is enough.
+        """
+        command_line = self._MENU + [self._KEYNAME, "--capture-key"]
+        with patch("sys.stdin.readline", side_effect=KeyboardInterrupt):
+            with self.assertRaises(KeyboardInterrupt):
+                RUNNER(command_line)