annotate web/templog.py @ 191:8318d50d766d

gets current params
author Matt Johnston <matt@ucc.asn.au>
date Tue, 11 Feb 2014 22:10:32 +0800
parents 101c66da848d
children 4fa8cbf31065
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1 #!/usr/bin/env python2.7
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
2
28
Matt Johnston <matt@ucc.asn.au>
parents: 27
diff changeset
3 import binascii
146
3b4277aaed3c update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 103
diff changeset
4 import json
28
Matt Johnston <matt@ucc.asn.au>
parents: 27
diff changeset
5 import hmac
29
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
6 import zlib
69
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
7 from datetime import datetime, timedelta
31
5e75e08d20ac - Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents: 30
diff changeset
8 import time
69
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
9 import urllib
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
10 import sys
182
e731c0d30b09 set nearly working
Matt Johnston <matt@ucc.asn.au>
parents: 146
diff changeset
11 import os
185
adbf70d1449f working
Matt Johnston <matt@ucc.asn.au>
parents: 182
diff changeset
12 import traceback
adbf70d1449f working
Matt Johnston <matt@ucc.asn.au>
parents: 182
diff changeset
13 import fcntl
28
Matt Johnston <matt@ucc.asn.au>
parents: 27
diff changeset
14
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
15 import bottle
31
5e75e08d20ac - Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents: 30
diff changeset
16 from bottle import route, request, response
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
17
28
Matt Johnston <matt@ucc.asn.au>
parents: 27
diff changeset
18 import config
Matt Johnston <matt@ucc.asn.au>
parents: 27
diff changeset
19 import log
185
adbf70d1449f working
Matt Johnston <matt@ucc.asn.au>
parents: 182
diff changeset
20 import secure
191
8318d50d766d gets current params
Matt Johnston <matt@ucc.asn.au>
parents: 189
diff changeset
21 import atomicfile
28
Matt Johnston <matt@ucc.asn.au>
parents: 27
diff changeset
22
69
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
23 DATE_FORMAT = '%Y%m%d-%H.%M'
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
24 ZOOM_SCALE = 2.0
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
25
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
26 @route('/update', method='post')
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
27 def update():
146
3b4277aaed3c update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 103
diff changeset
28 js_enc = request.forms.data
28
Matt Johnston <matt@ucc.asn.au>
parents: 27
diff changeset
29 mac = request.forms.hmac
Matt Johnston <matt@ucc.asn.au>
parents: 27
diff changeset
30
146
3b4277aaed3c update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 103
diff changeset
31 if hmac.new(config.HMAC_KEY, js_enc).hexdigest() != mac:
85
3cd1ca6d0489 - Fix HTTPError
Matt Johnston <matt@ucc.asn.au>
parents: 77
diff changeset
32 raise bottle.HTTPError(code = 403, output = "Bad key")
28
Matt Johnston <matt@ucc.asn.au>
parents: 27
diff changeset
33
146
3b4277aaed3c update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 103
diff changeset
34 js = zlib.decompress(binascii.a2b_base64(js_enc))
28
Matt Johnston <matt@ucc.asn.au>
parents: 27
diff changeset
35
146
3b4277aaed3c update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 103
diff changeset
36 params = json.loads(js)
3b4277aaed3c update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 103
diff changeset
37
3b4277aaed3c update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 103
diff changeset
38 log.parse(params)
28
Matt Johnston <matt@ucc.asn.au>
parents: 27
diff changeset
39
Matt Johnston <matt@ucc.asn.au>
parents: 27
diff changeset
40 return "OK"
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
41
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
42 @route('/graph.png')
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
43 def graph():
69
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
44 length_minutes = int(request.query.length)
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
45 end = datetime.strptime(request.query.end, DATE_FORMAT)
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
46 start = end - timedelta(minutes=length_minutes)
30
13fcf497f8b7 parse the arguments for start/length
Matt Johnston <matt@ucc.asn.au>
parents: 29
diff changeset
47
13fcf497f8b7 parse the arguments for start/length
Matt Johnston <matt@ucc.asn.au>
parents: 29
diff changeset
48 response.set_header('Content-Type', 'image/png')
69
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
49 start_epoch = time.mktime(start.timetuple())
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
50 return log.graph_png(start_epoch, length_minutes * 60)
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
51
188
ae5efca89001 working OK
Matt Johnston <matt@ucc.asn.au>
parents: 185
diff changeset
52 @route('/set/update', method='post')
ae5efca89001 working OK
Matt Johnston <matt@ucc.asn.au>
parents: 185
diff changeset
53 def update():
ae5efca89001 working OK
Matt Johnston <matt@ucc.asn.au>
parents: 185
diff changeset
54 post_json = json.loads(request.forms.data)
ae5efca89001 working OK
Matt Johnston <matt@ucc.asn.au>
parents: 185
diff changeset
55
ae5efca89001 working OK
Matt Johnston <matt@ucc.asn.au>
parents: 185
diff changeset
56 csrf_blob = post_json['csrf_blob']
ae5efca89001 working OK
Matt Johnston <matt@ucc.asn.au>
parents: 185
diff changeset
57
ae5efca89001 working OK
Matt Johnston <matt@ucc.asn.au>
parents: 185
diff changeset
58 return str(post_json['params'])
ae5efca89001 working OK
Matt Johnston <matt@ucc.asn.au>
parents: 185
diff changeset
59
182
e731c0d30b09 set nearly working
Matt Johnston <matt@ucc.asn.au>
parents: 146
diff changeset
60 @route('/set')
e731c0d30b09 set nearly working
Matt Johnston <matt@ucc.asn.au>
parents: 146
diff changeset
61 def set():
189
101c66da848d watcher script
Matt Johnston <matt@ucc.asn.au>
parents: 188
diff changeset
62 allowed = ["false", "true"][secure.get_user_hash() in config.ALLOWED_USERS]
185
adbf70d1449f working
Matt Johnston <matt@ucc.asn.au>
parents: 182
diff changeset
63 return bottle.template('set',
adbf70d1449f working
Matt Johnston <matt@ucc.asn.au>
parents: 182
diff changeset
64 inline_data = log.get_params(),
189
101c66da848d watcher script
Matt Johnston <matt@ucc.asn.au>
parents: 188
diff changeset
65 csrf_blob = secure.get_csrf_blob(),
101c66da848d watcher script
Matt Johnston <matt@ucc.asn.au>
parents: 188
diff changeset
66 allowed = allowed)
182
e731c0d30b09 set nearly working
Matt Johnston <matt@ucc.asn.au>
parents: 146
diff changeset
67
e731c0d30b09 set nearly working
Matt Johnston <matt@ucc.asn.au>
parents: 146
diff changeset
68 @route('/set_current.json')
e731c0d30b09 set nearly working
Matt Johnston <matt@ucc.asn.au>
parents: 146
diff changeset
69 def set_fresh():
e731c0d30b09 set nearly working
Matt Johnston <matt@ucc.asn.au>
parents: 146
diff changeset
70 response.set_header('Content-Type', 'application/javascript')
e731c0d30b09 set nearly working
Matt Johnston <matt@ucc.asn.au>
parents: 146
diff changeset
71 return log.get_current()
e731c0d30b09 set nearly working
Matt Johnston <matt@ucc.asn.au>
parents: 146
diff changeset
72
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
73 @route('/')
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
74 def top():
69
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
75
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
76 minutes = int(request.query.get('length', 26*60))
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
77
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
78 if 'end' in request.query:
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
79 end = datetime.strptime(request.query.end, DATE_FORMAT)
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
80 else:
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
81 end = datetime.now()
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
82
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
83 if 'zoom' in request.query:
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
84 orig_start = end - timedelta(minutes=minutes)
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
85 orig_end = end
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
86 xpos = int(request.query.x)
77
959e88c0bdfa ui tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 69
diff changeset
87 xpos -= config.GRAPH_LEFT_MARGIN * config.ZOOM
69
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
88
77
959e88c0bdfa ui tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 69
diff changeset
89 if xpos >= 0 and xpos < config.GRAPH_WIDTH * config.ZOOM:
69
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
90 click_time = orig_start \
77
959e88c0bdfa ui tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 69
diff changeset
91 + timedelta(minutes=(float(xpos) / (config.GRAPH_WIDTH * config.ZOOM)) * minutes)
69
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
92 minutes = int(minutes / ZOOM_SCALE)
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
93
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
94 end = click_time + timedelta(minutes=minutes/2)
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
95 else:
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
96 # zoom out
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
97 minutes = int(minutes*ZOOM_SCALE)
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
98 end += timedelta(minutes=minutes/2)
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
99
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
100 if end > datetime.now():
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
101 end = datetime.now()
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
102
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
103 request.query.replace('length', minutes)
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
104 request.query.replace('end', end.strftime(DATE_FORMAT))
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
105
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
106 urlparams = urllib.urlencode(request.query)
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
107 return bottle.template('top', urlparams=urlparams,
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
108 end = end.strftime(DATE_FORMAT),
a8ff20f15734 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
109 length = minutes)
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
110
103
ef59da811986 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 85
diff changeset
111 @route('/debug')
ef59da811986 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 85
diff changeset
112 def debuglog():
ef59da811986 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 85
diff changeset
113 response.set_header('Content-Type', 'text/plain')
ef59da811986 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 85
diff changeset
114 return log.tail_debug_log()
37
8da0fdadc8d7 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 31
diff changeset
115
182
e731c0d30b09 set nearly working
Matt Johnston <matt@ucc.asn.au>
parents: 146
diff changeset
116 @route('/env')
e731c0d30b09 set nearly working
Matt Johnston <matt@ucc.asn.au>
parents: 146
diff changeset
117 def env():
e731c0d30b09 set nearly working
Matt Johnston <matt@ucc.asn.au>
parents: 146
diff changeset
118 response.set_header('Content-Type', 'text/plain')
189
101c66da848d watcher script
Matt Johnston <matt@ucc.asn.au>
parents: 188
diff changeset
119 #return '\n'.join(traceback.format_stack())
101c66da848d watcher script
Matt Johnston <matt@ucc.asn.au>
parents: 188
diff changeset
120 return '\n'.join(("%s %s" % k) for k in request.environ.items())
182
e731c0d30b09 set nearly working
Matt Johnston <matt@ucc.asn.au>
parents: 146
diff changeset
121 #return str(request.environ)
e731c0d30b09 set nearly working
Matt Johnston <matt@ucc.asn.au>
parents: 146
diff changeset
122 #yield "\n"
e731c0d30b09 set nearly working
Matt Johnston <matt@ucc.asn.au>
parents: 146
diff changeset
123 #var_lookup = environ['mod_ssl.var_lookup']
e731c0d30b09 set nearly working
Matt Johnston <matt@ucc.asn.au>
parents: 146
diff changeset
124 #return var_lookup("SSL_SERVER_I_DN_O")
e731c0d30b09 set nearly working
Matt Johnston <matt@ucc.asn.au>
parents: 146
diff changeset
125
e731c0d30b09 set nearly working
Matt Johnston <matt@ucc.asn.au>
parents: 146
diff changeset
126 @bottle.get('/<filename:re:.*\.js>')
e731c0d30b09 set nearly working
Matt Johnston <matt@ucc.asn.au>
parents: 146
diff changeset
127 def javascripts(filename):
185
adbf70d1449f working
Matt Johnston <matt@ucc.asn.au>
parents: 182
diff changeset
128 response.set_header('Cache-Control', "public, max-age=1296000")
182
e731c0d30b09 set nearly working
Matt Johnston <matt@ucc.asn.au>
parents: 146
diff changeset
129 return bottle.static_file(filename, root='static')
e731c0d30b09 set nearly working
Matt Johnston <matt@ucc.asn.au>
parents: 146
diff changeset
130
185
adbf70d1449f working
Matt Johnston <matt@ucc.asn.au>
parents: 182
diff changeset
131 secure.setup_csrf()
182
e731c0d30b09 set nearly working
Matt Johnston <matt@ucc.asn.au>
parents: 146
diff changeset
132
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
133 def main():
61
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
134 #bottle.debug(True)
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
135 #bottle.run(reloader=True)
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
136 bottle.run(server='cgi', reloader=True)
40
9b5b202129c3 main.c:
Matt Johnston <matt@ucc.asn.au>
parents: 37
diff changeset
137 #bottle.run(port=9999, reloader=True)
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
138
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
139 if __name__ == '__main__':
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
140 main()
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
141
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
142