Mirrored_Repos/python-kasa
1
0
Fork 0
mirror of https://github.com/python-kasa/python-kasa.git synced 2025-11-05 23:21:56 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Cleanup credentials handling (#605)

Browse Source 
* credentials: don't allow none to simplify checks

* Implement __bool__ for credentials

* Cleanup klaptransport cred usage

* Cleanup deviceconfig and tapodevice

* fix linting

* Pass dummy credentials for tests

* Remove __bool__ dunder and add docs to credentials

* Check for cred noneness in tapodevice.update()
This commit is contained in:
Teemu R
2024-01-03 19:26:52 +01:00
committed by GitHub
parent 10fc2c3c54
commit 30c4e6a6a3
7 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
kasa/klaptransport.py
View File

@@ -221,7 +221,8 @@ class KlapTransport(BaseTransport):
return local_seed, remote_seed, self._kasa_setup_auth_hash # type: ignore
# Finally check against blank credentials if not already blank
if self._credentials != (blank_creds := Credentials(username="", password="")):
blank_creds = Credentials()
if self._credentials != blank_creds:
if not self._blank_auth_hash:
self._blank_auth_hash = self.generate_auth_hash(blank_creds)
@@ -369,8 +370,8 @@ class KlapTransport(BaseTransport):
@staticmethod
def generate_auth_hash(creds: Credentials):
"""Generate an md5 auth hash for the protocol on the supplied credentials."""
un = creds.username or ""
pw = creds.password or ""
un = creds.username
pw = creds.password
return md5(md5(un.encode()) + md5(pw.encode()))
@@ -391,7 +392,7 @@ class KlapTransport(BaseTransport):
@staticmethod
def generate_owner_hash(creds: Credentials):
"""Return the MD5 hash of the username in this object."""
un = creds.username or ""
un = creds.username
return md5(un.encode())
@@ -401,8 +402,8 @@ class KlapTransportV2(KlapTransport):
@staticmethod
def generate_auth_hash(creds: Credentials):
"""Generate an md5 auth hash for the protocol on the supplied credentials."""
un = creds.username or ""
pw = creds.password or ""
un = creds.username
pw = creds.password
return _sha256(_sha1(un.encode()) + _sha1(pw.encode()))