- grab filename from http post headers

Changed files:
    PLD_Builder/request_handler.py -> 1.40
    PLD_Builder/request_handler_server.py -> 1.2

diff --git a/PLD_Builder/request_handler.py b/PLD_Builder/request_handler.py
index 7c752b53f4aa0dea76bfdc8c6538091ce3310129..c65bf3edc72f0a6d3c5da04f9ee16d1b8f7a7acb 100644 (file)
--- a/PLD_Builder/request_handler.py
+++ b/PLD_Builder/request_handler.py
@@ -135,9 +135,15 @@ def handle_notification(r, user):
     os.chmod(path.req_queue_signed_file, 0644)
     q.unlock()
 
-def handle_request(f):
+def handle_request(f, filename = None):
     sio = StringIO.StringIO()
     util.sendfile(f, sio)
+
+    sio.seek(0)
+    if sio.read() == '':
+        log.alert('Empty body received. Filename: %s' % filename)
+        return False
+
     sio.seek(0)
     (em, body) = gpg.verify_sig(sio)
     user = acl.user_by_email(em)
@@ -165,10 +171,10 @@ def handle_request(f):
     status.pop()
     return True
 
-def handle_request_main(stream):
+def handle_request_main(stream, filename = None):
     init_conf("src")
     status.push("handling email request")
-    ret = handle_request(stream)
+    ret = handle_request(stream, filename = filename)
     status.pop()
     return ret
 

diff --git a/PLD_Builder/request_handler_server.py b/PLD_Builder/request_handler_server.py
index bc92e70a051cdbcd6b7a76e008e83fcab216c0b3..b429ef40ec91558cca74bf1813d935aa48e330b3 100644 (file)
--- a/PLD_Builder/request_handler_server.py
+++ b/PLD_Builder/request_handler_server.py
@@ -34,7 +34,9 @@ class MyHandler(BaseHTTPRequestHandler):
                        sio.write(query)
                        sio.seek(0)
 
-                       if not request_handler.handle_request_main(sio):
+                       filename = self.headers.getheader('x-filename')
+
+                       if not request_handler.handle_request_main(sio, filename = filename):
                                self.send_error(500)
                                self.end_headers()
                                return