Skip to content

Log out of TP-Link router after devices are recorded. #7289

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
robbiet480 merged 8 commits into from
May 5, 2017
Merged

Log out of TP-Link router after devices are recorded. #7289

Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2d5da3e
Catch `KeyError`; Add `response.text` to error message
jminardi Apr 25, 2017
450fd7f
Log out of router admin interface after devices are recorded.
jminardi Apr 25, 2017
943861a
Remove unused var
jminardi Apr 25, 2017
8bf1c21
Add space
jminardi Apr 25, 2017
b6827ce
Use throwaray variable name
jminardi May 1, 2017
dd7690f
Use % formatting
jminardi May 1, 2017
bc05598
Dont add two strings inside logger call
jminardi May 1, 2017
7a24e21
Try again to pass string to error msg
jminardi May 1, 2017
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
21 changes: 19 additions & 2 deletions homeassistant/components/device_tracker/tplink.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ def __init__(self, config):
def scan_devices(self):
"""Scan for new devices and return a list with found device IDs."""
self._update_info()
self._log_out()
return self.last_results.keys()

# pylint: disable=no-self-use
Expand Down Expand Up @@ -195,8 +196,9 @@ def _get_auth_tokens(self):
self.sysauth = regex_result.group(1)
_LOGGER.info(self.sysauth)
return True
except ValueError:
_LOGGER.error("Couldn't fetch auth tokens!")
except (ValueError, KeyError) as e:
_LOGGER.error("Couldn't fetch auth tokens!"
"Response was: {}".format(response.text))
return False

@Throttle(MIN_TIME_BETWEEN_SCANS)
Expand Down Expand Up @@ -250,6 +252,21 @@ def _update_info(self):

return False

def _log_out(self):
with self.lock:
_LOGGER.info("Logging out of router admin interface...")

url = ('http://{}/cgi-bin/luci/;stok={}/admin/system?'
'form=logout').format(self.host, self.stok)
referer = 'http://{}/webpages/index.html'.format(self.host)

response = requests.post(url,

@houndci-bot houndci-bot Apr 25, 2017

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

local variable 'response' is assigned to but never used

@jminardi jminardi Apr 25, 2017

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

params={'operation': 'write'},
headers={'referer': referer},
cookies={'sysauth': self.sysauth})
self.stok = ''
self.sysauth = ''


class Tplink4DeviceScanner(TplinkDeviceScanner):
"""This class queries an Archer C7 router with TP-Link firmware 150427."""
Expand Down