Author: arekm Date: Fri Feb 6 13:57:09 2009 GMT
Module: pld-builder.new Tag: HEAD
---- Log message:
Missing I/O->buf changes.
---- Files affected:
pld-builder.new/PLD_Builder:
request_handler.py (1.40 -> 1.41) , request_handler_server.py (1.4 -> 1.5)
---- Diffs:
================================================================
Index: pld-builder.new/PLD_Builder/request_handler.py
diff -u pld-builder.new/PLD_Builder/request_handler.py:1.40
pld-builder.new/PLD_Builder/request_handler.py:1.41
--- pld-builder.new/PLD_Builder/request_handler.py:1.40 Mon Aug 25 15:12:37 2008
+++ pld-builder.new/PLD_Builder/request_handler.py Fri Feb 6 14:57:03 2009
@@ -135,21 +135,16 @@
os.chmod(path.req_queue_signed_file, 0644)
q.unlock()
-def handle_request(f, filename = None):
- sio = StringIO.StringIO()
- util.sendfile(f, sio)
-
- sio.seek(0)
- if sio.read() == '':
+def handle_request(req, filename = None):
+ if req == '':
log.alert('Empty body received. Filename: %s' % filename)
return False
- sio.seek(0)
- (em, body) = gpg.verify_sig(sio)
+ (em, body) = gpg.verify_sig(req)
user = acl.user_by_email(em)
if user == None:
# FIXME: security email here
- sio.seek(0); keys = gpg.get_keys(sio)
+ keys = gpg.get_keys(req)
log.alert("Invalid signature, missing/untrusted key, or '%s' not in
acl. Keys in gpg batch: '%s'" % (em, keys))
return False
@@ -171,15 +166,15 @@
status.pop()
return True
-def handle_request_main(stream, filename = None):
+def handle_request_main(req, filename = None):
init_conf("src")
status.push("handling email request")
- ret = handle_request(stream, filename = filename)
+ ret = handle_request(req, filename = filename)
status.pop()
return ret
def main():
- sys.exit(not handle_request_main(sys.stdin))
+ sys.exit(not handle_request_main(sys.stdin.read()))
if __name__ == '__main__':
wrap.wrap(main)
================================================================
Index: pld-builder.new/PLD_Builder/request_handler_server.py
diff -u pld-builder.new/PLD_Builder/request_handler_server.py:1.4
pld-builder.new/PLD_Builder/request_handler_server.py:1.5
--- pld-builder.new/PLD_Builder/request_handler_server.py:1.4 Fri Feb 6
14:49:00 2009
+++ pld-builder.new/PLD_Builder/request_handler_server.py Fri Feb 6
14:57:04 2009
@@ -4,7 +4,6 @@
import cgi
import time
import log
-import StringIO
from config import config, init_conf
from os import curdir, sep
@@ -28,13 +27,10 @@
return
query = self.rfile.read(length)
- sio = StringIO.StringIO()
- sio.write(query)
- sio.seek(0)
filename = self.headers.getheader('x-filename')
- if not request_handler.handle_request_main(sio,
filename = filename):
+ if not request_handler.handle_request_main(query,
filename = filename):
log.error("request_handler_server:
handle_request_main(..., %s) failed" % filename)
self.send_error(500)
self.end_headers()
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/request_handler.py?r1=1.40&r2=1.41&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/request_handler_server.py?r1=1.4&r2=1.5&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
