Upstream/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-11-22 11:47:30 +01:00
Code Issues Projects Releases Wiki Activity

Fix dashboard password with python 3 (#339)

Browse Source 
* Fix dashboard password with python 3

* Lint
This commit is contained in:
Otto Winter 2019-01-19 22:09:46 +01:00 committed by GitHub
parent e347cb538d
commit e13bffbb2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
esphomeyaml/dashboard/dashboard.py
View File

@ -43,12 +43,17 @@ ON_HASSIO = False
USING_HASSIO_AUTH = True USING_HASSIO_AUTH = True
HASSIO_MQTT_CONFIG = None HASSIO_MQTT_CONFIG = None
if IS_PY2:
cookie_authenticated_yes = 'yes'
else:
cookie_authenticated_yes = b'yes'
# pylint: disable=abstract-method # pylint: disable=abstract-method
class BaseHandler(tornado.web.RequestHandler): class BaseHandler(tornado.web.RequestHandler):
def is_authenticated(self): def is_authenticated(self):
if USING_HASSIO_AUTH or USING_PASSWORD: if USING_HASSIO_AUTH or USING_PASSWORD:
return self.get_secure_cookie('authenticated') == 'yes' return self.get_secure_cookie('authenticated') == cookie_authenticated_yes
return True return True
@ -62,7 +67,7 @@ class EsphomeyamlCommandWebSocket(tornado.websocket.WebSocketHandler):
def on_message(self, message): def on_message(self, message):
if USING_HASSIO_AUTH or USING_PASSWORD: if USING_HASSIO_AUTH or USING_PASSWORD:
if self.get_secure_cookie('authenticated') != 'yes': if self.get_secure_cookie('authenticated') != cookie_authenticated_yes:
return return
if self.proc is not None: if self.proc is not None:
return return
@ -440,7 +445,7 @@ class LoginHandler(BaseHandler):
try: try:
req = requests.post('http://hassio/auth', headers=headers, data=data) req = requests.post('http://hassio/auth', headers=headers, data=data)
if req.status_code == 200: if req.status_code == 200:
self.set_secure_cookie("authenticated", "yes") self.set_secure_cookie("authenticated", cookie_authenticated_yes)
self.redirect('/') self.redirect('/')
return return
except Exception as err: # pylint: disable=broad-except except Exception as err: # pylint: disable=broad-except
@ -457,9 +462,12 @@ class LoginHandler(BaseHandler):
return return
password = str(self.get_argument("password", '')) password = str(self.get_argument("password", ''))
password = hmac.new(password).digest() if IS_PY2:
password = hmac.new(password).digest()
else:
password = hmac.new(password.encode()).digest()
if hmac.compare_digest(PASSWORD_DIGEST, password): if hmac.compare_digest(PASSWORD_DIGEST, password):
self.set_secure_cookie("authenticated", "yes") self.set_secure_cookie("authenticated", cookie_authenticated_yes)
self.redirect("/") self.redirect("/")
@ -548,7 +556,10 @@ def start_web_server(args):
USING_PASSWORD = args.password USING_PASSWORD = args.password
if USING_PASSWORD: if USING_PASSWORD:
PASSWORD_DIGEST = hmac.new(args.password).digest() if IS_PY2:
PASSWORD_DIGEST = hmac.new(args.password).digest()
else:
PASSWORD_DIGEST = hmac.new(args.password.encode()).digest()
if USING_HASSIO_AUTH or USING_PASSWORD: if USING_HASSIO_AUTH or USING_PASSWORD:
path = esphomeyaml_storage_path(CONFIG_DIR) path = esphomeyaml_storage_path(CONFIG_DIR)