# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1339432523 -28800
# Node ID 3b821541657d7524880ce9fcf95c29e6601194f5
# Parent  298e502fdcd48b250a7fc8eb93841ae6d4787782
hmac

diff -r 298e502fdcd4 -r 3b821541657d server/ts.py
--- a/server/ts.py	Tue Jun 12 00:09:09 2012 +0800
+++ b/server/ts.py	Tue Jun 12 00:35:23 2012 +0800
@@ -16,6 +16,10 @@
 import httplib
 import time
 import traceback
+import binascii
+import hmac
+
+import config
 
 from utils import monotonic_time, retry, readline, crc16
 
@@ -105,6 +109,14 @@
 
     return int(next_wake)
 
+def send_results(lines):
+    enc_lines = binascii.b2a_base64('\n'.join(lines))
+    hmac.new(config.HMAC_KEY, enc_lines).hexdigest()
+
+    url_data = urllib.url_encode( ('lines', enc_lines), ('hmac', mac) )
+    con = urllib2.urlopen(config.UPDATE_URL, url_data)
+
+
 def do_comms(sock):
     print "do_comms"
     d = None
diff -r 298e502fdcd4 -r 3b821541657d web/config.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/web/config.py	Tue Jun 12 00:35:23 2012 +0800
@@ -0,0 +1,5 @@
+
+DATA_PATH = 'data'
+
+HMAC_KEY = 'a hmac key'
+
diff -r 298e502fdcd4 -r 3b821541657d web/index.py
--- a/web/index.py	Tue Jun 12 00:09:09 2012 +0800
+++ b/web/index.py	Tue Jun 12 00:35:23 2012 +0800
@@ -1,11 +1,27 @@
 #!/usr/bin/env python2.7
 
+import binascii
+import hmac
+
 import bottle
 from bottle import route, request
 
+import config
+import log
+
 @route('/update', method='post')
 def update():
-    return "Done"
+    enc_lines = request.forms.lines
+    mac = request.forms.hmac
+
+    if hmac.new(config.HMAC_KEY, enc_lines).hexdigest() != mac:
+        raise HTTPError(code = 403, output = "Bad key")
+
+    lines = binascii.a2b_base64(enc_lines).split('\n')
+
+    log.parse(lines)
+
+    return "OK"
 
 @route('/graph.png')
 def graph():
diff -r 298e502fdcd4 -r 3b821541657d web/log.py
--- a/web/log.py	Tue Jun 12 00:09:09 2012 +0800
+++ b/web/log.py	Tue Jun 12 00:35:23 2012 +0800
@@ -2,10 +2,10 @@
 import os
 import sys
 
-DATA_PATH='data'
+import config
 
 def sensor_rrd_path(s):
-    return '%s/sensor_%s.rrd' % s
+    return '%s/sensor_%s.rrd' % (config.DATA_PATH, s)
 
 def create_rrd(sensor_id):
     rrdtool.create(sensor_rrd_path(sensor_id), '-s', '300',
@@ -38,8 +38,12 @@
     for s in sensors:
         meas.append([])
 
+    def val_scale(v):
+        # convert decidegrees to degrees
+        return 0.1 * v
+
     for n in xrange(num_measurements):
-        vals = [int(entries["meas%d" % n].strip().split())]
+        vals = [val_scale(int(entries["meas%d" % n].strip().split()))]
         if len(vals) != num_sensors:
             raise Exception("Wrong number of sensors for measurement %d" % n)
         # we make an array of values for each sensor