Fix demo password check

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c70a282ff66a227cafbfa295e18698d29ea50d95..d740a466c0da208c2655d4ba899d50db0ab90d00 100644 (file)
--- 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 958ad19c11ff43e7a012cf9593e74188a09e7b77..5141d1e5bd2709e4012cc1e8f5520e8b5ed097e0 100644 (file)
--- 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 050a425bbd4c539652fe53f905b94edd86272b49..11f9e18365ddfca01381cedf28c8f4d0ae7b1e41 100644 (file)
--- 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 51e7c169d873193ea44373103aa85024c70d75cb..a0dd6c89a988dcb73e45b6358d24f7c09b9169ab 100644 (file)
--- 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]