# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1447770395 -28800
# Node ID 2773400f9d64dfe19fb38d2984ce1e8433828597
# Parent  453c4c0eab3a9225ada3a3b7177112a15828c5e0# Parent  329e65ea1edce17b776036130e566fd672b59f2c
merge

diff -r 453c4c0eab3a -r 2773400f9d64 web/config.py
--- a/web/config.py	Tue Nov 17 22:26:00 2015 +0800
+++ b/web/config.py	Tue Nov 17 22:26:35 2015 +0800
@@ -31,8 +31,8 @@
     'sensor_fridge_setpoint': 'Setpoint',
     'sensor_fridge_on': 'Cool',
     'sensor_28-0000042cf4dd': "Wort",
-    'sensor_28-0000042cccc4': "Fridge",
-    'sensor_28-0000042c6dbb': "Ambient",
+    'sensor_28-0000042cccc4': "OldFridge",
+    'sensor_28-0000042c6dbb': "Fridge",
     'sensor_internal': "Processor",
     }
 
diff -r 453c4c0eab3a -r 2773400f9d64 web/templog.py
--- a/web/templog.py	Tue Nov 17 22:26:00 2015 +0800
+++ b/web/templog.py	Tue Nov 17 22:26:35 2015 +0800
@@ -69,6 +69,12 @@
 
 @route('/set/update', method='post')
 def set_update():
+    if not secure.check_user_hash(config.ALLOWED_USERS):
+        # the "Save" button should be disabled if the cert wasn't
+        # good
+        response.status = 403
+        return "No cert, dodginess"
+
     post_json = json.loads(request.forms.data)
 
     csrf_blob = post_json['csrf_blob']
@@ -79,7 +85,7 @@
 
     ret = log.update_params(post_json['params'])
     if not ret is True:
-        response.status = 403
+        response.status = 409 # Conflict
         return ret
         
     return "Good"
@@ -157,6 +163,11 @@
     #var_lookup = environ['mod_ssl.var_lookup']
     #return var_lookup("SSL_SERVER_I_DN_O")
 
+@route('/h')
+def headers():
+    response.set_header('Content-Type', 'text/plain')
+    return '\n'.join("%s: %s" % x for x in request.headers.items())
+
 @route('/get_settings')
 def get_settings():
     response.set_header('Cache-Control', 'no-cache')