annotate web/templog.py @ 540:0f665a84b581

gevent doesn't work well with subprocess
author Matt Johnston <matt@ucc.asn.au>
date Sun, 10 May 2015 21:13:49 +0800
parents b78961d2e3a3
children c90190a380c6
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
1 #!/usr/bin/env python2.7
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
2
334
Matt Johnston <matt@ucc.asn.au>
parents: 333
diff changeset
3 import binascii
445
5b9dc87c988f update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 409
diff changeset
4 import json
334
Matt Johnston <matt@ucc.asn.au>
parents: 333
diff changeset
5 import hmac
335
1e22eaf93620 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 334
diff changeset
6 import zlib
375
f22427bcfda8 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
7 from datetime import datetime, timedelta
337
f575ef538f5d - Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents: 336
diff changeset
8 import time
375
f22427bcfda8 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
9 import urllib
f22427bcfda8 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
10 import sys
482
9950ffa9a79b set nearly working
Matt Johnston <matt@ucc.asn.au>
parents: 445
diff changeset
11 import os
485
d68af9e84485 working
Matt Johnston <matt@ucc.asn.au>
parents: 482
diff changeset
12 import traceback
d68af9e84485 working
Matt Johnston <matt@ucc.asn.au>
parents: 482
diff changeset
13 import fcntl
334
Matt Johnston <matt@ucc.asn.au>
parents: 333
diff changeset
14
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
15 import bottle
337
f575ef538f5d - Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents: 336
diff changeset
16 from bottle import route, request, response
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
17
334
Matt Johnston <matt@ucc.asn.au>
parents: 333
diff changeset
18 import config
Matt Johnston <matt@ucc.asn.au>
parents: 333
diff changeset
19 import log
485
d68af9e84485 working
Matt Johnston <matt@ucc.asn.au>
parents: 482
diff changeset
20 import secure
489
46e327c00246 gets current params
Matt Johnston <matt@ucc.asn.au>
parents: 488
diff changeset
21 import atomicfile
334
Matt Johnston <matt@ucc.asn.au>
parents: 333
diff changeset
22
375
f22427bcfda8 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
23 DATE_FORMAT = '%Y%m%d-%H.%M'
f22427bcfda8 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
24 ZOOM_SCALE = 2.0
f22427bcfda8 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
25
539
b78961d2e3a3 gevent seems to work
Matt Johnston <matt@ucc.asn.au>
parents: 538
diff changeset
26 class TemplogBottle(bottle.Bottle):
b78961d2e3a3 gevent seems to work
Matt Johnston <matt@ucc.asn.au>
parents: 538
diff changeset
27 def run(*args, **argm):
b78961d2e3a3 gevent seems to work
Matt Johnston <matt@ucc.asn.au>
parents: 538
diff changeset
28 argm['server'] = 'gevent'
b78961d2e3a3 gevent seems to work
Matt Johnston <matt@ucc.asn.au>
parents: 538
diff changeset
29 super(TemplogBottle, self).run(*args, **argm)
b78961d2e3a3 gevent seems to work
Matt Johnston <matt@ucc.asn.au>
parents: 538
diff changeset
30 print "ran custom bottle"
b78961d2e3a3 gevent seems to work
Matt Johnston <matt@ucc.asn.au>
parents: 538
diff changeset
31
540
0f665a84b581 gevent doesn't work well with subprocess
Matt Johnston <matt@ucc.asn.au>
parents: 539
diff changeset
32 #bottle.default_app.push(TemplogBottle())
539
b78961d2e3a3 gevent seems to work
Matt Johnston <matt@ucc.asn.au>
parents: 538
diff changeset
33
b78961d2e3a3 gevent seems to work
Matt Johnston <matt@ucc.asn.au>
parents: 538
diff changeset
34 secure.setup_csrf()
b78961d2e3a3 gevent seems to work
Matt Johnston <matt@ucc.asn.au>
parents: 538
diff changeset
35
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
36 @route('/update', method='post')
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
37 def update():
445
5b9dc87c988f update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 409
diff changeset
38 js_enc = request.forms.data
334
Matt Johnston <matt@ucc.asn.au>
parents: 333
diff changeset
39 mac = request.forms.hmac
Matt Johnston <matt@ucc.asn.au>
parents: 333
diff changeset
40
445
5b9dc87c988f update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 409
diff changeset
41 if hmac.new(config.HMAC_KEY, js_enc).hexdigest() != mac:
391
5026780c2dc7 - Fix HTTPError
Matt Johnston <matt@ucc.asn.au>
parents: 383
diff changeset
42 raise bottle.HTTPError(code = 403, output = "Bad key")
334
Matt Johnston <matt@ucc.asn.au>
parents: 333
diff changeset
43
445
5b9dc87c988f update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 409
diff changeset
44 js = zlib.decompress(binascii.a2b_base64(js_enc))
334
Matt Johnston <matt@ucc.asn.au>
parents: 333
diff changeset
45
445
5b9dc87c988f update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 409
diff changeset
46 params = json.loads(js)
5b9dc87c988f update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 409
diff changeset
47
5b9dc87c988f update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents: 409
diff changeset
48 log.parse(params)
334
Matt Johnston <matt@ucc.asn.au>
parents: 333
diff changeset
49
Matt Johnston <matt@ucc.asn.au>
parents: 333
diff changeset
50 return "OK"
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
51
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
52 @route('/graph.png')
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
53 def graph():
375
f22427bcfda8 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
54 length_minutes = int(request.query.length)
f22427bcfda8 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
55 end = datetime.strptime(request.query.end, DATE_FORMAT)
f22427bcfda8 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
56 start = end - timedelta(minutes=length_minutes)
336
ba4c4df13487 parse the arguments for start/length
Matt Johnston <matt@ucc.asn.au>
parents: 335
diff changeset
57
ba4c4df13487 parse the arguments for start/length
Matt Johnston <matt@ucc.asn.au>
parents: 335
diff changeset
58 response.set_header('Content-Type', 'image/png')
375
f22427bcfda8 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
59 start_epoch = time.mktime(start.timetuple())
f22427bcfda8 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
60 return log.graph_png(start_epoch, length_minutes * 60)
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
61
487
931408ce71d9 working OK
Matt Johnston <matt@ucc.asn.au>
parents: 485
diff changeset
62 @route('/set/update', method='post')
492
23c6cf01d237 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 489
diff changeset
63 def set_update():
487
931408ce71d9 working OK
Matt Johnston <matt@ucc.asn.au>
parents: 485
diff changeset
64 post_json = json.loads(request.forms.data)
931408ce71d9 working OK
Matt Johnston <matt@ucc.asn.au>
parents: 485
diff changeset
65
931408ce71d9 working OK
Matt Johnston <matt@ucc.asn.au>
parents: 485
diff changeset
66 csrf_blob = post_json['csrf_blob']
931408ce71d9 working OK
Matt Johnston <matt@ucc.asn.au>
parents: 485
diff changeset
67
492
23c6cf01d237 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 489
diff changeset
68 if not secure.check_csrf_blob(csrf_blob):
23c6cf01d237 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 489
diff changeset
69 bottle.response.status = 403
23c6cf01d237 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 489
diff changeset
70 return "Bad csrf"
23c6cf01d237 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 489
diff changeset
71
23c6cf01d237 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 489
diff changeset
72 ret = log.update_params(post_json['params'])
23c6cf01d237 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 489
diff changeset
73 if not ret is True:
23c6cf01d237 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 489
diff changeset
74 bottle.response.status = 403
23c6cf01d237 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 489
diff changeset
75 return ret
23c6cf01d237 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 489
diff changeset
76
23c6cf01d237 working kinda
Matt Johnston <matt@ucc.asn.au>
parents: 489
diff changeset
77 return "Good"
487
931408ce71d9 working OK
Matt Johnston <matt@ucc.asn.au>
parents: 485
diff changeset
78
482
9950ffa9a79b set nearly working
Matt Johnston <matt@ucc.asn.au>
parents: 445
diff changeset
79 @route('/set')
9950ffa9a79b set nearly working
Matt Johnston <matt@ucc.asn.au>
parents: 445
diff changeset
80 def set():
505
ad846b9bdd10 key fingerprints are case- and whitespace-insensitive.
Matt Johnston <matt@ucc.asn.au>
parents: 501
diff changeset
81 allowed = ["false", "true"][secure.check_user_hash(config.ALLOWED_USERS)]
501
236e5d131b3e Add url link, improve atomicfile
Matt Johnston <matt@ucc.asn.au>
parents: 492
diff changeset
82 response.set_header('Cache-Control', 'no-cache')
485
d68af9e84485 working
Matt Johnston <matt@ucc.asn.au>
parents: 482
diff changeset
83 return bottle.template('set',
d68af9e84485 working
Matt Johnston <matt@ucc.asn.au>
parents: 482
diff changeset
84 inline_data = log.get_params(),
488
4792e9910cde watcher script
Matt Johnston <matt@ucc.asn.au>
parents: 487
diff changeset
85 csrf_blob = secure.get_csrf_blob(),
4792e9910cde watcher script
Matt Johnston <matt@ucc.asn.au>
parents: 487
diff changeset
86 allowed = allowed)
482
9950ffa9a79b set nearly working
Matt Johnston <matt@ucc.asn.au>
parents: 445
diff changeset
87
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
88 @route('/')
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
89 def top():
375
f22427bcfda8 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
90
f22427bcfda8 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
91 minutes = int(request.query.get('length', 26*60))
f22427bcfda8 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
92
f22427bcfda8 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
93 if 'end' in request.query:
f22427bcfda8 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
94 end = datetime.strptime(request.query.end, DATE_FORMAT)
f22427bcfda8 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
95 else:
f22427bcfda8 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
96 end = datetime.now()
f22427bcfda8 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
97
f22427bcfda8 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
98 if 'zoom' in request.query:
f22427bcfda8 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
99 orig_start = end - timedelta(minutes=minutes)
f22427bcfda8 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
100 orig_end = end
f22427bcfda8 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
101 xpos = int(request.query.x)
383
a032051475fe ui tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 375
diff changeset
102 xpos -= config.GRAPH_LEFT_MARGIN * config.ZOOM
375
f22427bcfda8 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
103
383
a032051475fe ui tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 375
diff changeset
104 if xpos >= 0 and xpos < config.GRAPH_WIDTH * config.ZOOM:
375
f22427bcfda8 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
105 click_time = orig_start \
383
a032051475fe ui tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 375
diff changeset
106 + timedelta(minutes=(float(xpos) / (config.GRAPH_WIDTH * config.ZOOM)) * minutes)
375
f22427bcfda8 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
107 minutes = int(minutes / ZOOM_SCALE)
f22427bcfda8 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
108
f22427bcfda8 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
109 end = click_time + timedelta(minutes=minutes/2)
f22427bcfda8 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
110 else:
f22427bcfda8 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
111 # zoom out
f22427bcfda8 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
112 minutes = int(minutes*ZOOM_SCALE)
f22427bcfda8 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
113 end += timedelta(minutes=minutes/2)
f22427bcfda8 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
114
f22427bcfda8 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
115 if end > datetime.now():
f22427bcfda8 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
116 end = datetime.now()
f22427bcfda8 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
117
f22427bcfda8 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
118 request.query.replace('length', minutes)
f22427bcfda8 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
119 request.query.replace('end', end.strftime(DATE_FORMAT))
f22427bcfda8 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
120
f22427bcfda8 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
121 urlparams = urllib.urlencode(request.query)
f22427bcfda8 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
122 return bottle.template('top', urlparams=urlparams,
f22427bcfda8 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
123 end = end.strftime(DATE_FORMAT),
f22427bcfda8 a bunch of web fiddli
Matt Johnston <matt@ucc.asn.au>
parents: 367
diff changeset
124 length = minutes)
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
125
409
1854abee5a59 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 391
diff changeset
126 @route('/debug')
1854abee5a59 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 391
diff changeset
127 def debuglog():
1854abee5a59 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 391
diff changeset
128 response.set_header('Content-Type', 'text/plain')
1854abee5a59 add debug url
Matt Johnston <matt@ucc.asn.au>
parents: 391
diff changeset
129 return log.tail_debug_log()
344
ea1779d27641 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 337
diff changeset
130
482
9950ffa9a79b set nearly working
Matt Johnston <matt@ucc.asn.au>
parents: 445
diff changeset
131 @route('/env')
9950ffa9a79b set nearly working
Matt Johnston <matt@ucc.asn.au>
parents: 445
diff changeset
132 def env():
9950ffa9a79b set nearly working
Matt Johnston <matt@ucc.asn.au>
parents: 445
diff changeset
133 response.set_header('Content-Type', 'text/plain')
488
4792e9910cde watcher script
Matt Johnston <matt@ucc.asn.au>
parents: 487
diff changeset
134 #return '\n'.join(traceback.format_stack())
4792e9910cde watcher script
Matt Johnston <matt@ucc.asn.au>
parents: 487
diff changeset
135 return '\n'.join(("%s %s" % k) for k in request.environ.items())
482
9950ffa9a79b set nearly working
Matt Johnston <matt@ucc.asn.au>
parents: 445
diff changeset
136 #return str(request.environ)
9950ffa9a79b set nearly working
Matt Johnston <matt@ucc.asn.au>
parents: 445
diff changeset
137 #yield "\n"
9950ffa9a79b set nearly working
Matt Johnston <matt@ucc.asn.au>
parents: 445
diff changeset
138 #var_lookup = environ['mod_ssl.var_lookup']
9950ffa9a79b set nearly working
Matt Johnston <matt@ucc.asn.au>
parents: 445
diff changeset
139 #return var_lookup("SSL_SERVER_I_DN_O")
9950ffa9a79b set nearly working
Matt Johnston <matt@ucc.asn.au>
parents: 445
diff changeset
140
9950ffa9a79b set nearly working
Matt Johnston <matt@ucc.asn.au>
parents: 445
diff changeset
141 @bottle.get('/<filename:re:.*\.js>')
9950ffa9a79b set nearly working
Matt Johnston <matt@ucc.asn.au>
parents: 445
diff changeset
142 def javascripts(filename):
485
d68af9e84485 working
Matt Johnston <matt@ucc.asn.au>
parents: 482
diff changeset
143 response.set_header('Cache-Control', "public, max-age=1296000")
482
9950ffa9a79b set nearly working
Matt Johnston <matt@ucc.asn.au>
parents: 445
diff changeset
144 return bottle.static_file(filename, root='static')
9950ffa9a79b set nearly working
Matt Johnston <matt@ucc.asn.au>
parents: 445
diff changeset
145
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
146 def main():
367
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
147 #bottle.debug(True)
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
148 #bottle.run(reloader=True)
3db118498b97 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 362
diff changeset
149 bottle.run(server='cgi', reloader=True)
346
d6219df77c41 main.c:
Matt Johnston <matt@ucc.asn.au>
parents: 344
diff changeset
150 #bottle.run(port=9999, reloader=True)
333
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
151
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
152 if __name__ == '__main__':
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
153 main()
298e502fdcd4 Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
154