Skip to content

Improve exception messages on credential mismatches #1417

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sdb9696 merged 1 commit into from
Jan 4, 2025
Merged

Improve exception messages on credential mismatches #1417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions kasa/transports/klaptransport.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,8 +214,8 @@ async def perform_handshake1(self) -> tuple[bytes, bytes, bytes]:

if default_credentials_seed_auth_hash == server_hash:
_LOGGER.debug(
"Server response doesn't match our expected hash on ip %s, "
"but an authentication with %s default credentials matched",
"Device response did not match our expected hash on ip %s,"
"but an authentication with %s default credentials worked",
self._host,
key,
)
Expand All @@ -235,13 +235,16 @@ async def perform_handshake1(self) -> tuple[bytes, bytes, bytes]:

if blank_seed_auth_hash == server_hash:
_LOGGER.debug(
"Server response doesn't match our expected hash on ip %s, "
"but an authentication with blank credentials matched",
"Device response did not match our expected hash on ip %s, "
"but an authentication with blank credentials worked",
self._host,
)
return local_seed, remote_seed, self._blank_auth_hash # type: ignore

msg = f"Server response doesn't match our challenge on ip {self._host}"
msg = (
f"Device response did not match our challenge on ip {self._host}, "
f"check that your e-mail and password (both case-sensitive) are correct. "
)
_LOGGER.debug(msg)
raise AuthenticationError(msg)

Expand Down
5 changes: 4 additions & 1 deletion kasa/transports/sslaestransport.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,10 @@ async def perform_handshake1(self) -> tuple[str, str, str] | None:
_LOGGER.debug("Credentials match")
return local_nonce, server_nonce, pwd_hash

msg = f"Server response doesn't match our challenge on ip {self._host}"
msg = (
f"Device response did not match our challenge on ip {self._host}, "
f"check that your e-mail and password (both case-sensitive) are correct. "
)
_LOGGER.debug(msg)

raise AuthenticationError(msg)
Expand Down
Loading