Changeset 7c143c9 for server/lib/gutenbach/server/server.py

Timestamp:

Dec 27, 2011, 10:20:10 PM (12 years ago)

Author:

Jessica B. Hamrick <jhamrick@…>

Branches:

no-cups

Children:

e58af05

Parents:

ee8e6d0

git-author:

Jessica B. Hamrick <jhamrick@…> (12/27/11 22:20:10)

git-committer:

Jessica B. Hamrick <jhamrick@…> (12/27/11 22:20:10)

Message:

Add support for chunking, i.e. receiving file data

File:

• server/lib/gutenbach/server/server.py (modified) (2 diffs)

server/lib/gutenbach/server/server.py

@@ -5 +5 @@
 import sys
 import traceback
+import tempfile
 
 # initialize logger
@@ -13 +14 @@
 
 class GutenbachIPPServer(BaseHTTPServer.BaseHTTPRequestHandler):
+    def send_continue(self):
+        self.send_response(100, "continue")
+        self.send_header("Content-Type", "application/ipp")
+        self.end_headers()
+
+    def send_ok(self, response):
+        logger.debug(repr(response))
+        binary, data_file = response.packed_value
+            
+        self.send_response(200, "ok")
+        self.send_header("Content-Type", "application/ipp")
+        self.send_header("Connection", "close")
+        self.end_headers()
+        
+        self.wfile.write(binary)
+        if data_file is not None:
+            data = data_file.read(1024)
+            while data != '':
+                self.wfile.write(data)
+                data = data_file.read(1024)
+
+    def log_request(self, code=0, size=0):
+        logger.info("response (%s)" % code)
+
+    def log_message(self, fmt, *args):
+        logger.info(fmt % args)
+
+    def read_chunks(self):
+        size = sys.maxint
+        totalsize = 0
+
+        with tempfile.SpooledTemporaryFile() as tmp:
+            while size > 0:
+                a, b = self.rfile.read(2)
+                size = a + b
+                while not (a == "\r" and b == "\n"):
+                    a = b
+                    b = self.rfile.read(1)
+                    size += b
+                size = int(size[:-2], base=16)
+                totalsize += size
+                chunk = self.rfile.read(size)
+                clrf = self.rfile.read(2)
+                assert clrf == "\r\n"
+                tmp.write(chunk)
+
+            tmp.seek(0)
+            request = ipp.Request(request=tmp, length=totalsize)
+
+        return request
+                
     def do_POST(self):
-        # Receive a request
         length = int(self.headers.getheader('content-length', 0))
-        if length == 0:
-            logger.warning("content-length == 0")
-            return
-        request = ipp.Request(request=self.rfile, length=length)
+        expect = self.headers.getheader('expect', None)
+        encoding = self.headers.getheader('transfer-encoding', None)
+
+        logger.info("request %s (%d bytes)" % (self.command, length))
+        logger.debug(str(self.headers))
+
+        # Parse the request
+        if length == 0 and encoding == "chunked":
+            request = self.read_chunks()
+        else:
+            request = ipp.Request(request=self.rfile, length=length)
 
         # Get the handler and pass it the request and response
         # objects.  It will fill in values for the response object or
         # throw a fatal error.
-        logger.debug("Received request: %s" % repr(request))
-        try:
-            response = handler.handle(request)
-        except:
-            logger.fatal(traceback.format_exc())
-            sys.exit(1)
-
-        # Send the response across HTTP
-        logger.debug("Sending response: %s" % repr(response))
-        try:
-            binary = response.packed_value
-        except:
-            logger.fatal(traceback.format_exc())
-            sys.exit(1)
-            
-        self.send_response(200, "Gutenbach IPP Response")
-        self.send_header("Content-Type", "application/ipp")
-        self.send_header("Connection", "close")
-        self.end_headers()
-        self.wfile.write(binary)
+        logger.debug("request: %s" % repr(request))
+        response = handler.handle(request)
+        self.send_ok(response)