ubus: Refresh session on Access denied #8111
Merged
Conversation
This file contains 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
homeassistant
added
merging-to-master
houndci-bot
reviewed
Jun 19, 2017
| @@ -142,6 +165,11 @@ def _req_json_rpc(url, session_id, rpcmethod, subsystem, method, **params): | |||
|
|
|||
| if res.status_code == 200: | |||
| response = res.json() | |||
| if 'error' in response: | |||
| if 'message' in response['error'] and response['error']['message'] == "Access denied": | |||
There was a problem hiding this comment.
line too long (98 > 79 characters)
|
|
||
| self.parse_api_pattern = re.compile(r"(?P<param>\w*) = (?P<value>.*);") | ||
| self.lock = threading.Lock() | ||
| self.last_results = {} | ||
| self.url = 'http://{}/ubus'.format(host) | ||
|
|
||
| self.session_id = _get_session_id(self.url, username, password) | ||
| self.session_id = _get_session_id(self.url, self.username, self.password) |
There was a problem hiding this comment.
line too long (81 > 79 characters)
| except PermissionError: | ||
| _LOGGER.warn("Invalid session detected." + | ||
| " Tryign to refresh session_id and re-run the rpc") | ||
| self.session_id = _get_session_id(self.url, self.username, self.password) |
There was a problem hiding this comment.
line too long (85 > 79 characters)
| return fn(self, *args, **kwargs) | ||
| except PermissionError: | ||
| _LOGGER.warn("Invalid session detected." + | ||
| " Tryign to refresh session_id and re-run the rpc") |
There was a problem hiding this comment.
continuation line under-indented for visual indent
|
Wops. Managed to screw up creating the PR. From the wrong branch and to the wrong branch. Tried to fix it upp but sorry for the noise. |
balloob
removed
merging-to-master
pvizeli
requested changes
Jun 20, 2017
| def _refresh_on_acccess_denied(func): | ||
| """If remove rebooted, it lost our session so rebuld one and try again.""" | ||
| # {'error': {'message': 'Access denied', 'code': -32002}, | ||
| # 'id': 1, 'jsonrpc': '2.0'} |
houndci-bot
reviewed
Jun 20, 2017
| except PermissionError: | ||
| _LOGGER.warning("Invalid session detected." + | ||
| " Tryign to refresh session_id and re-run the rpc") | ||
| self.session_id = _get_session_id(self.url, self.username, self.password) |
There was a problem hiding this comment.
line too long (85 > 79 characters)
When a openwrt router reboots, all the session ids gets invalidated. In that case we need to log in again and get a new session id. Signed-off-by: Anton Lundin <glance@acc.umu.se>
pvizeli
approved these changes
Jun 22, 2017
Merged
glance-
added a commit
to glance-/home-assistant
that referenced
this pull request
Jul 20, 2017
Back in "ubus: Refresh session on Access denied (home-assistant#8111)" I added the decorator _refresh_on_acccess_denied. Somehow that stopped multiple ubus trackers from working in parallel, and only the one first init'ed worked. Changing the order of the decorators fixes the issue but, I'm sorry to say I can't figure out why. There's some magic somewhere which I'm missing. Signed-off-by: Anton Lundin <glance@acc.umu.se>
balloob
pushed a commit
that referenced
this pull request
Jul 24, 2017
Back in "ubus: Refresh session on Access denied (#8111)" I added the decorator _refresh_on_acccess_denied. Somehow that stopped multiple ubus trackers from working in parallel, and only the one first init'ed worked. Changing the order of the decorators fixes the issue but, I'm sorry to say I can't figure out why. There's some magic somewhere which I'm missing. Signed-off-by: Anton Lundin <glance@acc.umu.se>
balloob
pushed a commit
that referenced
this pull request
Jul 24, 2017
Back in "ubus: Refresh session on Access denied (#8111)" I added the decorator _refresh_on_acccess_denied. Somehow that stopped multiple ubus trackers from working in parallel, and only the one first init'ed worked. Changing the order of the decorators fixes the issue but, I'm sorry to say I can't figure out why. There's some magic somewhere which I'm missing. Signed-off-by: Anton Lundin <glance@acc.umu.se>
dethpickle
pushed a commit
to dethpickle/home-assistant
that referenced
this pull request
Aug 18, 2017
When a openwrt router reboots, all the session ids gets invalidated. In that case we need to log in again and get a new session id. Signed-off-by: Anton Lundin <glance@acc.umu.se>
dethpickle
pushed a commit
to dethpickle/home-assistant
that referenced
this pull request
Aug 18, 2017
Back in "ubus: Refresh session on Access denied (home-assistant#8111)" I added the decorator _refresh_on_acccess_denied. Somehow that stopped multiple ubus trackers from working in parallel, and only the one first init'ed worked. Changing the order of the decorators fixes the issue but, I'm sorry to say I can't figure out why. There's some magic somewhere which I'm missing. Signed-off-by: Anton Lundin <glance@acc.umu.se>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
When a openwrt router reboots, all the session ids gets invalidated.
In that case we need to log in again and get a new session id.
Signed-off-by: Anton Lundin glance@acc.umu.se