pyheltycloud 0.2.0__tar.gz → 0.2.1__tar.gz

{pyheltycloud-0.2.0/src/pyheltycloud.egg-info → pyheltycloud-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyheltycloud
-Version: 0.2.0
+Version: 0.2.1
 Summary: Async client for the Helty cloud (hcloud) of Helty Flow VMC units
 Author: Ermanno Baschiera
 License-Expression: MIT

{pyheltycloud-0.2.0 → pyheltycloud-0.2.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyheltycloud"
-version = "0.2.0"
+version = "0.2.1"
 description = "Async client for the Helty cloud (hcloud) of Helty Flow VMC units"
 readme = "README.md"
 requires-python = ">=3.12"

{pyheltycloud-0.2.0 → pyheltycloud-0.2.1}/src/pyheltycloud/auth.py

@@ -26,6 +26,19 @@ import aiohttp
 
 from .exceptions import HeltyCloudAuthError, HeltyCloudConnectionError
 
+#: Cognito errors that mean the credentials themselves were refused. Anything
+#: else it answers with, like throttling or its own internal errors, is a
+#: passing failure: reporting it as bad credentials would send the user to
+#: re-enter a password that is still right.
+CREDENTIAL_ERRORS = frozenset(
+    {
+        "NotAuthorizedException",
+        "PasswordResetRequiredException",
+        "UserNotConfirmedException",
+        "UserNotFoundException",
+    }
+)
+
 # 3072-bit prime and generator, fixed by the Cognito protocol.
 N_HEX = (
     "FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74"
@@ -195,8 +208,11 @@ class CognitoSrpAuth:
             raise HeltyCloudConnectionError(f"{target}: unexpected answer {text[:200]}")
 
         if status != 200:
-            message = body.get("message") or body.get("__type") or str(body)
-            raise HeltyCloudAuthError(f"{target}: {message}")
+            error_type = str(body.get("__type", "")).rpartition("#")[2]
+            message = body.get("message") or error_type or str(body)
+            if error_type in CREDENTIAL_ERRORS:
+                raise HeltyCloudAuthError(f"{target}: {message}")
+            raise HeltyCloudConnectionError(f"{target}: {message}")
         return body
 
     def _password_key(self, username: str, password: str, srp_b_hex: str, salt_hex: str) -> bytes:

{pyheltycloud-0.2.0 → pyheltycloud-0.2.1/src/pyheltycloud.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyheltycloud
-Version: 0.2.0
+Version: 0.2.1
 Summary: Async client for the Helty cloud (hcloud) of Helty Flow VMC units
 Author: Ermanno Baschiera
 License-Expression: MIT

{pyheltycloud-0.2.0 → pyheltycloud-0.2.1}/tests/test_auth_flow.py

@@ -94,6 +94,38 @@ async def test_wrong_password_is_auth_error(auth: CognitoSrpAuth, cloud: FakeClo
         await auth.authenticate("user@example.com", "wrong")
 
 
+@pytest.mark.parametrize(
+    ("status", "error_type"),
+    [
+        (400, "TooManyRequestsException"),
+        (400, "LimitExceededException"),
+        (500, "InternalErrorException"),
+        (500, "com.amazonaws.cognito#InternalErrorException"),
+    ],
+)
+async def test_passing_cognito_failure_is_not_an_auth_error(
+    auth: CognitoSrpAuth, cloud: FakeCloud, status: int, error_type: str
+) -> None:
+    """Throttling or an outage must not look like a wrong password."""
+    cloud.reply_sequence(
+        COGNITO_PATH, [(200, CHALLENGE), (status, {"__type": error_type, "message": "busy"})]
+    )
+    with pytest.raises(HeltyCloudConnectionError, match="busy"):
+        await auth.authenticate("user@example.com", "secret")
+
+
+@pytest.mark.parametrize(
+    "error_type",
+    ["UserNotFoundException", "PasswordResetRequiredException", "UserNotConfirmedException"],
+)
+async def test_refused_account_is_auth_error(
+    auth: CognitoSrpAuth, cloud: FakeCloud, error_type: str
+) -> None:
+    cloud.reply(COGNITO_PATH, {"__type": error_type, "message": "refused"}, status=400)
+    with pytest.raises(HeltyCloudAuthError, match="refused"):
+        await auth.authenticate("user@example.com", "secret")
+
+
 async def test_unexpected_challenge(auth: CognitoSrpAuth, cloud: FakeCloud) -> None:
     """Should they ever enable MFA, better a clear error."""
     cloud.reply(COGNITO_PATH, {"ChallengeName": "SMS_MFA", "ChallengeParameters": {}})