forked from greencoder/easysafe-python
-
Notifications
You must be signed in to change notification settings - Fork 48
Handle forbidden auth check with token user ID #1159
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.
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
Open
davidrimshnick
wants to merge
2
commits into
bachya:dev
Choose a base branch
from
davidrimshnick:agent/handle-authcheck-403
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,9 +4,10 @@ | |
|
|
||
| import asyncio | ||
| import sys | ||
| from base64 import urlsafe_b64decode | ||
| from collections.abc import Awaitable, Callable | ||
| from datetime import datetime | ||
| from json.decoder import JSONDecodeError | ||
| from json import JSONDecodeError, loads | ||
| from typing import Any, cast | ||
|
|
||
| import backoff | ||
|
|
@@ -39,6 +40,7 @@ | |
| DEFAULT_MEDIA_RETRIES = 4 | ||
| DEFAULT_TIMEOUT = 10 | ||
| DEFAULT_TOKEN_EXPIRATION_WINDOW = 5 | ||
| USER_ID_CLAIM = "http://simplisafe.com/uid" | ||
|
|
||
|
|
||
| class API: # pylint: disable=too-many-instance-attributes | ||
|
|
@@ -199,10 +201,41 @@ async def _async_handle_on_backoff(self, _: dict[str, Any]) -> None: | |
|
|
||
| async def _async_post_init(self) -> None: | ||
| """Perform some post-init actions.""" | ||
| auth_check_resp = await self._async_api_request("get", "api/authCheck") | ||
| self.user_id = auth_check_resp["userId"] | ||
| try: | ||
| auth_check_resp = await self._async_api_request("get", "api/authCheck") | ||
| except ClientResponseError as err: | ||
| if ( | ||
| err.status != 403 | ||
| or not self.access_token | ||
| or (user_id := self._user_id_from_access_token(self.access_token)) | ||
| is None | ||
| ): | ||
| raise | ||
|
|
||
| LOGGER.debug( | ||
| "Authorization check returned 403; using user ID from access token" | ||
| ) | ||
| self.user_id = user_id | ||
| else: | ||
| self.user_id = auth_check_resp["userId"] | ||
| self.websocket = WebsocketClient(self) | ||
|
|
||
| @staticmethod | ||
| def _user_id_from_access_token(access_token: str) -> int | None: | ||
| """Extract the SimpliSafe user ID from an access token.""" | ||
| try: | ||
| encoded_payload = access_token.split(".")[1] | ||
| padding = "=" * (-len(encoded_payload) % 4) | ||
| payload = loads(urlsafe_b64decode(encoded_payload + padding)) | ||
| return int(payload[USER_ID_CLAIM]) | ||
| except ( | ||
| IndexError, | ||
| KeyError, | ||
| TypeError, | ||
| ValueError, | ||
|
Owner
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Feels odd that we're catching a large-ish subset of multiple core exception types. |
||
| ): | ||
| return None | ||
|
|
||
| async def _async_api_request( | ||
| self, method: str, endpoint: str, url_base: str = API_URL_BASE, **kwargs: Any | ||
| ) -> dict[str, Any]: | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This ternary is really confusing to follow. I would consider catching each scneario and raising the exception with a different message.