From bd3bdb6cb76d2bb479b03c315b158019bdca9364 Mon Sep 17 00:00:00 2001 From: Joseph Coffland Date: Fri, 21 Jun 2019 15:13:54 -0700 Subject: [PATCH] Fix demo password check --- CHANGELOG.md | 3 +++ package.json | 2 +- src/py/bbctrl/RequestHandler.py | 2 +- src/py/bbctrl/Web.py | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c70a282..d740a46 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ Buildbotics CNC Controller Firmware Changelog ============================================= +## v0.4.10 + - Fix demo password check + ## v0.4.9 - Enforce 6A per motor channel peak current limit. - Adjust config values above max or below min instead of resetting to default. diff --git a/package.json b/package.json index 958ad19..5141d1e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bbctrl", - "version": "0.4.9", + "version": "0.4.10", "homepage": "http://buildbotics.com/", "repository": "https://github.com/buildbotics/bbctrl-firmware", "license": "GPL-3.0+", diff --git a/src/py/bbctrl/RequestHandler.py b/src/py/bbctrl/RequestHandler.py index 050a425..11f9e18 100644 --- a/src/py/bbctrl/RequestHandler.py +++ b/src/py/bbctrl/RequestHandler.py @@ -53,7 +53,7 @@ class RequestHandler(tornado.web.RequestHandler): # Override exception logging def log_exception(self, typ, value, tb): if (isinstance(value, HTTPError) and - value.status_code in (400, 404, 408)): return + value.status_code in (400, 401, 404, 408)): return log = self.get_log() log.set_level(bbctrl.log.DEBUG) diff --git a/src/py/bbctrl/Web.py b/src/py/bbctrl/Web.py index 51e7c16..a0dd6c8 100644 --- a/src/py/bbctrl/Web.py +++ b/src/py/bbctrl/Web.py @@ -65,8 +65,8 @@ def check_password(password): current = s.split(':')[1].split('$') # Check password type - if current[1] != '1': - raise HTTPError(400, "Don't know how to update non-MD5 password") + if len(current) < 2 or current[1] != '1': + raise HTTPError(401, "Password invalid") # Check current password cmd = ['openssl', 'passwd', '-salt', current[2], '-1', password] -- 2.27.0