Merge pull request #994 from mulkieran/cpalv-verify_passphrase

Cpalv verify passphrase

Author: mulkieran

src/stratis_cli/_actions/_top.py

@@ -27,6 +27,7 @@
     StratisCliKeyfileNotFoundError,
     StratisCliNameConflictError,
     StratisCliNoChangeError,
+    StratisCliPassphraseMismatchError,
     StratisCliResourceNotFoundError,
 )
 from .._stratisd_constants import ReportKey, StratisdErrors
@@ -72,6 +73,10 @@ def _add_update_key(proxy, key_desc, capture_key, *, keyfile_path):
 
     if capture_key:
         password = getpass(prompt="Enter key data followed by the return key: ")
+        verify = getpass(prompt="Verify key data entered: ")
+
+        if password != verify:
+            raise StratisCliPassphraseMismatchError()
 
         (read, write) = os.pipe()
         os.write(write, password.encode("utf-8"))

src/stratis_cli/_errors.py

@@ -500,3 +500,13 @@ def __str__(self):
             self.minimum_version,
             self.maximum_version,
         )
+
+
+class StratisCliPassphraseMismatchError(StratisCliUserError):
+    """
+    Raised if the user specified passphrase did not match
+    the verified passphrase.
+    """
+
+    def __str__(self):
+        return "Passphrases do not match"

tests/whitebox/integration/key/test_set.py

@@ -25,6 +25,7 @@
     StratisCliEngineError,
     StratisCliKeyfileNotFoundError,
     StratisCliNameConflictError,
+    StratisCliPassphraseMismatchError,
 )
 
 from .._keyutils import RandomKeyTmpFile
@@ -81,3 +82,11 @@ def test_set_key_capture_key(self):
         command_line = self._MENU + [self._KEYNAME, "--capture-key"]
         with patch.object(_top, "getpass", return_value="totally_secret"):
             TEST_RUNNER(command_line)
+
+    def test_set_key_capture_key_fail_verify(self):
+        """
+        Test capture key fails if passphrase do not match
+        """
+        command_line = self._MENU + [self._KEYNAME, "--capture-key"]
+        with patch.object(_top, "getpass", side_effect=["totally_secret", "different"]):
+            self.check_error(StratisCliPassphraseMismatchError, command_line, _ERROR)