chiark / gitweb /
wip
[hippotat.git] / server
diff --git a/server b/server
index cb9322b183f8ce440e29ced72093fc3eab6f2942..1b43fb050753405f529f84777d1b809662033ee0 100755 (executable)
--- a/server
+++ b/server
@@ -115,24 +115,31 @@ class Client():
       request = self._rq.popleft()
       request.finish()
 
-class IphttpResource(twisted.web.resource.Resource):
-  isLeaf = True
-  def render_POST(self, request):
-    # find client, update config, etc.
-    metadata = request.args['m']
-    (ci_s, pw, tro) = metadata.split(b'\n')[0:3]
-    ci = ipaddr(ci_s)
-    cl = clients[ci]
-    if pw != cl.pw: raise ValueError('bad password')
+def process_request(request):
+  # find client, update config, etc.
+  metadata = request.args['m']
+  (ci_s, pw, tro) = metadata.split(b'\n')[0:3]
+  ci = ipaddr(ci_s)
+  cl = clients[ci]
+  if pw != cl.pw: raise ValueError('bad password')
+
+  if pw != cl.target_requests_outstanding:
+    raise ...
 
-    if pw != cl.target_requests_outstanding:
-      raise ...
+  try: d = request.args['d']
+  except KeyError: d = ''
 
-    try: d = request.args['d']
-    except KeyError: d = ''
+  cl.process_arriving_data(d)
+  cl.new_request(request)
 
-    cl.process_arriving_data(d)
-    cl.new_request(request)
+class IphttpResource(twisted.web.resource.Resource):
+  isLeaf = True
+  def render_POST(self, request):
+    try: process_request(request)
+    except Exception as e:
+      request.setHeader('Content-Type','text/plain; charset="utf-8"')
+      request.setResponseCode(400)
+      return str(e).encode('utf-8')
 
   def render_GET(self, request):
     return b'<html><body>hippotat</body></html>'