From 970b94bfa79760695fb8848f51d8ee345c7d4e57 Mon Sep 17 00:00:00 2001 From: Andre Basche Date: Wed, 12 Apr 2023 19:14:14 +0200 Subject: [PATCH] Fix unclear session errors --- pyhon/connection/auth.py | 59 +++++++++++++++++++++++-------------- pyhon/connection/handler.py | 18 ++++------- pyhon/exceptions.py | 4 +++ setup.py | 2 +- 4 files changed, 47 insertions(+), 36 deletions(-) diff --git a/pyhon/connection/auth.py b/pyhon/connection/auth.py index 603eeb7..c488fc7 100644 --- a/pyhon/connection/auth.py +++ b/pyhon/connection/auth.py @@ -9,8 +9,7 @@ from urllib.parse import quote from yarl import URL -from pyhon import const -from pyhon.exceptions import HonAuthenticationError +from pyhon import const, exceptions _LOGGER = logging.getLogger(__name__) @@ -51,7 +50,7 @@ class HonAuth: result += f"{15 * '='} Response {15 * '='}\n{await response.text()}\n{40 * '='}" _LOGGER.error(result) if fail: - raise HonAuthenticationError("Can't login") + raise exceptions.HonAuthenticationError("Can't login") async def _load_login(self): nonce = secrets.token_hex(16) @@ -71,7 +70,11 @@ class HonAuth: f"{const.AUTH_API}/services/oauth2/authorize/expid_Login?{params}" ) as response: self._called_urls.append((response.status, response.request_info.url)) - if not (login_url := re.findall("url = '(.+?)'", await response.text())): + text = await response.text() + if not (login_url := re.findall("url = '(.+?)'", text)): + if "oauth/done#access_token=" in text: + self._parse_token_data(text) + raise exceptions.HonNoAuthenticationNeeded() await self._error_logger(response) return False async with self._session.get(login_url[0], allow_redirects=False) as redirect1: @@ -156,6 +159,14 @@ class HonAuth: await self._error_logger(response) return "" + def _parse_token_data(self, text): + if access_token := re.findall("access_token=(.*?)&", text): + self._access_token = access_token[0] + if refresh_token := re.findall("refresh_token=(.*?)&", text): + self._refresh_token = refresh_token[0] + if id_token := re.findall("id_token=(.*?)&", text): + self._id_token = id_token[0] + async def _get_token(self, url): async with self._session.get(url) as response: self._called_urls.append((response.status, response.request_info.url)) @@ -179,26 +190,9 @@ class HonAuth: if response.status != 200: await self._error_logger(response) return False - text = await response.text() - if access_token := re.findall("access_token=(.*?)&", text): - self._access_token = access_token[0] - if refresh_token := re.findall("refresh_token=(.*?)&", text): - self._refresh_token = refresh_token[0] - if id_token := re.findall("id_token=(.*?)&", text): - self._id_token = id_token[0] + self._parse_token_data(await response.text()) return True - async def authorize(self): - if login_site := await self._load_login(): - fw_uid, loaded, login_url = login_site - else: - return False - if not (url := await self._login(fw_uid, loaded, login_url)): - return False - if not await self._get_token(url): - return False - return await self._api_auth() - async def _api_auth(self): post_headers = {"id-token": self._id_token} data = self._device.get() @@ -214,6 +208,20 @@ class HonAuth: self._cognito_token = json_data["cognitoUser"]["Token"] return True + async def authenticate(self): + self.clear() + try: + if not (login_site := await self._load_login()): + raise exceptions.HonAuthenticationError("Can't open login page") + if not (url := await self._login(*login_site)): + raise exceptions.HonAuthenticationError("Can't login") + if not await self._get_token(url): + raise exceptions.HonAuthenticationError("Can't get token") + if not await self._api_auth(): + raise exceptions.HonAuthenticationError("Can't get api token") + except exceptions.HonNoAuthenticationNeeded: + return + async def refresh(self): params = { "client_id": const.CLIENT_ID, @@ -231,3 +239,10 @@ class HonAuth: self._id_token = data["id_token"] self._access_token = data["access_token"] return await self._api_auth() + + def clear(self): + self._session.cookie_jar.clear_domain(const.AUTH_API.split("/")[-2]) + self._cognito_token = "" + self._id_token = "" + self._access_token = "" + self._refresh_token = "" diff --git a/pyhon/connection/handler.py b/pyhon/connection/handler.py index 0d819e5..53e45a5 100644 --- a/pyhon/connection/handler.py +++ b/pyhon/connection/handler.py @@ -57,7 +57,6 @@ class HonConnectionHandler(HonBaseConnectionHandler): raise HonAuthenticationError("An email address must be specified") if not self._password: raise HonAuthenticationError("A password address must be specified") - self._request_headers = {} @property def device(self): @@ -69,16 +68,11 @@ class HonConnectionHandler(HonBaseConnectionHandler): return self async def _check_headers(self, headers): - if ( - "cognito-token" not in self._request_headers - or "id-token" not in self._request_headers - ): - if await self._auth.authorize(): - self._request_headers["cognito-token"] = self._auth.cognito_token - self._request_headers["id-token"] = self._auth.id_token - else: - raise HonAuthenticationError("Can't login") - return self._HEADERS | headers | self._request_headers + if not (self._auth.cognito_token and self._auth.id_token): + await self._auth.authenticate() + headers["cognito-token"] = self._auth.cognito_token + headers["id-token"] = self._auth.id_token + return self._HEADERS | headers @asynccontextmanager async def _intercept(self, method, *args, loop=0, **kwargs): @@ -98,8 +92,6 @@ class HonConnectionHandler(HonBaseConnectionHandler): response.status, await response.text(), ) - self._request_headers = {} - self._session.cookie_jar.clear_domain(const.AUTH_API.split("/")[-2]) await self.create() async with self._intercept( method, *args, loop=loop + 1, **kwargs diff --git a/pyhon/exceptions.py b/pyhon/exceptions.py index 9b6b7fa..2e6a332 100644 --- a/pyhon/exceptions.py +++ b/pyhon/exceptions.py @@ -1,2 +1,6 @@ class HonAuthenticationError(Exception): pass + + +class HonNoAuthenticationNeeded(Exception): + pass diff --git a/setup.py b/setup.py index d4711aa..b632176 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ with open("README.md", "r") as f: setup( name="pyhOn", - version="0.7.2", + version="0.7.3", author="Andre Basche", description="Control hOn devices with python", long_description=long_description,