diff --git a/homeassistant/components/device_tracker/aruba.py b/homeassistant/components/device_tracker/aruba.py index 82183e1495c..6d94ad30d04 100644 --- a/homeassistant/components/device_tracker/aruba.py +++ b/homeassistant/components/device_tracker/aruba.py @@ -11,7 +11,6 @@ import logging from datetime import timedelta import re import threading -import telnetlib from homeassistant.const import CONF_HOST, CONF_USERNAME, CONF_PASSWORD from homeassistant.helpers import validate_config @@ -21,6 +20,7 @@ from homeassistant.components.device_tracker import DOMAIN # Return cached results if last scan was less then this time ago MIN_TIME_BETWEEN_SCANS = timedelta(seconds=10) +REQUIREMENTS = ['pexpect==4.0.1'] _LOGGER = logging.getLogger(__name__) _DEVICES_REGEX = re.compile( @@ -44,6 +44,7 @@ def get_scanner(hass, config): class ArubaDeviceScanner(object): """ This class queries a Aruba Acces Point for connected devices. """ + def __init__(self, config): self.host = config[CONF_HOST] self.username = config[CONF_USERNAME] @@ -93,23 +94,39 @@ class ArubaDeviceScanner(object): def get_aruba_data(self): """ Retrieve data from Aruba Access Point and return parsed result. """ - try: - telnet = telnetlib.Telnet(self.host) - telnet.read_until(b'User: ') - telnet.write((self.username + '\r\n').encode('ascii')) - telnet.read_until(b'Password: ') - telnet.write((self.password + '\r\n').encode('ascii')) - telnet.read_until(b'#') - telnet.write(('show clients\r\n').encode('ascii')) - devices_result = telnet.read_until(b'#').split(b'\r\n') - telnet.write('exit\r\n'.encode('ascii')) - except EOFError: - _LOGGER.exception("Unexpected response from router") + + import pexpect + connect = "ssh {}@{}" + ssh = pexpect.spawn(connect.format(self.username, self.host)) + query = ssh.expect(['password:', pexpect.TIMEOUT, pexpect.EOF, + 'continue connecting (yes/no)?', + 'Host key verification failed.', + 'Connection refused', + 'Connection timed out'], timeout=120) + if query == 1: + _LOGGER.error("Timeout") return - except ConnectionRefusedError: - _LOGGER.exception("Connection refused by router," + - " is telnet enabled?") + elif query == 2: + _LOGGER.error("Unexpected response from router") return + elif query == 3: + ssh.sendline('yes') + ssh.expect('password:') + elif query == 4: + _LOGGER.error("Host key Changed") + return + elif query == 5: + _LOGGER.error("Connection refused by server") + return + elif query == 6: + _LOGGER.error("Connection timed out") + return + ssh.sendline(self.password) + ssh.expect('#') + ssh.sendline('show clients') + ssh.expect('#') + devices_result = ssh.before.split(b'\r\n') + ssh.sendline('exit') devices = {} for device in devices_result: @@ -119,5 +136,5 @@ class ArubaDeviceScanner(object): 'ip': match.group('ip'), 'mac': match.group('mac').upper(), 'name': match.group('name') - } + } return devices diff --git a/requirements_all.txt b/requirements_all.txt index 8435ffd01d5..9e0e159a1d2 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -114,6 +114,9 @@ orvibo==1.1.1 # homeassistant.components.mqtt paho-mqtt==1.1 +# homeassistant.components.device_tracker.aruba +pexpect==4.0.1 + # homeassistant.components.light.hue phue==0.8