Merge 28d6d81 into 316c261

setup.py

@@ -53,7 +53,7 @@ def read(*parts):
     zip_safe=True,
     install_requires=[
         "click>=7.1.2",
-        "pykeepass>=3.2.0",
+        "pykeepass>=3.2.1",
         "httpx>=0.13.3",
     ],
     entry_points={"console_scripts": ["hibpcli = hibpcli.cli:main"]},

src/hibpcli/cli.py

@@ -1,7 +1,7 @@
 from typing import Optional
 
 import click
-from hibpcli.exceptions import ApiError
+from hibpcli.exceptions import ApiError, KeepassError
 from hibpcli.keepass import check_passwords_from_db
 from hibpcli.password import Password
 
@@ -23,6 +23,8 @@ def check_keepass(path: str, password: Optional[str]) -> None:
         )
     try:
         rv = check_passwords_from_db(path=path, master_password=password)
+    except KeepassError:
+        click.echo("The entered password is not correct. Please try again.")
     except ApiError as e:
         click.echo(str(e))
     else:

src/hibpcli/exceptions.py

@@ -4,3 +4,7 @@ class HibpError(Exception):
 
 class ApiError(HibpError):
     pass
+
+
+class KeepassError(HibpError):
+    pass

src/hibpcli/keepass.py

@@ -1,12 +1,20 @@
 from typing import List
 
+from hibpcli.exceptions import KeepassError
 from hibpcli.password import Password
 from pykeepass import PyKeePass  # type: ignore
+from pykeepass.exceptions import CredentialsError
 
 
 def check_passwords_from_db(path: str, master_password: str) -> List[str]:
     """ - """
-    kp = PyKeePass(path, password=master_password)
-    return [
-        entry for entry in kp.entries if Password(password=entry.password).is_leaked()
-    ]
+    try:
+        kp = PyKeePass(path, password=master_password)
+    except CredentialsError:
+        raise KeepassError
+    else:
+        return [
+            entry
+            for entry in kp.entries
+            if Password(password=entry.password).is_leaked()
+        ]

tests/test_cli_for_check_keepass.py

@@ -80,3 +80,11 @@ def test_keepass_subcommand_error_handling(mock_password):
     )
     expected_output = "Error\n"
     assert result.output == expected_output
+
+
+def test_keepass_wrong_password():
+    runner = CliRunner()
+    result = runner.invoke(
+        main, ["check-keepass", "tests/test.kdbx", "--password", "wrong-password"]
+    )
+    assert result.output == "The entered password is not correct. Please try again.\n"